Updates

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

Dockerfile

@@ -4,7 +4,7 @@ ARG PORT=9001
 
 ## mongo build stage
 FROM mongo:$MONGO_VERSION AS database
-COPY mongo-init.js /docker-entrypoint-initdb.d
+COPY mongo-init.sh /docker-entrypoint-initdb.d
 
 ## stage one, build the service
 FROM node:20-alpine AS build

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,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

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:

lib/server/controllers/auth.ts

@@ -9,8 +9,7 @@ import passport from '../passport';
 import { ErrorCodes, getErrorBody } from '../../constants/errors';
 import { authenticated } from '../middleware/authenication';
 
-// const routerOpts: Router.IRouterOptions = { prefix };
-const routerOpts: Router.IRouterOptions = {};
+const routerOpts: Router.IRouterOptions = { prefix };
 const router: Router = new Router(routerOpts);
 
 router.get('/info', (ctx) => {

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