oops

# Conflicts:
#	Dockerfile

.drone.yml

@@ -84,41 +84,41 @@ workspace:
   path: /drone/auth
 
 steps:
-- name: Build Package
-  image: node:20-bullseye-slim
-  environment:
-    YARN_VERSION: 3.5.0
-  commands:
-  - yarn set version stable
-  - yarn install
-  - yarn build:production
-  volumes:
-  - name: yarnrc
-    path: /drone/auth/.yarnrc.yml
-- name: Publish NPM
-  image: node:20-bullseye-slim
-  commands:
-    - yarn npm publish
-  volumes:
-  - name: npmrc
-    path: /drone/auth/.npmrc
-  - name: yarnrc
-    path: /drone/auth/.yarnrc.yml
-- name: Report NPM Publish Status
-  image: plugins/webhook
-  settings:
-    urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
-    content_type: application/json
-    template: |
-      {
-        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-        "text": "[{{ repo.name }} - New npm package release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-        "username":"DroneBot"
-      }
-  when:
-    status:
-      - success
-      - failure
+# - name: Build Package
+#   image: node:20-bullseye-slim
+#   environment:
+#     YARN_VERSION: 3.5.0
+#   commands:
+#   - yarn set version stable
+#   - yarn install
+#   - yarn build:production
+#   volumes:
+#   - name: yarnrc
+#     path: /drone/auth/.yarnrc.yml
+# - name: Publish NPM
+#   image: node:20-bullseye-slim
+#   commands:
+#     - yarn npm publish
+#   volumes:
+#   - name: npmrc
+#     path: /drone/auth/.npmrc
+#   - name: yarnrc
+#     path: /drone/auth/.yarnrc.yml
+# - name: Report NPM Publish Status
+#   image: plugins/webhook
+#   settings:
+#     urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
+#     content_type: application/json
+#     template: |
+#       {
+#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+#         "text": "[{{ repo.name }} - New npm package release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+#         "username":"DroneBot"
+#       }
+#   when:
+#     status:
+#       - success
+#       - failure
 - name: Publish Image
   image: plugins/docker
   settings:
@@ -126,8 +126,9 @@ steps:
     repo: git.mifi.dev/mifi/auth-service
     registry: git.mifi.dev
     build_args:
-      MONGO_VERSION: latest
-      NPM_TOKEN:
+      - MONGO_ENTRY_FILE=latest
+      - MONGO_VERSION=latest
+      - NPM_TOKEN:
         from_secret: reg_token
     ssh-agent-key:
       from_secret: reg_token    
@@ -169,8 +170,11 @@ depends_on:
   - Test Pipeline
 
 trigger:
+  branch:
+  - main
   event:
-  - tag
+  # - tag
+  - push
 
 ---
 kind: pipeline

Dockerfile

@@ -1,20 +1,23 @@
 ARG ENV=production
-ARG PORT=9001
+ARG MONGO_ENTRY_FILE
+ARG MONGO_VERSION=latest
 ARG NPM_TOKEN
+ARG PORT=9001
 ARG YARN_VERSION=3.5.0
-ARG MONGO_ENTRY_FILE=${MONGO_VERSION:-latest}
-ARG MONGO_VERSION=${MONGO_VERSION:-latest}
 
 ## mongo build stage
-FROM mongo:$MONGO_VERSION AS database
-ENV NODE_ENV $ENV
-COPY docker-entrypoint-initdb.d/mongo-init-$MONGO_ENTRY_FILE.sh ./docker-entrypoint-initdb.d/mongo-init.sh
+FROM mongo:${MONGO_VERSION} AS database
+ENV NODE_ENV=${ENV}
+ARG MONGO_ENTRY_FILE=${MONGO_ENTRY_FILE:-latest}
+ENV MONGO_VERSION=${MONGO_VERSION}
+RUN echo ${MONGO_ENTRY_FILE} ${MONGO_VERSION} ${NODE_ENV}
+COPY docker-entrypoint-initdb.d/mongo-init-${MONGO_ENTRY_FILE}.sh ./docker-entrypoint-initdb.d/mongo-init.sh
 
 ## stage one, build the service
 FROM node:20-bullseye-slim AS build
-ENV YARN_VERSION $YARN_VERSION
-ENV NODE_ENV development
-ENV NPM_TOKEN $NPM_TOKEN
+ENV YARN_VERSION=${YARN_VERSION}
+ENV NODE_ENV=development
+ENV NPM_TOKEN=${NPM_TOKEN}
 WORKDIR /home/node/app
 COPY .npmrc /root
 COPY .build.yarnrc.yml /root/.yarnrc.yml
@@ -24,9 +27,9 @@ RUN yarn build:production
 
 ## this is stage two , where the app actually runs
 FROM node:20-bullseye-slim AS containerize
-ENV YARN_VERSION $YARN_VERSION
-ENV NODE_ENV $ENV
-ENV NPM_TOKEN $NPM_TOKEN
+ENV YARN_VERSION=${YARN_VERSION}
+ENV NODE_ENV=${ENV}
+ENV NPM_TOKEN=${NPM_TOKEN}
 WORKDIR /home/node/app
 COPY .npmrc /root
 COPY .build.yarnrc.yml /root/.yarnrc.yml

package.json

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