More changes

docker-compose.yml

@@ -3,10 +3,11 @@ version: '3.8'
 services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
+        env_file: staging.env
         environment:
             - ALLOW_EMPTY_PASSWORD=yes
-            - MONGO_INITDB_ROOT_USERNAME=${DB_USER}
-            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASS}
+            - MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME}
+            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASSWORD}
             - MONGO_INITDB_DATABASE=${DB_NAME}
         networks:
             - docknet
@@ -15,24 +16,25 @@ services:
         restart: unless-stopped
         image: mongo
     auth-service:
+        env_file: staging.env
         build: .
         container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}
         environment:
-            - PORT=${PORT}
-            - ROUTE_PREFIX=${ROUTE_PREFIX}
-            - LOGIN_ROUTE=${LOGIN_ROUTE}
-            - RESET_ROUTE=${RESET_ROUTE}
+            # - PORT=${PORT}
+            # - ROUTE_PREFIX=${ROUTE_PREFIX}
+            # - LOGIN_ROUTE=${LOGIN_ROUTE}
+            # - RESET_ROUTE=${RESET_ROUTE}
             - DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
-            - DB_USER=${DB_USER}
-            - DB_PASS=${DB_PASS}
-            - DB_NAME=${DB_NAME}
-            - SESSION_KEY=${SESSION_KEY}
-            - JWT_AUDIENCE=${JWT_AUDIENCE}
-            - JWT_ISSUER=${JWT_ISSUER}
-            - JWT_SECRET=${JWT_SECRET}
-            - LOGIN_VALID_TIME=${LOGIN_VALID_TIME}
-            - RESET_VALID_MINUTES=${RESET_VALID_MINUTES}
-            - DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
+            # - DB_USER=${DB_USERNAME}
+            # - DB_PASS=${DB_PASSWORD}
+            # - DB_NAME=${DB_NAME}
+            # - SESSION_KEY=${SESSION_KEY}
+            # - JWT_AUDIENCE=${JWT_AUDIENCE}
+            # - JWT_ISSUER=${JWT_ISSUER}
+            # - JWT_SECRET=${JWT_SECRET}
+            # - LOGIN_VALID_TIME=${LOGIN_VALID_TIME}
+            # - RESET_VALID_MINUTES=${RESET_VALID_MINUTES}
+            # - DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.grow.rule=Host(`${HOST}`)'