From bf693645d4fb42e187deaf576eb4bc3ee41228f3 Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Mon, 8 May 2023 18:22:37 -0400
Subject: [PATCH] Lordy...

---
 .drone.yml                 | 52 ++++++++++++++++++++++++--------------
 docker-compose.staging.yml |  2 +-
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index cdb745a..d414001 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -100,32 +100,49 @@ steps:
 #   volumes:
 #   - name: npmrc
 #     path: /drone/grow/.npmrc
-- 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: 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: docker
   commands:
-    # - 'docker login git.mifi.dev'
+    - 'docker login --username $USERNAME --password $PASSWORD git.mifi.dev'
     - 'docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG:-latest} .'
     - docker push git.mifi.dev/mifi/mifi/auth:latest
+  enviromnment:
+    USERNAME:
+      from_secret: registry_username
+    PASSWORD:
+      from_secret: registry_password
   volumes:
   - name: dockersock
     path: /var/run/docker.sock
   - name: dockerconfig
     path: /drone/grow/.docker/config.json
+- name: Publish Image (plugin)
+  image: plugins/docker
+  settings:
+    auto_tag: true
+    repo: git.mifi.dev/mifi/mifi/auth
+    registry: git.mifi.dev
+    username:
+      from_secret: registry_username
+    password:
+      from_secret: registry_password
+    ssh-agent-key:
+      from_secret: gitea_token
 - name: Report Image Publish Status
   image: plugins/webhook
   settings:
@@ -142,9 +159,6 @@ steps:
       - success
       - failure
 
-image_pull_secrets:
-- dockerconfig
-
 volumes:
 - name: dockerconfig
   host:
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index 15810d1..a6caca2 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -9,7 +9,7 @@ services:
             - docknet
         volumes:
             - '/volume1/docker/labs/auth/mongo:/data/db'
-            - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
+            # - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
         image: mongo:latest
     auth-service: