Double dollar

.drone.yml

@@ -61,7 +61,7 @@ trigger:
   branch:
   - main
   event:
-  - pull_request
+  # - pull_request
   - push
 
 ---
@@ -110,8 +110,14 @@ steps:
       - failure
 - name: Publish Image
   image: docker
+  environment:
+    USERNAME:
+      from_secret: registry_username
+    PASSWORD:
+      from_secret: registry_password
   commands:
-    - docker build -f docker-compose.staging.yml -t git.mifi.dev/mifi/mifi/auth:latest .
+    - docker login -u ${USERNAME} -p {PASSWORD} git.mifi.dev
+    - docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} .
     - docker push git.mifi.dev/mifi/mifi/auth:latest
   volumes:
   - name: dockersock
@@ -168,10 +174,10 @@ depends_on:
   - Test Pipeline
 
 trigger:
-  branch:
-  - main
+  # branch:
+  # - main
   event:
-  - push
+  # - push
   - tag
 
 ---
@@ -192,8 +198,8 @@ steps:
     - docker compose -f docker-compose.staging.yml rm --stop
     - docker compose -f docker-compose.staging.yml up --wait
   volumes:
-  - name: env
-    path: /drone/grow/.env
+  - name: env-secrets
+    path: /drone/grow/staging.secrets.env
   - name: dockersock
     path: /var/run/docker.sock
   - name: dockerconfig
@@ -222,16 +228,16 @@ volumes:
 - name: dockersock
   host:
     path: /var/run/docker.sock
-- name: env
+- name: env-secrets
   host:
-    path: /volume1/docker/beethoven/labs-auth/staging.env
+    path: /volume1/docker/beethoven/labs-auth/staging.secrets.env
 
 depends_on:
   - Test Pipeline
 
 trigger:
-  branch:
-  - main
+  # branch:
+  # - main
   event:
-  - push
+  # - push
   - tag

.env.dev

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

.env.staging

@@ -0,0 +1,6 @@
+HOST=area51.mifi.dev
+PORT=9001
+
+ROUTE_PREFIX=/auth
+
+CONTAINER_PREFIX=mifi

Dockerfile

@@ -1,13 +1,3 @@
-# FROM node:20-alpine AS build
-# RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
-# WORKDIR /home/node/app
-# COPY package*.json .
-# COPY dist/lib .
-# USER node
-# RUN yarn install --frozen-lockfile --production
-# COPY --chown=node:node node_modules ./node_modules
-# CMD ["node", "dist/lib/server/index.js"]
-
 FROM node:20-alpine AS build
 WORKDIR /home/node/app
 COPY package*.json ./

docker-compose.dev.yml

@@ -2,33 +2,31 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        env_file: dev.env
+        env_file: .env.dev
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
         ports:
             - 27017:27017
         networks:
-            - docknet
+            - labs-net
         volumes:
-            # - /var/tmp/labs:/data/db
+            - /var/tmp/labs:/data/db
             - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
         image: mongo:latest
     auth-service:
-        env_file: dev.env
+        env_file: .env.dev
         build: .
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service
         ports:
-            - 9000:9000
+            - 9001:9001
         environment:
             - DB_HOST=${CONTAINER_PREFIX:-dev}-auth-service_mongo
         networks:
-            - docknet
+            - labs-net
         restart: unless-stopped
         image: node:20-alpine
-        links:
-            - auth-service_mongo:${CONTAINER_PREFIX:-dev}-auth-service_mongo
         depends_on:
             - auth-service_mongo
 networks:
-    docknet:
-        name: docknet
+    labs-net:
+        name: labs-net

docker-compose.staging.yml

@@ -2,55 +2,39 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
-        env_file: .env
-        environment:
-            - ALLOW_EMPTY_PASSWORD=yes
-            - MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME}
-            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASSWORD}
-            - MONGO_INITDB_DATABASE=${DB_NAME}
+        container_name: $${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+        env_file:
+            - .env.staging
+            - staging.secrets.env
         networks:
             - docknet
         volumes:
             - '/volume1/docker/labs/auth/mongo:/data/db'
         restart: unless-stopped
-        image: mongo
+        image: mongo:latest
     auth-service:
-        env_file: .env
+        env_file:
+            - .env.staging
+            - staging.secrets.env
         build: .
-        container_name: ${CONTAINER_PREFIX}-auth-service
+        container_name: $${CONTAINER_PREFIX:-mifi}-auth-service
         environment:
-            - PORT=${PORT}
-            - ROUTE_PREFIX=${ROUTE_PREFIX}
-            - LOGIN_ROUTE=${LOGIN_ROUTE}
-            - RESET_ROUTE=${RESET_ROUTE}
-            - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
-            - DB_USERNAME=${DB_USERNAME}
-            - DB_PASSWORD=${DB_PASSWORD}
-            - DB_NAME=${DB_NAME}
-            - SESSION_KEY=${SESSION_KEY}
-            - JWT_AUDIENCE=${JWT_AUDIENCE}
-            - JWT_ISSUER=${JWT_ISSUER}
-            - JWT_SECRET=${JWT_SECRET}
-            - LOGIN_VALID_TIME=${LOGIN_VALID_TIME}
-            - RESET_VALID_MINUTES=${RESET_VALID_MINUTES}
-            - DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
+            - DB_HOST=$${CONTAINER_PREFIX:-mifi}-auth-service_mongo
         labels:
             - 'traefik.enable=true'
-            - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
+            - '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.http.services.grow-service.loadbalancer.server.port=$${PORT}'
         networks:
             - docknet
         restart: unless-stopped
-        image: node
-        links:
-            - auth-service_mongo:${CONTAINER_PREFIX}-auth-service_mongo
+        image: node:20-alpine
         depends_on:
             - auth-service_mongo
 networks:
     docknet:
         name: docknet
+        external: true

mongo-init.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-undef */
-db = db.getSiblingDB(process.env.DB_NAME || 'not_set');
+db = db.getSiblingDB(process.env.DB_NAME);
 db.createUser({
     user: process.env.DB_USERNAME,
     pwd: process.env.DB_PASSWORD,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.25",
+  "version": "0.0.33",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {
@@ -80,6 +80,5 @@
   "repository": {
     "type": "git",
     "url": "https://git.mifi.dev/mifi/auth.git"
-  },
-  "registry": "https://git.mifi.dev"
+  }
 }