Reorganize

docker-compose.override.yml

@@ -3,14 +3,15 @@ version: "3.7"
 # Service Definitions
 services:
 
+  db:
+    environment:
+      POSTGRES_USER: "dev"
+      POSTGRES_PASSWORD: "dev"
+      POSTGRES_DB: "t2_stats"
+
+
   parser:
     environment: 
       DATABASE_URL: "postgres://dev:dev@db:5432/t2_stats"
     volumes:
       - ./app/t2-stat-parser:/app
-  
-  db:
-    environment:
-      POSTGRES_USER: "dev"
-      POSTGRES_PASSWORD: "dev"
-      POSTGRES_DB: "t2_stats"

docker-compose.yml

@@ -9,6 +9,8 @@ services:
       - "5432:5432"
     environment:
       POSTGRES_DB: "t2_stats"
+      POSTGRES_USER: "${POSTGRES_USER}"
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
     volumes:
       - ./build/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       - ./build/postgres/export_local_db.sh:/export_local_db.sh    
@@ -23,6 +25,11 @@ services:
       dockerfile: ./build/go-t2-stat-parser/Dockerfile
     ports:
       - "8080:8080"
+    environment: 
+      DATABASE_URL: "postgres://${POSTGRES_USER}:{POSTGRES_PASSWORD}@db:5432/t2_stats"
+      FTP_HOST: "${FTP_HOST}"
+      FTP_USER: "${FTP_USER}"
+      FTP_PW: "${FTP_PW}"      
     depends_on:
       - db
     networks:
@@ -30,13 +37,6 @@ services:
       - external
 
 
-    # secrets:
-    #   - prod.postgres.host
-    #   - prod.postgres.username
-    #   - prod.postgres.password
-
-
-
 volumes:
   psqldata: