From 33d0ea8616038016399ad6a53304709ecc17c57e Mon Sep 17 00:00:00 2001
From: Ryanwalker277 <andianurag277@gmail.com>
Date: Wed, 3 May 2023 01:08:38 +0530
Subject: [PATCH 1/2] Env and docker compose refactoring

---
 .env               | 24 +++++++++++-------------
 docker-compose.yml |  3 ---
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.env b/.env
index ca465be..50aa238 100755
--- a/.env
+++ b/.env
@@ -1,5 +1,15 @@
 # .env is a work in progress, you might see repeated variables. We will clean this up in later versions
 
+# Here is a service by service breakdown of all the environment variables.
+
+### uci-api-db
+UCI_API_POSTGRES_PASSWORD=yoursupersecret
+UCI_API_POSTGRES_USER=postgresql
+UCI_API_POSTGRES_DB=comms
+
+### uci-api-db-gql
+HASURA_GRAPHQL_ADMIN_SECRET=4GeEB2JCU5rBdLvQ4AbeqqrPGu7kk9SZDhJUZm7A
+
 ### For Fusionauth Service
 FUSIONAUTH_POSTGRES_USER=postgres
 FUSIONAUTH_POSTGRES_DBNAME=postgres
@@ -28,18 +38,6 @@ ODK_POSTGRES_DB=aggregate
 
 ###  For UCI APIs
 
-# Postgres
-PSQL_DB_URL=postgres://postgresql:yoursupersecret@uci-api-db:5432/comms
-PSQL_DB_URL_DEV=postgres://postgresql:yoursupersecret@uci-api-db:5432/comms
-UCI_API_POSTGRES_PASSWORD=yoursupersecret
-UCI_API_POSTGRES_USER=postgresql
-UCI_API_POSTGRES_DB=comms
-DATABASE_DEBUG=true
-POSTGRES_HOST=uci-api-db
-POSTGRES_USER=postgresql
-POSTGRES_PASSWORD=yoursupersecret
-POSTGRES_DB=comms
-
 # Redis
 REDIS_HOST=scheduler-db
 REDIS_PORT=6379
@@ -68,7 +66,7 @@ FA_ANONYMOUS_BOT_ID=1536f2d5-813f-43db-a40d-c64803d3648e
 HASURA_GRAPHQL_DATABASE_URL=postgres://postgresql:yoursupersecret@uci-api-db:5432/comms
 HASURA_GRAPHQL_ENABLE_CONSOLE=true
 HASURA_GRAPHQL_ENABLED_LOG_TYPES=startup, http-log, webhook-log, websocket-log, query-log
-HASURA_GRAPHQL_ADMIN_SECRET=4GeEB2JCU5rBdLvQ4AbeqqrPGu7kk9SZDhJUZm7A
+
 
 # Hasura formsdb
 FORMSDB_HASURA_GRAPHQL_ADMIN_SECRET=4GeEB2JCU5rBdLvQ4AbeqqrPGu7kk9SZDhJUZm7A
diff --git a/docker-compose.yml b/docker-compose.yml
index 9072333..96dd6cb 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,6 @@ services:
   
   uci-api-db:
     image: postgres:12
-    env_file: .env
     restart: always
     environment:
       - POSTGRES_PASSWORD=${UCI_API_POSTGRES_PASSWORD}
@@ -26,7 +25,6 @@ services:
   uci-api-db-gql:
     image: hasura/graphql-engine:v2.0.0-alpha.1
     restart: always
-    env_file: .env
     ports:
       - "15003:8080"
     depends_on:
@@ -36,7 +34,6 @@ services:
 
   uci-api-scheduler-db:
     image: redis:latest
-    env_file: .env
     restart: always
     command: ["redis-server", "--appendonly", "yes"]
     hostname: redis

From c2918c815c230459b8c55f72051131989a0161c4 Mon Sep 17 00:00:00 2001
From: Ryanwalker277 <andianurag277@gmail.com>
Date: Wed, 3 May 2023 01:12:52 +0530
Subject: [PATCH 2/2] Resolved conflicts

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 96dd6cb..6d51ba9 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,6 @@ services:
     image: federation-service
     restart: always
     env_file: .env
-
     ports:
       - 9999:9999