Skip to content

Commit 0c7ba29

Browse files
committed
Update docker compose
1 parent 7747965 commit 0c7ba29

6 files changed

+28
-163
lines changed

.dev.env renamed to .env.example

+18-15
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,28 @@
66
# Template files must be committed to the VCS, but must not contain
77
# any secret values.
88

9-
EXPRESS_PORT=3000
9+
EXPRESS_PORT=
10+
EXPRESS_PROTOCOL=
11+
EXPRESS_SECRET=
1012

11-
EMAIL_HOST=localhost
12-
EMAIL_PORT=3003
13-
EMAIL_SECURE=false
14-
EMAIL_FROM_NAME=Droplet (Dev)
15-
EMAIL_FROM_ADDRESS=[email protected]
16-
EMAIL_AUTH_ENABLE=false
13+
EMAIL_HOST=
14+
EMAIL_PORT=
15+
EMAIL_SECURE=
16+
EMAIL_FROM_NAME=
17+
EMAIL_FROM_ADDRESS=
18+
EMAIL_AUTH_ENABLE=
1719
EMAIL_AUTH_USER=
1820
EMAIL_AUTH_PASS=
19-
EMAIL_TLS_REJECT_UNAUTHORISED=true
21+
EMAIL_TLS_REJECT_UNAUTHORISED=
2022

2123
EMAIL_TEMPLATE_PASSWORDRESET_RESETLINK=http://localhost:3000/auth/password-reset/reset?token={token}
2224
EMAIL_TEMPLATE_VERIFYUSER_VERIFYLINK=http://localhost:3000/auth/verify?token={token}
2325

24-
DB_HOST=127.0.0.1
25-
DB_PORT=3001
26-
DB_NAME=droplet
27-
DB_AUTH_USER=dev
28-
DB_AUTH_PASS=dev
29-
DB_SYNC=true
30-
DB_LOGGING=true
26+
DB_HOST=
27+
DB_PORT=
28+
DB_NAME=
29+
DB_AUTH_USER=
30+
DB_AUTH_PASS=
31+
DB_SYNC=
32+
DB_LOGGING=
33+
DB_DATA_LOCATION=

.prod.env

-30
This file was deleted.

.stage.env

-30
This file was deleted.

docker-compose.prod.yml

-33
This file was deleted.

docker-compose.stage.yml

-33
This file was deleted.

docker-compose.yml

+10-22
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,22 @@
11
version: "3"
22

3-
volumes:
4-
dev_database_data:
5-
63
services:
74
database:
85
image: mysql/mysql-server
96
command: --default-authentication-plugin=mysql_native_password
107
restart: always
118
environment:
12-
- MYSQL_DATABASE=droplet
13-
- MYSQL_USER=dev
14-
- MYSQL_PASSWORD=dev
15-
- MYSQL_ROOT_PASSWORD=root
16-
- MYSQL_ROOT_HOST=0.0.0.0
9+
- MYSQL_DATABASE=$DB_NAME
10+
- MYSQL_USER=$DB_AUTH_USER
11+
- MYSQL_PASSWORD=$DB_AUTH_PASS
12+
- MYSQL_ROOT_PASSWORD=$DB_AUTH_PASS
13+
- MYSQL_ROOT_HOST=$DB_ROOT_HOST
1714
ports:
18-
- "3001:3306"
15+
- "3306:3306"
1916
volumes:
20-
- dev_database_data:/var/lib/mysql
21-
22-
phpmyadmin:
23-
image: phpmyadmin
24-
restart: always
25-
ports:
26-
- "3002:80"
27-
environment:
28-
- PMA_ARBITRARY=1
29-
30-
mail:
17+
- $DB_DATA_LOCATION:/var/lib/mysql
18+
mailhog:
3119
image: mailhog/mailhog
3220
ports:
33-
- "3003:1025"
34-
- "3004:8025"
21+
- 1025:1025 # smtp server
22+
- 8025:8025 # web ui

0 commit comments

Comments
 (0)