Finalized drone pipeline (mostly)

.drone.yml

@@ -61,14 +61,13 @@ trigger:
   branch:
   - main
   event:
-  - pull_request
+  # - pull_request
   - push
 
 ---
 kind: pipeline
 type: docker
 name: Publish Pipeline
-group: publish
 
 workspace:
   path: /drone/grow
@@ -80,16 +79,10 @@ steps:
     - yarn install
     - yarn build
 - name: Publish NPM
-  image: plugins/npm
+  image: node:20-alpine
   failure: ignore
-  settings:
+  commands:
-    username:
+    - yarn publish -t ${DRONE_TAG}
-      from_secret: registry_username
-    password:
-      from_secret: registry_password
-    registry: https://git.mifi.dev/api/packages/mifi/npm
-    token:
-    - from_secret: gitea_token
   volumes:
   - name: npmrc
     path: /drone/grow/.npmrc
@@ -109,34 +102,18 @@ steps:
       - success
       - failure
 - name: Publish Image
-  image: docker
+  image: plugins/docker
-  commands:
+  settings:
-    - docker build -f docker-compose.staging.yml -t git.mifi.dev/mifi/mifi/auth:latest .
+    auto_tag: true
-    - docker push git.mifi.dev/mifi/mifi/auth:latest
+    repo: git.mifi.dev/mifi/mifi/auth
-  volumes:
+    registry: git.mifi.dev
-  - name: dockersock
+    debug: true
-    path: /var/run/docker.sock
+    ssh-agent-key:
-  - name: dockerconfig
+      from_secret: reg_token    
-    path: /drone/grow/.docker/config.json
+    username: <token>
-# - name: Publish Image
+    password:
-#   image: plugins/docker
+      from_secret: reg_token
-#   settings:
+  secrets: [reg_token]
-#     auto_tag: true
-#     squash: true
-#     repo: git.mifi.dev/mifi/auth
-#     context: mifi
-#     registry: git.mifi.dev
-#     username:
-#       from_secret: registry_username
-#     password:
-#       from_secret: registry_password
-#     ssh-agent-key:
-#       from_secret: gitea_token
-  volumes:
-  - name: dockersock
-    path: /var/run/docker.sock
-  - name: dockerconfig
-    path: /drone/grow/.docker/config.json
 - name: Report Image Publish Status
   image: plugins/webhook
   settings:
@@ -168,10 +145,10 @@ depends_on:
   - Test Pipeline
 
 trigger:
-  branch:
+  # branch:
-  - main
+  # - main
   event:
-  - push
+  # - push
   - tag
 
 ---
@@ -186,14 +163,19 @@ steps:
 - name: Deploy Container
   image: docker
   privileged: true
+  environment:
+    CONTAINER_PREFIX: staging
+    HOST: area51.mifi.dev
+    ROUTE_PREFIX: /auth
+    PORT: 9001
   commands:
     - docker compose -f docker-compose.staging.yml pull
     - docker compose -f docker-compose.staging.yml build --no-cache
     - docker compose -f docker-compose.staging.yml rm --stop
     - docker compose -f docker-compose.staging.yml up --wait
   volumes:
-  - name: env
+  - name: env-secrets
-    path: /drone/grow/.env
+    path: /drone/grow/staging.env
   - name: dockersock
     path: /var/run/docker.sock
   - name: dockerconfig
@@ -222,7 +204,7 @@ volumes:
 - name: dockersock
   host:
     path: /var/run/docker.sock
-- name: env
+- name: env-secrets
   host:
     path: /volume1/docker/beethoven/labs-auth/staging.env
 
@@ -230,8 +212,8 @@ depends_on:
   - Test Pipeline
 
 trigger:
-  branch:
+  # branch:
-  - main
+  # - 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

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 ./
@@ -15,14 +5,14 @@ COPY tsconfig.json ./
 COPY lib ./lib
 RUN ls -a
 RUN yarn install
-RUN yarn build:production
+RUN yarn build
 
 ## this is stage two , where the app actually runs
 FROM node:20-alpine AS containerize
+ENV NODE_ENV ${ENV:-production}
 WORKDIR /home/node/app
 COPY package*.json ./
 RUN yarn install --frozen-lockfile --production
 COPY --from=0 /home/node/app/dist .
-EXPOSE 9001
+EXPOSE ${PORT}
-EXPOSE 27017
 CMD ["node","server/index.js"]

docker-compose.dev.yml

@@ -2,33 +2,40 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        env_file: dev.env
+        env_file: .env.dev
+        build:
+            args:
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
         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: .
+        build:
+            context: .
+            args:
+              - HOST=${HOST}
+              - PORT=${PORT}
+              - ROUTE_PREFIX=${ROUTE_PREFIX}
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
         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:
+    labs-net:
-        name: docknet
+        name: labs-net

docker-compose.staging.yml

@@ -3,38 +3,22 @@ version: '3.8'
 services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX}-auth-service_mongo
-        env_file: .env
+        env_file:
-        environment:
+            - staging.env
-            - ALLOW_EMPTY_PASSWORD=yes
-            - MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME}
-            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASSWORD}
-            - MONGO_INITDB_DATABASE=${DB_NAME}
         networks:
             - docknet
         volumes:
             - '/volume1/docker/labs/auth/mongo:/data/db'
+            # - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
-        image: mongo
+        image: mongo:latest
     auth-service:
-        env_file: .env
+        env_file:
+            - staging.env
         build: .
         container_name: ${CONTAINER_PREFIX}-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}
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
@@ -46,11 +30,10 @@ services:
         networks:
             - docknet
         restart: unless-stopped
-        image: node
+        image: node:20-alpine
-        links:
-            - auth-service_mongo:${CONTAINER_PREFIX}-auth-service_mongo
         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.35",
   "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"
 }