Finalized drone pipeline (mostly)

.drone.yml

@@ -1,70 +1,70 @@
-# kind: pipeline
+kind: pipeline
-# type: docker
+type: docker
-# name: Test Pipeline
+name: Test Pipeline
 
-# workspace:
+workspace:
-#   path: /drone/grow
+  path: /drone/grow
 
-# steps:
+steps:
-# - name: yarn install
+- name: yarn install
-#   image: node:latest
+  image: node:latest
-#   commands:
+  commands:
-#   - yarn install
+  - yarn install
-# - name: Code Style Checks
+- name: Code Style Checks
-#   image: node:latest
+  image: node:latest
-#   commands:
+  commands:
-#   - yarn prettier
+  - yarn prettier
-# - name: Lint
+- name: Lint
-#   image: node:latest
+  image: node:latest
-#   commands:
+  commands:
-#   - yarn lint
+  - yarn lint
-# - name: Unit Tests
+- name: Unit Tests
-#   image: node:latest
+  image: node:latest
-#   commands:
+  commands:
-#   - yarn test
+  - yarn test
-# - name: Send Test Status Notification
+- name: Send Test Status Notification
-#   image: plugins/webhook
+  image: plugins/webhook
-#   settings:
+  settings:
-#     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
-#     content_type: application/json
+    content_type: application/json
-#     template: |
+    template: |
-#       {
+      {
-#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "text": "[{{ repo.name }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-#         "username":"DroneBot"
+        "username":"DroneBot"
-#       }
+      }
-#   when:
+  when:
-#     status:
+    status:
-#       - success
+      - success
-#       - failure
+      - failure
-# - name: Build
+- name: Build
-#   image: node:latest
+  image: node:latest
-#   commands:
+  commands:
-#   - yarn build
+  - yarn build
-# - name: Send Build Status Notifications
+- name: Send Build Status Notifications
-#   image: plugins/webhook
+  image: plugins/webhook
-#   settings:
+  settings:
-#     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
-#     content_type: application/json
+    content_type: application/json
-#     template: |
+    template: |
-#       {
+      {
-#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "text": "[{{ repo.name }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-#         "username":"DroneBot"
+        "username":"DroneBot"
-#       }
+      }
-#   when:
+  when:
-#     status:
+    status:
-#       - success
+      - success
-#       - failure
+      - failure
 
-# trigger:
+trigger:
-#   branch:
+  branch:
-#   - main
+  - main
-#   event:
+  event:
-#   # - pull_request
+  # - pull_request
-#   - push
+  - push
 
-# ---
+---
 kind: pipeline
 type: docker
 name: Publish Pipeline
@@ -79,27 +79,13 @@ steps:
     - yarn install
     - yarn build
 - name: Publish NPM
-  image: node:latest
+  image: node:20-alpine
   failure: ignore
   commands:
-    - yarn npm publish
+    - yarn publish -t ${DRONE_TAG}
   volumes:
   - name: npmrc
     path: /drone/grow/.npmrc
-# - name: Publish NPM
-#   image: plugins/npm
-#   failure: ignore
-#   settings:
-#     username:
-#       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
 - name: Report NPM Publish Status
   image: plugins/webhook
   settings:
@@ -116,16 +102,18 @@ steps:
       - success
       - failure
 - name: Publish Image
-  image: docker
+  image: plugins/docker
-  commands:
+  settings:
-    # - 'docker login git.mifi.dev'
+    auto_tag: true
-    - 'docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} .'
+    repo: git.mifi.dev/mifi/mifi/auth
-    - docker push git.mifi.dev/mifi/mifi/auth:latest
+    registry: git.mifi.dev
-  volumes:
+    debug: true
-  - name: dockersock
+    ssh-agent-key:
-    path: /var/run/docker.sock
+      from_secret: reg_token    
-  - name: dockerconfig
+    username: <token>
-    path: /drone/grow/.docker/config.json
+    password:
+      from_secret: reg_token
+  secrets: [reg_token]
 - name: Report Image Publish Status
   image: plugins/webhook
   settings:
@@ -153,15 +141,15 @@ volumes:
   host:
     path: /volume1/docker/beethoven/labs-auth/.npmrc
 
-# depends_on:
+depends_on:
-#   - Test Pipeline
+  - Test Pipeline
 
 trigger:
-  branch:
+  # branch:
-  - main
+  # - main
   event:
-  - push
+  # - push
-  # - tag
+  - tag
 
 ---
 kind: pipeline
@@ -220,12 +208,12 @@ volumes:
   host:
     path: /volume1/docker/beethoven/labs-auth/staging.env
 
-# depends_on:
+depends_on:
-#   - Test Pipeline
+  - Test Pipeline
 
 trigger:
-  branch:
+  # branch:
-  - main
+  # - main
   event:
-  - push
+  # - push
-  # - tag
+  - tag

Dockerfile

@@ -5,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.staging.yml

@@ -9,6 +9,7 @@ services:
             - 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:latest
     auth-service:
@@ -17,7 +18,7 @@ services:
         build: .
         container_name: ${CONTAINER_PREFIX}-auth-service
         environment:
-            - DB_HOST=${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+            - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'

package.json

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