From d800311ae749341f4a25f75fa56473727a664924 Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Sat, 6 May 2023 09:08:15 -0400
Subject: [PATCH] - ENV updates

---
 dev.env => .env.dev        |  2 --
 .env.staging               |  6 ++++++
 Dockerfile                 | 10 ----------
 docker-compose.dev.yml     |  4 ++--
 docker-compose.staging.yml | 11 ++++++-----
 package.json               |  2 +-
 6 files changed, 15 insertions(+), 20 deletions(-)
 rename dev.env => .env.dev (93%)
 create mode 100644 .env.staging

diff --git a/dev.env b/.env.dev
similarity index 93%
rename from dev.env
rename to .env.dev
index e40ac0d..ed262b2 100644
--- a/dev.env
+++ b/.env.dev
@@ -27,5 +27,3 @@ RESET_VALID_MINUTES=15
 DEFAULT_TOKEN_DAYS=1
 
 CONTAINER_PREFIX=dev
-SERVICE_NAME=auth-service
-DB_TYPE=mongo
diff --git a/.env.staging b/.env.staging
new file mode 100644
index 0000000..547c4b5
--- /dev/null
+++ b/.env.staging
@@ -0,0 +1,6 @@
+HOST=area51.mifi.dev
+PORT=9001
+
+ROUTE_PREFIX=/auth
+
+CONTAINER_PREFIX=mifi
diff --git a/Dockerfile b/Dockerfile
index 65ab2af..b49ea60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,3 @@
-# FROM node:20-alpine AS build
-# RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
-# WORKDIR /home/node/app
-# COPY package*.json .
-# COPY dist/lib .
-# USER node
-# RUN yarn install --frozen-lockfile --production
-# COPY --chown=node:node node_modules ./node_modules
-# CMD ["node", "dist/lib/server/index.js"]
-
 FROM node:20-alpine AS build
 WORKDIR /home/node/app
 COPY package*.json ./
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 600107f..48ad7bb 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        env_file: dev.env
+        env_file: .env.dev
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
         ports:
             - 27017:27017
@@ -14,7 +14,7 @@ services:
         restart: unless-stopped
         image: mongo:latest
     auth-service:
-        env_file: dev.env
+        env_file: .env.dev
         build: .
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service
         ports:
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index 9bb14b9..21ae7d7 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -3,7 +3,9 @@ version: '3.8'
 services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX:-mifi}-auth-service_mongo
-        env_file: staging.env
+        env_file:
+            - .env.staging
+            - staging.env
         networks:
             - docknet
         volumes:
@@ -11,14 +13,13 @@ services:
         restart: unless-stopped
         image: mongo:latest
     auth-service:
-        env_file: staging.env
+        env_file:
+            - .env.staging
+            - staging.env
         build: .
         container_name: ${CONTAINER_PREFIX:-mifi}-auth-service
         environment:
             - DB_HOST=${CONTAINER_PREFIX:-mifi}-auth-service_mongo
-            - HOST=${HOST}
-            - PORT=${PORT}
-            - ROUTE_PREFIX=${ROUTE_PREFIX}
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
diff --git a/package.json b/package.json
index 47b5115..eb88644 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {