From e9e2df2c28c719d961059d7c73d0b9e9c3135db9 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Tue, 10 Aug 2021 15:07:52 +0530
Subject: [PATCH] Store MongoDB creds in separate file from install.sh (#6499)

* Store MongoDB creds in separate file from install.sh

* Move MongoDB credentials to docker.env
---
 deploy/template/docker-compose.yml.sh | 6 ++----
 deploy/template/docker.env.sh         | 5 ++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/deploy/template/docker-compose.yml.sh b/deploy/template/docker-compose.yml.sh
index 35053ca08f..13b763f5fb 100644
--- a/deploy/template/docker-compose.yml.sh
+++ b/deploy/template/docker-compose.yml.sh
@@ -61,10 +61,8 @@ services:
     image: mongo:4.4.6
     expose:
       - "27017"
-    environment:
-      - MONGO_INITDB_DATABASE=$mongo_database
-      - MONGO_INITDB_ROOT_USERNAME=$mongo_root_user
-      - MONGO_INITDB_ROOT_PASSWORD=$mongo_root_password
+    env_file:
+      - ./docker.env
     volumes:
       - ./data/mongo/db:/data/db
       - ./data/mongo/init.js:/docker-entrypoint-initdb.d/init.js:ro
diff --git a/deploy/template/docker.env.sh b/deploy/template/docker.env.sh
index d1561b8902..8de001c485 100644
--- a/deploy/template/docker.env.sh
+++ b/deploy/template/docker.env.sh
@@ -40,7 +40,10 @@ APPSMITH_MAIL_ENABLED=false
 
 # ******** Database *************
 APPSMITH_REDIS_URL=redis://redis:6379
-APPSMITH_MONGODB_URI=mongodb://$encoded_mongo_root_user:$encoded_mongo_root_password@$mongo_host/appsmith?retryWrites=true
+APPSMITH_MONGODB_URI=mongodb://$encoded_mongo_root_user:$encoded_mongo_root_password@$mongo_host/$mongo_database?retryWrites=true
+MONGO_INITDB_DATABASE=$mongo_database
+MONGO_INITDB_ROOT_USERNAME=$mongo_root_user
+MONGO_INITDB_ROOT_PASSWORD=$mongo_root_password
 # *******************************
 
 # *** EE Specific Config ********