Skip to content

Commit 86821fb

Browse files
Harmonise docker-compose files
1 parent 5c7f844 commit 86821fb

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

docker-compose-testdb.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ services:
2424
- ./docker/php/custom.ini:/usr/local/etc/php/conf.d/custom.ini
2525
networks:
2626
- backend
27+
2728
nginx:
2829
restart: unless-stopped
2930
tty: true
@@ -41,6 +42,7 @@ services:
4142
networks:
4243
- frontend
4344
- backend
45+
4446
ufmysql:
4547
image: mysql:5.7
4648
networks:
@@ -54,6 +56,7 @@ services:
5456
- 8593:3306
5557
volumes:
5658
- userfrosting-db:/var/lib/mysql
59+
5760
ufmysqltest:
5861
image: mysql:5.7
5962
networks:
@@ -67,24 +70,26 @@ services:
6770
- 8594:3306
6871
volumes:
6972
- userfrosting-test-db:/var/lib/mysql
73+
7074
composer:
7175
image: "composer"
7276
volumes:
7377
- .:/app
7478
working_dir: /app
75-
command: -V
79+
7680
node:
7781
build:
7882
context: ./docker/node
7983
volumes:
8084
- .:/app
8185
working_dir: /app/build
82-
command: npm run uf-assets-install
86+
8387
volumes:
8488
userfrosting-db:
8589
driver: local
8690
userfrosting-test-db:
8791
driver: local
92+
8893
networks:
8994
frontend:
9095
backend:

docker-compose.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ services:
1717
- ./docker/php/custom.ini:/usr/local/etc/php/conf.d/custom.ini
1818
networks:
1919
- backend
20+
2021
nginx:
2122
restart: unless-stopped
2223
tty: true
@@ -33,6 +34,7 @@ services:
3334
networks:
3435
- frontend
3536
- backend
37+
3638
ufmysql:
3739
image: mysql:5.7
3840
networks:
@@ -46,6 +48,7 @@ services:
4648
- 8593:3306
4749
volumes:
4850
- userfrosting-db:/var/lib/mysql
51+
4952
composer:
5053
image: "composer"
5154
volumes:

0 commit comments

Comments
 (0)