Merge pull request 'feature/deploy-from-image-2' (#4) from feature/deploy-from-image-2 into main

Reviewed-on: #4

.drone.yml

@@ -169,10 +169,10 @@ steps:
     ROUTE_PREFIX: /auth
     PORT: 9001
   commands:
-    - docker compose -f docker-compose.staging-image.yml pull
-    - docker compose -f docker-compose.staging-image.yml build --no-cache
-    - docker compose -f docker-compose.staging-image.yml rm --stop
-    - docker compose -f docker-compose.staging-image.yml up --wait
+    - docker compose -f docker-compose.staging_image.yml pull
+    - docker compose -f docker-compose.staging_image.yml build --no-cache
+    - docker compose -f docker-compose.staging_image.yml rm --stop
+    - docker compose -f docker-compose.staging_image.yml up --wait
   volumes:
   - name: env-secrets
     path: /drone/grow/staging.env

.env.dev

@@ -27,5 +27,3 @@ RESET_VALID_MINUTES=15
 DEFAULT_TOKEN_DAYS=1
 
 CONTAINER_PREFIX=dev
-SERVICE_NAME=auth-service
-ENV=development

Dockerfile

@@ -1,5 +1,4 @@
 FROM node:20-alpine AS build
-ENV NODE_ENV development
 WORKDIR /home/node/app
 COPY package*.json ./
 COPY tsconfig.json ./
@@ -15,5 +14,5 @@ WORKDIR /home/node/app
 COPY package*.json ./
 RUN yarn install --frozen-lockfile --production
 COPY --from=0 /home/node/app/dist .
-EXPOSE ${PORT:-9001}
+EXPOSE ${PORT}
 CMD ["node","server/index.js"]

docker-compose.dev.yml

@@ -3,13 +3,16 @@ version: '3.8'
 services:
     auth-service_mongo:
         env_file: .env.dev
+        build:
+            args:
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
         ports:
             - 27017:27017
         networks:
-            - backend
+            - labs-net
         volumes:
-            - auth-db:/data
+            - /var/tmp/labs:/data/db
             - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
         image: mongo:latest
@@ -18,8 +21,10 @@ services:
         build:
             context: .
             args:
-              - PORT
-              - ENV
+              - HOST=${HOST}
+              - PORT=${PORT}
+              - ROUTE_PREFIX=${ROUTE_PREFIX}
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service
         ports:
             - 9001:9001
@@ -27,7 +32,6 @@ services:
             - DB_HOST=${CONTAINER_PREFIX:-dev}-auth-service_mongo
         networks:
             - labs-net
-            - backend
         restart: unless-stopped
         image: node:20-alpine
         depends_on:
@@ -35,7 +39,3 @@ services:
 networks:
     labs-net:
         name: labs-net
-
-volumes:
-    auth-db:
-        external: true

docker-compose.staging.yml

@@ -2,27 +2,23 @@ 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:
             - docknet
         volumes:
-            - 'auth-db:/data'
-            - './mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro'
+            - '/volume1/docker/labs/auth/mongo:/data/db'
+            # - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
         image: mongo:latest
     auth-service:
         env_file:
             - staging.env
-        build:
-            context: .
-            args:
-              - PORT
-              - ENV
-        container_name: ${CONTAINER_PREFIX:-staging}-auth-service
+        build: .
+        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}`)'
@@ -41,7 +37,3 @@ networks:
     docknet:
         name: docknet
         external: true
-
-volumes:
-    auth-db:
-        external: false

docker-compose.staging_image.yml

@@ -2,22 +2,22 @@ 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:
             - docknet
         volumes:
-            - auth-db:/data
-            - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
+            - '/volume1/docker/labs/auth/mongo:/data/db'
+            # - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
         image: mongo:latest
     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}`)'
@@ -32,12 +32,7 @@ services:
         image: git.mifi.dev/mifi/mifi/auth:latest
         depends_on:
             - auth-service_mongo
-
 networks:
     docknet:
         name: docknet
         external: true
-
-volumes:
-    auth-db:
-        external: false

lib/constants/db.ts

@@ -1,5 +1,5 @@
-export const DB_HOST = process.env.DB_HOST;
+export const DB_HOST = process.env.DB_HOST || 'not_set';
 export const DB_PORT = process.env.DB_PORT || 27017;
-export const DB_USERNAME = process.env.DB_USERNAME;
-export const DB_PASSWORD = process.env.DB_PASSWORD;
-export const DB_NAME = process.env.DB_NAME;
+export const DB_USERNAME = process.env.DB_USERNAME || 'not_set';
+export const DB_PASSWORD = process.env.DB_PASSWORD || 'not_set';
+export const DB_NAME = process.env.DB_NAME || 'not_set';

lib/server/index.ts

@@ -5,7 +5,7 @@ import { PORT } from '../constants/env';
 connection.then(
     () => {
         app.listen(PORT);
-        console.debug('Server up and listening', { env: process.env });
+        console.log('LISTENING', process.env);
     },
-    (err) => console.error('Could not reach database', { err, env: process.env }),
+    (err) => console.error('SERVER ERROR!', { err, env: process.env }),
 );

package.json

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