Ha! Got it! And version bump

TODO: Still no access to routes on staging... hmmm...

.drone.yml

@@ -166,8 +166,8 @@ steps:
     ROUTE_PREFIX: /auth
     PORT: 9001
   commands:
-    # - docker compose -f docker-compose.staging-build.yml build --pull --no-cache
-    - docker compose -f docker-compose.staging-build.yml up --remove-orphans --pull always --build --force-recreate --wait
+    - docker compose -f docker-compose.staging-build.yml build --pull --no-cache
+    - docker compose -f docker-compose.staging-build.yml up --remove-orphans --force-recreate --wait
   volumes:
   - name: env-secrets
     path: /drone/auth/staging.env

.env.dev

@@ -6,14 +6,14 @@ ROUTE_PREFIX=/auth
 LOGIN_ROUTE=/login
 RESET_ROUTE=/reset
 
-DB_ADMIN_USERNAME=root
-DB_ADMIN_PASSWORD=password
+# DB_ADMIN_USERNAME=root
+# DB_ADMIN_PASSWORD=password
 DB_USERNAME=user
 DB_PASSWORD=password
 DB_NAME=auth
 
-MONGO_INITDB_ROOT_USERNAME=$DB_ADMIN_USERNAME
-MONGO_INITDB_ROOT_PASSWORD=$DB_ADMIN_PASSWORD
+MONGO_INITDB_ROOT_USERNAME=$DB_USERNAME
+MONGO_INITDB_ROOT_PASSWORD=$DB_PASSWORD
 MONGO_INITDB_DATABASE=$DB_NAME
 
 SESSION_KEY=shjhakjfhfjdshjksdhfdshfhfduyeyb73te4

Dockerfile

@@ -1,8 +1,12 @@
-FROM mongo:latest AS auth-service_mongo
-ENV NODE_ENV development
-WORKDIR /docker-entrypoint-initdb.d
-COPY mongo-init.js ./
+ARG ENV=production
+ARG MONGO_VERSION=latest
+ARG PORT=9001
 
+## mongo build stage
+FROM mongo:$MONGO_VERSION AS database
+COPY mongo-init.sh /docker-entrypoint-initdb.d
+
+## stage one, build the service
 FROM node:20-alpine AS build
 ENV NODE_ENV development
 WORKDIR /home/node/app
@@ -14,11 +18,11 @@ RUN yarn install
 RUN yarn build
 
 ## this is stage two , where the app actually runs
-FROM node:20-alpine AS auth-service
-ENV NODE_ENV ${ENV:-production}
+FROM node:20-alpine AS containerize
+ENV NODE_ENV $ENV
 WORKDIR /home/node/app
 COPY package*.json ./
 RUN yarn install --frozen-lockfile --production
-COPY --from=0 /home/node/app/dist .
-EXPOSE ${PORT:-9001}
+COPY --from=build /home/node/app/dist .
+EXPOSE $PORT
 CMD ["node","server/index.js"]

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:
@@ -11,7 +11,6 @@ services:
         volumes:
             - auth-db:/data/db
             - auth-db:/data/configdb
-            - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
         image: mongo:latest
     auth-service:
@@ -21,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

docker-compose.staging-build.yml

@@ -2,43 +2,53 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX:-staging}-auth-service_mongo
-        env_file:
-            - staging.env
-        build: .
-        networks:
-            - docknet
-        volumes:
-            - 'auth-db:/data/db'
-            - 'auth-db:/data/configdb'
-        restart: unless-stopped
-        image: mongo:latest
-    auth-service:
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
         env_file:
             - staging.env
         build:
             context: .
+            target: database
+            args:
+              MONGO_VERSION: 4.4
+        networks:
+            - auth-backend
+        volumes:
+            - 'auth-db:/data/db'
+            - 'auth-db:/data/configdb'
+        restart: unless-stopped
+        image: mongo:4.4
+    auth-service:
+        container_name: ${CONTAINER_PREFIX}-auth-service
+        env_file:
+            - staging.env
+        build:
+            context: .
+            target: containerize
             args:
               - PORT
               - ENV
-        container_name: ${CONTAINER_PREFIX:-staging}-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}`)'
-            - '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}`) && PathPrefix(`${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

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:
@@ -11,13 +11,13 @@ services:
             - auth-db:/data
             - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
-        image: mongo:latest
+        image: mongo:4.4
     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:

mongo-init.js

@@ -1,12 +0,0 @@
-/* eslint-disable no-undef */
-db = db.getSiblingDB(process.env.DB_NAME);
-db.createUser({
-    user: process.env.DB_USERNAME,
-    pwd: process.env.DB_PASSWORD,
-    roles: [
-        {
-            role: 'readWrite',
-            db: process.env.DB_NAME,
-        },
-    ],
-});

mongo-init.sh

@@ -0,0 +1,14 @@
+set -e
+
+mongo <<EOF
+use $MONGO_INITDB_DATABASE
+
+db.createUser({
+  user: '$DB_USERNAME',
+  pwd: '$DB_PASSWORD',
+  roles: [{
+    role: 'readWrite',
+    db: '$MONGO_INITDB_DATABASE'
+  }]
+})
+EOF

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {