From 64c4345c280b32d86cc3dadf2d64504fb0576e7e Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Fri, 26 May 2023 11:22:24 -0400
Subject: [PATCH] Hmm...

---
 Dockerfile                       |  3 ---
 docker-compose.staging-build.yml |  4 +++-
 docker-compose.staging-image.yml | 13 +++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 413ec56..f036912 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,10 +7,7 @@ ARG YARN_VERSION=3.5.0
 
 ## mongo build stage
 FROM mongo:${MONGO_VERSION} AS database
-ENV NODE_ENV=${ENV}
 ARG MONGO_ENTRY_FILE=${MONGO_ENTRY_FILE:-latest}
-ENV MONGO_VERSION=${MONGO_VERSION}
-RUN echo ${MONGO_ENTRY_FILE} ${MONGO_VERSION} ${NODE_ENV}
 COPY docker-entrypoint-initdb.d/mongo-init-${MONGO_ENTRY_FILE}.sh ./docker-entrypoint-initdb.d/mongo-init.sh
 
 ## stage one, build the service
diff --git a/docker-compose.staging-build.yml b/docker-compose.staging-build.yml
index 20ee262..722b8d8 100644
--- a/docker-compose.staging-build.yml
+++ b/docker-compose.staging-build.yml
@@ -9,7 +9,9 @@ services:
             context: .
             target: database
             args:
-              MONGO_VERSION: 4.4
+              - ENV
+              - MONGO_ENTRY_FILE: 4.4
+              - MONGO_VERSION: 4.4
         networks:
             - auth-backend
         volumes:
diff --git a/docker-compose.staging-image.yml b/docker-compose.staging-image.yml
index 3dd73ab..db82448 100644
--- a/docker-compose.staging-image.yml
+++ b/docker-compose.staging-image.yml
@@ -3,29 +3,27 @@ version: '3.8'
 services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX}-auth-service_mongo
-        env_file:
-            - staging.env
         networks:
+            - auth-backend
             - docknet
         volumes:
             - auth-db:/data
         restart: unless-stopped
         image: mongo:4.4
     auth-service:
-        env_file:
-            - staging.env
         container_name: ${CONTAINER_PREFIX}-auth-service
         environment:
             - 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.rule=Host(`${HOST}`) && PathPrefix(`${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}'
         networks:
+            - auth-backend
             - docknet
         restart: unless-stopped
         depends_on:
@@ -33,10 +31,13 @@ services:
         image: git.mifi.dev/mifi/auth-service:latest
 
 networks:
+    auth-backend:
+        driver: bridge
+        external: false
     docknet:
         name: docknet
         external: true
 
 volumes:
     auth-db:
-        external: false
+        external: true