Fix for deploy...

.drone.yml

@@ -1,74 +1,73 @@
-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
-group: publish
 
 workspace:
   path: /drone/grow
@@ -80,19 +79,27 @@ steps:
     - yarn install
     - yarn build
 - name: Publish NPM
-  image: plugins/npm
+  image: node:latest
   failure: ignore
-  settings:
+  commands:
-    username:
+    - yarn npm publish
-      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: 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:
@@ -111,32 +118,14 @@ steps:
 - name: Publish Image
   image: docker
   commands:
-    - docker build -f docker-compose.staging.yml -t git.mifi.dev/mifi/mifi/auth:latest .
+    # - 'docker login 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
     path: /var/run/docker.sock
   - name: dockerconfig
     path: /drone/grow/.docker/config.json
-# - name: Publish Image
-#   image: plugins/docker
-#   settings:
-#     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:
@@ -164,15 +153,15 @@ volumes:
   host:
     path: /volume1/docker/beethoven/labs-auth/.npmrc
 
-depends_on:
+# depends_on:
-  - Test Pipeline
+#   - Test Pipeline
 
 trigger:
   branch:
   - main
   event:
   - push
-  - tag
+  # - tag
 
 ---
 kind: pipeline
@@ -186,13 +175,18 @@ 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/staging.env
   - name: dockersock
     path: /var/run/docker.sock
@@ -222,16 +216,16 @@ volumes:
 - name: dockersock
   host:
     path: /var/run/docker.sock
-- name: env
+- name: env-secrets
   host:
     path: /volume1/docker/beethoven/labs-auth/staging.env
 
-depends_on:
+# depends_on:
-  - Test Pipeline
+#   - Test Pipeline
 
 trigger:
   branch:
   - main
   event:
   - push
-  - tag
+  # - 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 ./

docker-compose.dev.yml

@@ -2,7 +2,10 @@ 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
@@ -14,8 +17,14 @@ services:
         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:
             - 9001:9001

docker-compose.staging.yml

@@ -2,8 +2,9 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
-        env_file: staging.env
+        env_file:
+            - staging.env
         networks:
             - docknet
         volumes:
@@ -11,9 +12,10 @@ services:
         restart: unless-stopped
         image: mongo:latest
     auth-service:
-        env_file: staging.env
+        env_file:
+            - staging.env
         build: .
-        container_name: ${CONTAINER_PREFIX:-mifi}-auth-service
+        container_name: ${CONTAINER_PREFIX}-auth-service
         environment:
             - DB_HOST=${CONTAINER_PREFIX:-mifi}-auth-service_mongo
         labels:

package.json

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