Update docker compose

.dev.env → .env.example

@@ -6,25 +6,28 @@
 # Template files must be committed to the VCS, but must not contain
 # any secret values.
 
-EXPRESS_PORT=3000
+EXPRESS_PORT=
+EXPRESS_PROTOCOL=
+EXPRESS_SECRET=
 
-EMAIL_HOST=localhost
-EMAIL_PORT=3003
-EMAIL_SECURE=false
-EMAIL_FROM_NAME=Droplet (Dev)
-EMAIL_FROM_ADDRESS=noreply@vylpes.com
-EMAIL_AUTH_ENABLE=false
+EMAIL_HOST=
+EMAIL_PORT=
+EMAIL_SECURE=
+EMAIL_FROM_NAME=
+EMAIL_FROM_ADDRESS=
+EMAIL_AUTH_ENABLE=
 EMAIL_AUTH_USER=
 EMAIL_AUTH_PASS=
-EMAIL_TLS_REJECT_UNAUTHORISED=true
+EMAIL_TLS_REJECT_UNAUTHORISED=
 
 EMAIL_TEMPLATE_PASSWORDRESET_RESETLINK=http://localhost:3000/auth/password-reset/reset?token={token}
 EMAIL_TEMPLATE_VERIFYUSER_VERIFYLINK=http://localhost:3000/auth/verify?token={token}
 
-DB_HOST=127.0.0.1
-DB_PORT=3001
-DB_NAME=droplet
-DB_AUTH_USER=dev
-DB_AUTH_PASS=dev
-DB_SYNC=true
-DB_LOGGING=true
+DB_HOST=
+DB_PORT=
+DB_NAME=
+DB_AUTH_USER=
+DB_AUTH_PASS=
+DB_SYNC=
+DB_LOGGING=
+DB_DATA_LOCATION=

docker-compose.yml

@@ -1,34 +1,22 @@
 version: "3"
 
-volumes:
-  dev_database_data:
-
 services:
   database:
     image: mysql/mysql-server
     command: --default-authentication-plugin=mysql_native_password
     restart: always
     environment:
-      - MYSQL_DATABASE=droplet
-      - MYSQL_USER=dev
-      - MYSQL_PASSWORD=dev
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_ROOT_HOST=0.0.0.0
+      - MYSQL_DATABASE=$DB_NAME
+      - MYSQL_USER=$DB_AUTH_USER
+      - MYSQL_PASSWORD=$DB_AUTH_PASS
+      - MYSQL_ROOT_PASSWORD=$DB_AUTH_PASS
+      - MYSQL_ROOT_HOST=$DB_ROOT_HOST
     ports:
-      - "3001:3306"
+      - "3306:3306"
     volumes:
-      - dev_database_data:/var/lib/mysql
-
-  phpmyadmin:
-    image: phpmyadmin
-    restart: always
-    ports:
-      - "3002:80"
-    environment:
-      - PMA_ARBITRARY=1
-
-  mail:
+      - $DB_DATA_LOCATION:/var/lib/mysql
+  mailhog:
     image: mailhog/mailhog
     ports:
-      - "3003:1025"
-      - "3004:8025"
+      - 1025:1025 # smtp server
+      - 8025:8025 # web ui