From 967ef4e44022c9ff0cfd813be2ef88874c69b079 Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Sat, 13 May 2023 10:44:21 -0400
Subject: [PATCH] Updates

---
 docker-compose.dev.yml           |  6 +++---
 docker-compose.staging-build.yml | 25 +++++++++++++++----------
 docker-compose.staging-image.yml |  8 ++++----
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 6bea77f..05f2c74 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -3,7 +3,7 @@ version: '3.8'
 services:
     auth-service_mongo:
         env_file: .env.dev
-        container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
         ports:
             - 27017:27017
         networks:
@@ -20,11 +20,11 @@ services:
             args:
               - PORT
               - ENV
-        container_name: ${CONTAINER_PREFIX:-dev}-auth-service
+        container_name: ${CONTAINER_PREFIX}-auth-service
         ports:
             - 9001:9001
         environment:
-            - DB_HOST=${CONTAINER_PREFIX:-dev}-auth-service_mongo
+            - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
         networks:
             - labs-net
             - backend
diff --git a/docker-compose.staging-build.yml b/docker-compose.staging-build.yml
index 2eaa5c3..e414113 100644
--- a/docker-compose.staging-build.yml
+++ b/docker-compose.staging-build.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX:-staging}-auth-service_mongo
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
         env_file:
             - staging.env
         build:
@@ -11,14 +11,14 @@ services:
             args:
               MONGO_VERSION: 4.4
         networks:
-            - docknet
+            - auth-backend
         volumes:
             - 'auth-db:/data/db'
             - 'auth-db:/data/configdb'
         restart: unless-stopped
         image: mongo:4.4
     auth-service:
-        container_name: ${CONTAINER_PREFIX:-staging}-auth-service
+        container_name: ${CONTAINER_PREFIX}-auth-service
         env_file:
             - staging.env
         build:
@@ -28,22 +28,27 @@ services:
               - PORT
               - ENV
         environment:
-            - DB_HOST=${CONTAINER_PREFIX:-staging}-auth-service_mongo
+            - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
         labels:
             - 'traefik.enable=true'
-            - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
-            - 'traefik.http.routers.grow.entrypoints=websecure'
-            - 'traefik.http.routers.grow.tls=true'
-            - 'traefik.http.routers.grow.tls.certresolver=letsencrypt'
-            - 'traefik.http.routers.grow.service=grow-service'
-            - 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}'
+            - 'traefik.docker.network=docknet'
+            - 'traefik.http.routers.labs-auth.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
+            - 'traefik.http.routers.labs-auth.entrypoints=websecure'
+            - 'traefik.http.routers.labs-auth.tls=true'
+            - 'traefik.http.routers.labs-auth.tls.certresolver=letsencrypt'
+            - 'traefik.http.routers.labs-auth.service=labs-auth-service'
+            - 'traefik.http.services.labs-auth-service.loadbalancer.server.port=${PORT}'
         networks:
+            - auth-backend
             - docknet
         restart: unless-stopped
         image: node:20-alpine
         depends_on:
             - auth-service_mongo
 networks:
+    auth-backend:
+        driver: bridge
+        external: false
     docknet:
         name: docknet
         external: true
diff --git a/docker-compose.staging-image.yml b/docker-compose.staging-image.yml
index 95c4b97..e464bef 100644
--- a/docker-compose.staging-image.yml
+++ b/docker-compose.staging-image.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX:-staging}-auth-service_mongo
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
         env_file:
             - staging.env
         networks:
@@ -15,9 +15,9 @@ services:
     auth-service:
         env_file:
             - staging.env
-        container_name: ${CONTAINER_PREFIX:-staging}-auth-service
+        container_name: ${CONTAINER_PREFIX}-auth-service
         environment:
-            - DB_HOST=${CONTAINER_PREFIX:-staging}-auth-service_mongo
+            - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
@@ -29,9 +29,9 @@ services:
         networks:
             - docknet
         restart: unless-stopped
-        image: git.mifi.dev/mifi/mifi/auth:latest
         depends_on:
             - auth-service_mongo
+        image: git.mifi.dev/mifi/mifi/auth:latest
 
 networks:
     docknet: