Add npmrc, update version, pipeline tweaks - re-enable pipeline in full

.drone.yml

@@ -1,99 +1,99 @@
-# kind: pipeline
-# type: docker
-# name: Test Pipeline
-
-# workspace:
-#   path: /drone/grow
-
-# steps:
-# - name: yarn install
-#   image: node:latest
-#   commands:
-#   - yarn install
-
-# - name: Code Style Checks
-#   image: node:latest
-#   commands:
-#   - yarn prettier
-
-# - name: Lint
-#   image: node:latest
-#   commands:
-#   - yarn lint
-
-# - name: Unit Tests
-#   image: node:latest
-#   commands:
-#   - yarn test
-
-# - name: Send Status Notification
-#   image: plugins/webhook
-#   settings:
-#     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
-#     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 }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-#         "username":"DroneBot"
-#       }
-#   when:
-#     status:
-#       - success
-#       - failure
-
-# trigger:
-#   event:
-#   - push
-
-# ---
-# kind: pipeline
-# type: docker
-# name: Build Pipeline
-
-# workspace:
-#   path: /drone/grow
-
-# steps:
-# - name: yarn install
-#   image: node:latest
-#   commands:
-#   - yarn install
-
-# - name: Build
-#   image: node:latest
-#   commands:
-#   - yarn build
-
-# - name: Send Status Notifications
-#   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 }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-#         "username":"DroneBot"
-#       }
-#   when:
-#     status:
-#       - success
-#       - failure
-
-# depends_on:
-#   - Test Pipeline
-
-# trigger:
-#   branch:
-#   - main
-#   event:
-#   - push
-
-# ---
 kind: pipeline
 type: docker
-name: Publish Pipeline - NPM Package
+name: Test Pipeline
+
+workspace:
+  path: /drone/grow
+
+steps:
+- name: yarn install
+  image: node:latest
+  commands:
+  - yarn install
+
+- name: Code Style Checks
+  image: node:latest
+  commands:
+  - yarn prettier
+
+- name: Lint
+  image: node:latest
+  commands:
+  - yarn lint
+
+- name: Unit Tests
+  image: node:latest
+  commands:
+  - yarn test
+
+- name: Send Status Notification
+  image: plugins/webhook
+  settings:
+    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+    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 }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+
+trigger:
+  event:
+  - push
+
+---
+kind: pipeline
+type: docker
+name: Build Pipeline
+
+workspace:
+  path: /drone/grow
+
+steps:
+- name: yarn install
+  image: node:latest
+  commands:
+  - yarn install
+
+- name: Build
+  image: node:latest
+  commands:
+  - yarn build
+
+- name: Send Status Notifications
+  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 }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+
+depends_on:
+  - Test Pipeline
+
+trigger:
+  branch:
+  - main
+  event:
+  - push
+
+---
+kind: pipeline
+type: docker
+name: Publish Pipeline
 group: publish
 
 workspace:
@@ -107,15 +107,18 @@ steps:
     - yarn build
 - name: Publish NPM
   image: plugins/npm
+  failure: ignore
   settings:
     username:
-      from_secret: regsitry_username
+      from_secret: registry_username
     password:
-      from_secret: regsitry_password
-    registry: git.mifi.dev
+      from_secret: registry_password
+    registry: https://git.mifi.dev
     token:
     - from_secret: gitea_token
-- name: Send Status Notifications
+  volumes:
+  - name: yarnrc
+- name: Report NPM Publish Status
   image: plugins/webhook
   settings:
     urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
@@ -123,57 +126,33 @@ steps:
     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 tagged docker image release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "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
-
-# depends_on:
-#   - Build Pipeline
-
-trigger:
-  branch:
-  - main
-  # event:
-  # - tag
-
----
-kind: pipeline
-type: docker
-name: Publish Pipeline - Docker Image
-group: publish
-
-workspace:
-  path: /drone/grow
-
-steps:
-- name: Build Service
-  image: node:latest
-  commands:
-    - yarn install
-    - yarn build
 - 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: regsitry_username
+      from_secret: registry_username
     password:
-      from_secret: regsitry_password
+      from_secret: registry_password
     ssh-agent-key:
       from_secret: gitea_token
   volumes:
   - name: dockersock
-    Path: /var/run/docker.sock
+    path: /var/run/docker.sock
   - name: dockerconfig
-    Path: /.docker/config.json
-- name: Send Status Notifications
+    path: /drone/grow/.docker/config.json
+- name: Report Image Publish Status
   image: plugins/webhook
   settings:
     urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
@@ -181,7 +160,7 @@ steps:
     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 tagged docker image release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "text": "[{{ repo.name }} - New docker image release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
         "username":"DroneBot"
       }
   when:
@@ -190,10 +169,15 @@ steps:
       - failure
 
 volumes:
-- name: dockersock
-  path: /var/run/docker.sock
 - name: dockerconfig
-  path: /volume1/docker/labs/grow-auth/dockerconfig.json
+  host:
+    path: /volume1/docker/dockerconfig.json
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: yarnrc
+  host:
+    path: /volume1/docker/.yarnrc.yml
 
 # depends_on:
 #   - Build Pipeline
@@ -217,20 +201,21 @@ workspace:
 
 steps:
 - name: Deploy Container
-  image: docker:dind
+  image: docker
   privileged: true
   commands:
-    - docker compose build
+    - docker compose build --no-cache
     - docker compose up --wait
   volumes:
   - name: env
-    path: ./.env
+    path: /drone/grow/.env
   - name: dockersock
-    Path: /var/run/docker.sock
+    path: /var/run/docker.sock
   - name: dockerconfig
-    Path: ./.docker/config.json
+    path: /drone/grow/.docker/config.json
 - name: Send Status Notifications
   image: plugins/webhook
+  privileged: true
   settings:
     urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
     content_type: application/json
@@ -246,12 +231,15 @@ steps:
       - failure
 
 volumes:
-- name: env
-  path: /volume1/docker/labs/grow-auth/.env
-- name: dockersock
-  path: /var/run/docker.sock
 - name: dockerconfig
-  path: /volume1/docker/labs/grow-auth/dockerconfig.json
+  host:
+    path: /volume1/docker/dockerconfig.json
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: env
+  host:
+    path: /volume1/docker/labs/grow-auth/.env
 
 # depends_on:
 #   - Build Pipeline

.npmrc

@@ -0,0 +1,3 @@
+@mifi:registry=https://git.mifi.dev/api/packages/mifi/npm
+//git.mifi.dev/api/packages/mifi/npm/:_authToken=${REGISTRY_TOKEN}
+@mifi/grow:registry=https://git.mifi.dev

docker-compose.yml

@@ -44,9 +44,6 @@ services:
             - 'traefik.http.services.gitea.loadbalancer.server.port=${PORT}'
         networks:
             - docknet
-        volumes:
-            - '/Volume1/docker/.yarnrc.yml:/.yarnrc.yml'
-            - '/Volume1/docker/labs/grow-auth/.env:/.env'
         restart: unless-stopped
         image: node
         depends_on:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {
@@ -80,5 +80,6 @@
   "repository": {
     "type": "git",
     "url": "https://git.mifi.dev/mifi/auth.git"
-  }
+  },
+  "registry": "https://git.mifi.dev"
 }