Updates

docker-compose.yml

@@ -2,29 +2,30 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX}auth-service_mongo
+        container_name: ${CONTAINER_PREFIX}${SERVICE_NAME}_${DB_TYPE}
         environment:
             - ALLOW_EMPTY_PASSWORD=yes
-            - MONGODB_USERNAME=${DB_USER}
-            - MONGODB_PASSWORD=${DB_PASS}
-            - MONGODB_DATABASE=${DB_NAME}
+            - MONGO_INITDB_ROOT_USERNAME=${DB_USER}
+            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASS}
+            - MONGO_INITDB_DATABASE=${DB_NAME}
         networks:
             - docknet
         volumes:
             - '/volume1/docker/labs/grow-auth/mongo:/data/db'
-            - '/Volume1/docker/labs/grow-auth/.env:./.env'
+            # - '/var/tmp/grow/mongo:/data/db'
         restart: unless-stopped
         image: mongo
     auth-service:
-        container_name: ${CONTAINER_PREFIX}auth-service
+        build: .
+        container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}
         environment:
             - PORT=${PORT}
             - ROUTE_PREFIX=${ROUTE_PREFIX}
             - LOGIN_ROUTE=${LOGIN_ROUTE}
             - RESET_ROUTE=${RESET_ROUTE}
-            - DB_HOST=${CONTAINER_PREFIX}auth-service_mongo
+            - DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
             - DB_USER=${DB_USER}
-            - DB_PASSWORD=${DB_PASS}
+            - DB_PASS=${DB_PASS}
             - DB_NAME=${DB_NAME}
             - SESSION_KEY=${SESSION_KEY}
             - JWT_AUDIENCE=${JWT_AUDIENCE}
@@ -45,8 +46,9 @@ services:
         networks:
             - docknet
         volumes:
-            - '/Volume1/docker/.yarnrc.yml:./.yarnrc.yml'
-            - '/Volume1/docker/labs/grow-auth/.env:./.env'
+            - '/Volume1/docker/.yarnrc.yml:/.yarnrc.yml'
+            - '/Volume1/docker/labs/grow-auth/.env:/.env'
+            # - '~/Projects/Grow/auth/.env:/.env'
         restart: unless-stopped
         image: node
         depends_on: