Skip to content

Commit 591fb16

Browse files
committed
Fix Make commands for CICD.
1 parent 848f1ae commit 591fb16

File tree

3 files changed

+64
-6
lines changed

3 files changed

+64
-6
lines changed

Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
run:
5-
docker-compose run --rm -p 8080:80 dev_pece
5+
docker-compose -f docker-compose.dev.yml run --rm -p 8080:80 dev_pece
66

77
in:
88
docker ps
@@ -29,19 +29,19 @@ distro-clean:
2929
rm -rf ./build
3030

3131
install:
32-
docker-compose exec dev_pece npm install
32+
docker-compose -f docker-compose-dev.yml run --rm dev_pece npm install
3333

3434
setup:
35-
docker-compose exec dev_pece gulp setup
35+
docker-compose -f docker-compose-dev.yml run --rm dev_pece gulp setup
3636

3737
build:
38-
docker-compose exec dev_pece gulp build
38+
docker-compose -f docker-compose-dev.yml run --rm dev_pece gulp build
3939

4040
site-install:
41-
docker-compose excec dev_pece gulp site-install
41+
docker-compose -f docker-compose-dev.yml run --rm dev_pece gulp site-install
4242

4343
build-dev:
44-
docker-compose exec -i dev_pece npm install && gulp setup && gulp build && gulp site-install
44+
docker-compose -f docker-compose-dev.yml run --rm dev_pece npm install && gulp setup && gulp build && gulp site-install
4545

4646
exec:
4747
docker-compose exec php bash -c $(filter-out $@,$(MAKECMDGOALS))
+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: '3'
2+
3+
services:
4+
db_mysql:
5+
networks:
6+
pecev1:
7+
8+
dev_pece:
9+
networks:
10+
pecev1:
11+
labels:
12+
- "traefik.http.routers.${PROJECT_NAME}.rule=Host(`${PROJECT_BASE_URL}`)"
13+
14+
networks:
15+
pecev1:
16+
external:
17+
name: pecev1

docker-compose-dev.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
version: '3'
2+
3+
services:
4+
db_mysql:
5+
image: mysql:5.7.39
6+
container_name: pece-db-mysql
7+
restart: always
8+
environment:
9+
- MYSQL_USER=pece
10+
- MYSQL_DATABASE=pece
11+
- MYSQL_PASSWORD=ZwTuVZzQO90qwYzA
12+
- MYSQL_ROOT_PASSWORD=Sk82jxYqqpx02jxT
13+
volumes:
14+
- ./docker/database/pecev1db:/var/lib/mysql
15+
16+
dev_pece:
17+
image: revagomes/pece:php7-alpha1
18+
container_name: pece-dev-nginx
19+
build:
20+
context: ./
21+
dockerfile: ./docker/DockerfileDevelopment
22+
cap_add:
23+
- ALL
24+
restart: always
25+
working_dir: /pece/drupal
26+
environment:
27+
- DB_PORT=3306
28+
- DB_HOST=pece-db
29+
- DB_NAME=pece
30+
- DB_DRIVER=mysql
31+
- DB_USERNAME=pece
32+
- DB_PASSWORD=ZwTuVZzQO90qwYzA
33+
volumes:
34+
- $PWD:/pece/drupal
35+
- $HOME/.ssh:/pece/.ssh
36+
- $HOME/.gitconfig:/pece/.gitconfig
37+
links:
38+
- db_mysql:pece-db
39+
40+
volumes:
41+
db_mysql:

0 commit comments

Comments
 (0)