From 6bf7afbe0954376750b9ec0748e21dba84f5dc56 Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Mon, 8 May 2023 16:01:07 -0400
Subject: [PATCH] Fix for deploy...

---
 .drone.yml                 | 122 ++++++++++++++++++-------------------
 docker-compose.staging.yml |   2 +
 2 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5ac3e92..bf7268f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -163,69 +163,69 @@ trigger:
   - push
   # - tag
 
-# ---
-# kind: pipeline
-# type: docker
-# name: Deploy Pipeline
+---
+kind: pipeline
+type: docker
+name: Deploy Pipeline
 
-# workspace:
-#   path: /drone/grow
+workspace:
+  path: /drone/grow
 
-# steps:
-# - name: Deploy Container
-#   image: docker
-#   privileged: true
-#   environment:
-#     CONTAINER_PREFIX: staging
-#     HOST: area51.mifi.dev
-#     ROUTE_PREFIX: /auth
-#     PORT: 9001
-#   commands:
-#     - docker compose -f docker-compose.staging.yml pull
-#     - docker compose -f docker-compose.staging.yml build --no-cache
-#     - docker compose -f docker-compose.staging.yml rm --stop
-#     - docker compose -f docker-compose.staging.yml up --wait
-#   volumes:
-#   - name: env-secrets
-#     path: /drone/grow/staging.env
-#   - name: dockersock
-#     path: /var/run/docker.sock
-#   - name: dockerconfig
-#     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
-#     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 }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-#         "username":"DroneBot"
-#       }
-#   when:
-#     status:
-#       - success
-#       - failure
+steps:
+- name: Deploy Container
+  image: docker
+  privileged: true
+  environment:
+    CONTAINER_PREFIX: staging
+    HOST: area51.mifi.dev
+    ROUTE_PREFIX: /auth
+    PORT: 9001
+  commands:
+    - docker compose -f docker-compose.staging.yml pull
+    - docker compose -f docker-compose.staging.yml build --no-cache
+    - docker compose -f docker-compose.staging.yml rm --stop
+    - docker compose -f docker-compose.staging.yml up --wait
+  volumes:
+  - name: env-secrets
+    path: /drone/grow/staging.env
+  - name: dockersock
+    path: /var/run/docker.sock
+  - name: dockerconfig
+    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
+    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 }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
 
-# volumes:
-# - name: dockerconfig
-#   host:
-#     path: /volume1/docker/dockerconfig.json
-# - name: dockersock
-#   host:
-#     path: /var/run/docker.sock
-# - name: env-secrets
-#   host:
-#     path: /volume1/docker/beethoven/labs-auth/staging.env
+volumes:
+- name: dockerconfig
+  host:
+    path: /volume1/docker/dockerconfig.json
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: env-secrets
+  host:
+    path: /volume1/docker/beethoven/labs-auth/staging.env
 
-# # depends_on:
-# #   - Test Pipeline
+# depends_on:
+#   - Test Pipeline
 
-# trigger:
-#   branch:
-#   - main
-#   event:
-#   - push
-#   # - tag
+trigger:
+  branch:
+  - main
+  event:
+  - push
+  # - tag
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index 829674d..96c30ea 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -16,6 +16,8 @@ services:
             - staging.env
         build: .
         container_name: ${CONTAINER_PREFIX}-auth-service
+        environment:
+            - DB_HOST=${CONTAINER_PREFIX:-mifi}-auth-service_mongo
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'