From c524c985c14ab67194f1fa9eabcb50d2b4761079 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 21 Aug 2021 22:20:04 -0600
Subject: [PATCH] Update envar flow

---
 .env.development   |  2 --
 .env.production    |  1 -
 .gitignore         |  3 +++
 docker-compose.yml | 32 +++++---------------------------
 package.json       |  4 ++--
 src/setupProxy.js  |  4 ++--
 6 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100644 .env.development
 delete mode 100644 .env.production

diff --git a/.env.development b/.env.development
deleted file mode 100644
index aa7356b..0000000
--- a/.env.development
+++ /dev/null
@@ -1,2 +0,0 @@
-PORT=52026
-REACT_APP_CAIRO_URL=http://localhost:52000
diff --git a/.env.production b/.env.production
deleted file mode 100644
index ec94238..0000000
--- a/.env.production
+++ /dev/null
@@ -1 +0,0 @@
-REACT_APP_CAIRO_URL=http://cairo.dunestorm.net:52000
diff --git a/.gitignore b/.gitignore
index 2d196ee..2b5254b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 build/
 node_modules/
 package-lock.json
+# Env files
+.env
+.env.development
diff --git a/docker-compose.yml b/docker-compose.yml
index ba87355..583ce7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,34 +1,12 @@
 version: "3"
 services:
-  cairo.dunestorm.net:
-    image: cairo.dunestorm.net
-    ports:
-      - "52000:52000"
-    environment:
-      - ALEXANDRIA_DATABASE_PASSWORD=${ALEXANDRIA_DATABASE_PASSWORD}
-
-  nubian.dunestorm.net:
-    image: nubian.dunestorm.net
-    ports:
-      - "52001:52001"
-    environment:
-      - ALEXANDRIA_DATABASE_PASSWORD=${ALEXANDRIA_DATABASE_PASSWORD}
-      - CAIRO_URL=http://cairo.dunestorm.net:52000
-
   khufu.dunestorm.net:
     image: khufu.dunestorm.net
     build: .
     ports:
       - "80:52026"
-
-  alexandria.dunestorm.net:
-    image: mongo
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=admin
-      - MONGO_INITDB_ROOT_PASSWORD=${ALEXANDRIA_DATABASE_PASSWORD}
-    volumes:
-      - /home/dunemask/Documents/dev/Dunestorm/mongodb/database:/data/db
-    ports:
-      - "27017:27017"
-    restart: unless-stopped
-    command: --quiet
+    networks:
+      - dunestorm_dev
+networks:
+  dunestorm_dev:
+    external: true
diff --git a/package.json b/package.json
index 3cc4030..ac9df01 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,8 @@
   },
   "nodemonConfig": {
     "env": {
-      "CAIRO_URL": "http://localhost:52000",
-      "NUBIAN_URL": "http://localhost:52001"
+      "CAIRO_PUBLIC_URL": "http://localhost:52000",
+      "NUBIAN_INTERNAL_URL": "http://localhost:52001"
     }
   }
 }
diff --git a/src/setupProxy.js b/src/setupProxy.js
index 5133159..acb8101 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -1,6 +1,6 @@
 const { createProxyMiddleware } = require("http-proxy-middleware");
-const cairoUrl = process.env.CAIRO_URL ?? "http://cairo.dunestorm.net:52000";
-const nubianUrl = process.env.NUBIAN_URL ?? "http://nubian.dunestorm.net:52001";
+const cairoUrl = process.env.REACT_APP_CAIRO_PUBLIC_URL;
+const nubianUrl = process.env.NUBIAN_INTERNAL_URL;
 module.exports = (app) => {
   // Cairo Proxy
   app.use("/cairo", createProxyMiddleware({ target: cairoUrl }));