Last bits to make it whole again...

.drone.yml

@@ -152,7 +152,7 @@ volumes:
     path: /var/run/docker.sock
 - name: npmrc
   host:
-    path: /volume1/docker/grow/labs-auth/.npmrc
+    path: /volume1/docker/beethoven/labs-auth/.npmrc
 
 depends_on:
   - Test Pipeline
@@ -214,7 +214,7 @@ volumes:
     path: /var/run/docker.sock
 - name: env
   host:
-    path: /volume1/docker/labs/grow-auth/.env
+    path: /volume1/docker/beethoven/labs-auth/staging.env
 
 depends_on:
   - Test Pipeline

dev.env

@@ -1,4 +1,4 @@
-HOST=grow.mifi.dev
+HOST=localhost
 PORT=9001
 
 ROUTE_PREFIX=/auth
@@ -20,6 +20,6 @@ LOGIN_VALID_TIME=12H
 RESET_VALID_MINUTES=15
 DEFAULT_TOKEN_DAYS=1
 
-CONTAINER_PREFIX=grow
+CONTAINER_PREFIX=sso
 SERVICE_NAME=auth-service
 DB_TYPE=mongo

docker-compose.yml

@@ -2,8 +2,8 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
+        container_name: ${CONTAINER_PREFIX:package}-auth-service_mongo
-        env_file: staging.env
+        env_file: .env
         environment:
             - ALLOW_EMPTY_PASSWORD=yes
             - MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME}
@@ -12,44 +12,43 @@ services:
         networks:
             - docknet
         volumes:
-            - '/volume1/docker/labs/grow-auth/mongo:/data/db'
+            - '/volume1/docker/labs/auth/mongo:/data/db'
         restart: unless-stopped
         image: mongo
     auth-service:
-        env_file: staging.env
+        env_file: .env
         build: .
-        container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}
+        container_name: ${CONTAINER_PREFIX:package}-auth-service
         environment:
-            # - PORT=${PORT}
+            - PORT=${PORT}
-            # - ROUTE_PREFIX=${ROUTE_PREFIX}
+            - ROUTE_PREFIX=${ROUTE_PREFIX}
-            # - LOGIN_ROUTE=${LOGIN_ROUTE}
+            - LOGIN_ROUTE=${LOGIN_ROUTE}
-            # - RESET_ROUTE=${RESET_ROUTE}
+            - RESET_ROUTE=${RESET_ROUTE}
-            - DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
+            - DB_HOST=${CONTAINER_PREFIX:package}-auth-service_mongo
-            # - DB_USER=${DB_USERNAME}
+            - DB_USERNAME=${DB_USERNAME}
-            # - DB_PASS=${DB_PASSWORD}
+            - DB_PASSWORD=${DB_PASSWORD}
-            # - DB_NAME=${DB_NAME}
+            - DB_NAME=${DB_NAME}
-            # - SESSION_KEY=${SESSION_KEY}
+            - SESSION_KEY=${SESSION_KEY}
-            # - JWT_AUDIENCE=${JWT_AUDIENCE}
+            - JWT_AUDIENCE=${JWT_AUDIENCE}
-            # - JWT_ISSUER=${JWT_ISSUER}
+            - JWT_ISSUER=${JWT_ISSUER}
-            # - JWT_SECRET=${JWT_SECRET}
+            - JWT_SECRET=${JWT_SECRET}
-            # - LOGIN_VALID_TIME=${LOGIN_VALID_TIME}
+            - LOGIN_VALID_TIME=${LOGIN_VALID_TIME}
-            # - RESET_VALID_MINUTES=${RESET_VALID_MINUTES}
+            - RESET_VALID_MINUTES=${RESET_VALID_MINUTES}
-            # - DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
+            - DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
         labels:
             - 'traefik.enable=true'
-            - 'traefik.http.routers.grow.rule=Host(`${HOST}`)'
+            - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
-            - 'traefik.http.routers.grow.rule=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=gitea'
+            - 'traefik.http.routers.grow.service=grow-service'
-            - 'traefik.http.services.gitea.loadbalancer.server.port=${PORT}'
+            - 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}'
         networks:
             - docknet
         restart: unless-stopped
         image: node
         links:
-            - auth-service_mongo:${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
+            - auth-service_mongo:${CONTAINER_PREFIX:package}-auth-service_mongo
         depends_on:
             - auth-service_mongo
 networks:

lib/constants/db.ts

@@ -1,5 +1,5 @@
 export const DB_HOST = process.env.DB_HOST || 'mongodb';
 export const DB_PORT = process.env.DB_PORT || 27017;
-export const DB_USER = process.env.DB_USER || 'test';
+export const DB_USERNAME = process.env.DB_USERNAME || 'test';
-export const DB_PASS = process.env.DB_PASSWORD || 'test';
+export const DB_PASSWORD = process.env.DB_PASSWORD || 'test';
 export const DB_NAME = process.env.DB_NAME || 'auth';

lib/db/index.ts

@@ -1,5 +1,5 @@
 import mongoose from 'mongoose';
 
-import { DB_HOST, DB_NAME, DB_PASS, DB_PORT, DB_USER } from '../constants/db';
+import { DB_HOST, DB_NAME, DB_PASSWORD, DB_PORT, DB_USERNAME } from '../constants/db';
 
-export const connection = mongoose.connect(`mongodb://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}`);
+export const connection = mongoose.connect(`mongodb://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}`);

package.json

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