From 99db648a36eef4223bec78a608cae86c1d27e450 Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Sat, 6 May 2023 09:40:25 -0400
Subject: [PATCH] - Endlessly fighting the ENV - I should be loading from the
 package...

---
 .drone.yml                 | 11 ++++++++---
 .env.staging               |  6 ------
 docker-compose.staging.yml | 14 ++++++--------
 package.json               |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 .env.staging

diff --git a/.drone.yml b/.drone.yml
index b37fd37..690b0df 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -116,7 +116,7 @@ steps:
     PASSWORD:
       from_secret: registry_password
   commands:
-    - docker login -u ${USERNAME} -p {PASSWORD} git.mifi.dev
+    - 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
   volumes:
@@ -192,6 +192,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
@@ -199,7 +204,7 @@ steps:
     - docker compose -f docker-compose.staging.yml up --wait
   volumes:
   - name: env-secrets
-    path: /drone/grow/staging.secrets.env
+    path: /drone/grow/.env.staging
   - name: dockersock
     path: /var/run/docker.sock
   - name: dockerconfig
@@ -230,7 +235,7 @@ volumes:
     path: /var/run/docker.sock
 - name: env-secrets
   host:
-    path: /volume1/docker/beethoven/labs-auth/staging.secrets.env
+    path: /volume1/docker/beethoven/labs-auth/.env.staging
 
 depends_on:
   - Test Pipeline
diff --git a/.env.staging b/.env.staging
deleted file mode 100644
index 547c4b5..0000000
--- a/.env.staging
+++ /dev/null
@@ -1,6 +0,0 @@
-HOST=area51.mifi.dev
-PORT=9001
-
-ROUTE_PREFIX=/auth
-
-CONTAINER_PREFIX=mifi
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index e03fec7..5083010 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -2,10 +2,9 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: $${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+        container_name: ${CONTAINER_PREFIX:-mifi}-auth-service_mongo
         env_file:
             - .env.staging
-            - staging.secrets.env
         networks:
             - docknet
         volumes:
@@ -15,19 +14,18 @@ services:
     auth-service:
         env_file:
             - .env.staging
-            - staging.secrets.env
         build: .
-        container_name: $${CONTAINER_PREFIX:-mifi}-auth-service
+        container_name: ${CONTAINER_PREFIX:-mifi}-auth-service
         environment:
-            - DB_HOST=$${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+            - DB_HOST=${CONTAINER_PREFIX:-mifi}-auth-service_mongo
         labels:
             - 'traefik.enable=true'
-            - 'traefik.http.routers.grow.rule=Host(`$${HOST}`) && Path(`$${ROUTE_PREFIX}`)'
+            - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
             - 'traefik.http.routers.grow.entrypoints=websecure'
             - 'traefik.http.routers.grow.tls=true'
             - 'traefik.http.routers.grow.tls.certresolver=letsencrypt'
             - 'traefik.http.routers.grow.service=grow-service'
-            - 'traefik.http.services.grow-service.loadbalancer.server.port=$${PORT}'
+            - 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}'
         networks:
             - docknet
         restart: unless-stopped
@@ -37,4 +35,4 @@ services:
 networks:
     docknet:
         name: docknet
-        external: true
\ No newline at end of file
+        external: true
diff --git a/package.json b/package.json
index c803c79..d7759de 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {