again

.drone.yml

@@ -1,99 +1,100 @@
+# 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: 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
+name: Publish Pipeline - NPM Package
+group: publish
 
 workspace:
   path: /drone/grow
@@ -102,30 +103,74 @@ steps:
 - name: Build Service
   image: node:latest
   commands:
-    - cp /drone/grow/package.json ./
-    - cp /drone/grow/yarn.lock ./
-    - yarn install --frozen-lockfile
-    - cp -r /drone/grow/* .
+    - yarn install
     - yarn build
 - name: Publish NPM
   image: plugins/npm
   settings:
-    username: mifi
-    registry: git.mifi.dev
+    username:
+      from_secret: registry_username
+    password:
+      from_secret: registry_password
+    registry: https://git.mifi.dev
     token:
     - from_secret: gitea_token
+- 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 }} - New tagged docker image 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:dind
+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
-    registry: git.mifi.dev
+    repo: https://git.mifi.dev/mifi/auth
+    registry: https://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
+    Path: /var/run
   - name: dockerconfig
     Path: /.docker/config.json
 - name: Send Status Notifications
@@ -144,18 +189,28 @@ steps:
       - success
       - failure
 
+services:
+  - name: docker
+    image: docker:dind
+    privileged: true
     volumes:
       - name: dockersock
-  path: /var/run/docker.sock
+        path: /var/run
+
+volumes:
+- name: dockersock
+  path: /var/run
 - name: dockerconfig
   path: /volume1/docker/labs/grow-auth/dockerconfig.json
 
-depends_on:
-  - Build Pipeline
+# depends_on:
+#   - Build Pipeline
 
 trigger:
-  event:
-  - tag
+  branch:
+  - main
+  # event:
+  # - tag
 
 ---
 kind: pipeline
@@ -170,15 +225,16 @@ workspace:
 
 steps:
 - name: Deploy Container
-  image: docker
+  image: docker:dind
+  privileged: true
   commands:
-    - compose build .
-    - compose up --wait
+    - docker compose build
+    - docker compose up --wait
   volumes:
   - name: env
     path: /.env
   - name: dockersock
-    Path: /var/run/docker.sock
+    Path: /var/run
   - name: dockerconfig
     Path: /.docker/config.json
 - name: Send Status Notifications
@@ -197,17 +253,27 @@ steps:
       - success
       - failure
 
+services:
+  - name: docker
+    image: docker:dind
+    privileged: true
+    volumes:
+      - name: dockersock
+        path: /var/run
+
 volumes:
 - name: env
   path: /volume1/docker/labs/grow-auth/.env
 - name: dockersock
-  path: /var/run/docker.sock
+  path: /var/run
 - name: dockerconfig
   path: /volume1/docker/labs/grow-auth/dockerconfig.json
 
-depends_on:
-  - Build Pipeline
+# depends_on:
+#   - Build Pipeline
 
 trigger:
-  event:
-  - tag
+  branch:
+  - main
+  # event:
+  # - tag