From a047b4907363128ca5edf699b69fe592909418cc Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Sat, 6 May 2023 10:18:39 -0400
Subject: [PATCH] Last try, then pack

---
 .drone.yml                 | 19 +++++--------------
 docker-compose.staging.yml | 12 +-----------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9b4d936..028f566 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -114,20 +114,6 @@ steps:
     - docker login git.mifi.dev
     - docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} .
     - docker push git.mifi.dev/mifi/mifi/auth:latest
-# - 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
@@ -182,6 +168,11 @@ steps:
 - name: Deploy Container
   image: docker
   privileged: true
+  environment:
+    - HOST=area51.mifi.dev
+    - PORT=9001
+    - ROUTE_PREFIX=/auth
+    - CONTAINER_PREFIX=mifi
   commands:
     - docker compose -f docker-compose.staging.yml pull
     - docker compose -f docker-compose.staging.yml build --no-cache
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index da18799..57fd3d5 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -3,9 +3,6 @@ version: '3.8'
 services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX:-mifi}-auth-service_mongo
-        build: 
-            args:
-                - CONTAINER_PREFIX: ${CONTAINER_PREFIX}
         env_file: staging.env
         networks:
             - docknet
@@ -15,14 +12,7 @@ services:
         image: mongo:latest
     auth-service:
         env_file: staging.env
-        build: 
-            context: .
-            args:
-                - DB_HOST: ${CONTAINER_PREFIX:-mifi}-auth-service_mongo
-                - HOST: ${HOST}
-                - PORT: ${PORT}
-                - ROUTE_PREFIX: ${ROUTE_PREFIX}
-                - CONTAINER_PREFIX: ${CONTAINER_PREFIX}
+        build: .
         container_name: ${CONTAINER_PREFIX:-mifi}-auth-service
         labels:
             - 'traefik.enable=true'