Merge branch 'main' of ssh://git.mifi.dev:12022/mifi/auth

.drone.yml

@@ -61,14 +61,12 @@ trigger:
   branch:
   - main
   event:
-  # - pull_request
+  - pull_request
-  - push
 
 ---
 kind: pipeline
 type: docker
 name: Publish Pipeline
-group: publish
 
 workspace:
   path: /drone/grow
@@ -80,16 +78,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,40 +101,18 @@ steps:
       - success
       - failure
 - name: Publish Image
-  image: docker
+  image: plugins/docker
-  environment:
+  settings:
-    USERNAME:
+    auto_tag: true
-      from_secret: registry_username
+    repo: git.mifi.dev/mifi/mifi/auth
-    PASSWORD:
+    registry: git.mifi.dev
-      from_secret: registry_password
+    debug: true
-  commands:
+    ssh-agent-key:
-    - docker login git.mifi.dev
+      from_secret: reg_token    
-    - docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} .
+    username: <token>
-    - docker push git.mifi.dev/mifi/mifi/auth:latest
+    password:
-  volumes:
+      from_secret: reg_token
-  - name: dockersock
+  secrets: [reg_token]
-    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:
@@ -174,10 +144,7 @@ depends_on:
   - Test Pipeline
 
 trigger:
-  # branch:
-  # - main
   event:
-  # - push
   - tag
 
 ---
@@ -193,10 +160,10 @@ steps:
   image: docker
   privileged: true
   environment:
-    - HOST=area51.mifi.dev
+    CONTAINER_PREFIX: staging
-    - PORT=9001
+    HOST: area51.mifi.dev
-    - ROUTE_PREFIX=/auth
+    ROUTE_PREFIX: /auth
-    - CONTAINER_PREFIX=mifi
+    PORT: 9001
   commands:
     - docker compose -f docker-compose.staging.yml pull
     - docker compose -f docker-compose.staging.yml build --no-cache
@@ -204,7 +171,7 @@ steps:
     - docker compose -f docker-compose.staging.yml up --wait
   volumes:
   - name: env-secrets
-    path: /drone/grow/.env.staging
+    path: /drone/grow/staging.env
   - name: dockersock
     path: /var/run/docker.sock
   - name: dockerconfig
@@ -235,14 +202,13 @@ volumes:
     path: /var/run/docker.sock
 - name: env-secrets
   host:
-    path: /volume1/docker/beethoven/labs-auth/.env.staging
+    path: /volume1/docker/beethoven/labs-auth/staging.env
 
 depends_on:
   - Test Pipeline
 
 trigger:
-  # branch:
-  # - main
   event:
-  # - push
+  - promote
-  - tag
+  target:
+  - production

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.dev.yml

@@ -3,6 +3,9 @@ version: '3.8'
 services:
     auth-service_mongo:
         env_file: .env.dev
+        build:
+            args:
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
         ports:
             - 27017:27017
@@ -15,7 +18,13 @@ services:
         image: mongo:latest
     auth-service:
         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,22 +2,23 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
         env_file:
-            - .env.staging
+            - staging.env
         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:latest
     auth-service:
         env_file:
-            - .env.staging
+            - 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
+            - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
@@ -35,4 +36,4 @@ services:
 networks:
     docknet:
         name: docknet
-        external: true
+        external: true

package.json

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