Merge pull request #27 from nspalo/feature/DLT-24-env-file-reimplemen…

…tation feature/DLT-24-env-file-reimplementation
nspalo · Sep 9, 2021 · 358d625 · 358d625
2 parents 0852a34 + 8087529
commit 358d625
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 29 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -35,13 +35,15 @@ services:
     tty: true
     ports:
       - "3306:3306"
+    env_file:
+      - ${PATH_ENV_CONFIGS}/${SYS_ENV}.env
     volumes:
       - "${DB_VOLUME}:/var/lib/mysql"
     environment:
-      MYSQL_DATABASE: "${DB_NAME}"
-      MYSQL_USER: "${DB_USERNAME}"
-      MYSQL_PASSWORD: "${DB_PASSWORD}"
-      MYSQL_ROOT_PASSWORD: "${DB_PASSWORD_ROOT}"
+#      MYSQL_DATABASE: "${DB_NAME}"
+#      MYSQL_USER: "${DB_USERNAME}"
+#      MYSQL_PASSWORD: "${DB_PASSWORD}"
+#      MYSQL_ROOT_PASSWORD: "${DB_PASSWORD_ROOT}"
       SERVICE_TAGS: dev
       SERVICE_NAME: mysql
 
@@ -81,7 +83,7 @@ services:
     image: node:16-alpine
     working_dir: /var/www/html
     volumes:
-        - "${PATH_PROJECT_SOURCE}:/var/www/html"
+      - "${PATH_PROJECT_SOURCE}:/var/www/html"
     entrypoint: ['npm']
 
   # Container: Artisan
@@ -94,10 +96,11 @@ services:
       dockerfile: containers/php/Dockerfile
     image: artisan:laravel-5.8
     env_file:
+      - ${PATH_ENV_CONFIGS}/config.env
       - ${PATH_ENV_CONFIGS}/${SYS_ENV}.env
     working_dir: /var/www/html
     volumes:
-        - "${PATH_PROJECT_SOURCE}:/var/www/html"
+      - "${PATH_PROJECT_SOURCE}:/var/www/html"
     depends_on:
       - mysql
     entrypoint: ['/var/www/html/artisan']
diff --git a/docker/environments/config.env b/docker/environments/config.env
@@ -1,5 +1,5 @@
 #
-# Docker Environment - Local
+# Docker Environment Config
 #============================
 
 # ENVIROMENT
@@ -16,8 +16,4 @@ PATH_DATABASE=./volumes/mysql
 DB_DRIVER=mysql
 DB_VERSION=5.7.22
 DB_PORT=3306
-DB_NAME=db_docker_laravel
-DB_USERNAME=dbUserDev
-DB_PASSWORD=dbUserDev123
-DB_PASSWORD_ROOT=dbUserRoot123
 DB_VOLUME=${PATH_DATABASE}/${DB_DRIVER}_${DB_VERSION}
diff --git a/docker/environments/local.env b/docker/environments/local.env
@@ -2,22 +2,8 @@
 # Docker Environment - Local
 #============================
 
-# ENVIROMENT
-SYS_ENV=local
-
-# DIRECTORIES / VOLUMES / PATHS
-PATH_PROJECT_SOURCE=../src
-PATH_NGINX=./containers/nginx
-PATH_NGINX_CONFIGS=${PATH_NGINX}/conf.d/default.conf
-PATH_ENV_CONFIGS=./environments
-PATH_DATABASE=./volumes/mysql
-
 # DATABASE
-DB_DRIVER=mysql
-DB_VERSION=5.7.22
-DB_PORT=3306
-DB_NAME=db_docker_laravel
-DB_USERNAME=dbUserDev
-DB_PASSWORD=dbUserDev123
-DB_PASSWORD_ROOT=dbUserRoot123
-DB_VOLUME=${PATH_DATABASE}/${DB_DRIVER}_${DB_VERSION}
+MYSQL_DATABASE=db_docker_laravel
+MYSQL_USER=dbUserDev
+MYSQL_PASSWORD=dbUserDev123
+MYSQL_ROOT_PASSWORD=dbUserRoot123