From 9b6a641f4d273490eca2abfaa28b0c5d764a9d3d Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Thu, 20 Feb 2020 21:48:51 +0530
Subject: [PATCH] fix: config generation

fix envsubst single quote SHELL-FORMAT
env var changed from ERPNEXT_PY to FRAPPE_PY
---
 build/common/nginx-default.conf.template  |  6 +++---
 build/common/worker/docker-entrypoint.sh  |  4 ++--
 build/erpnext-assets/docker-entrypoint.sh | 15 ++++++++++-----
 build/frappe-assets/docker-entrypoint.sh  |  8 ++++++--
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/build/common/nginx-default.conf.template b/build/common/nginx-default.conf.template
index 17578b6a..c2e0e0ba 100644
--- a/build/common/nginx-default.conf.template
+++ b/build/common/nginx-default.conf.template
@@ -1,5 +1,5 @@
-upstream erpnext-server {
-    server ${ERPNEXT_PY}:${ERPNEXT_PY_PORT} fail_timeout=0;
+upstream frappe-server {
+    server ${FRAPPE_PY}:${FRAPPE_PY_PORT} fail_timeout=0;
 }
 
 upstream socketio-server {
@@ -44,7 +44,7 @@ server {
         proxy_read_timeout 120;
         proxy_redirect off;
 
-        proxy_pass  http://erpnext-server;
+        proxy_pass  http://frappe-server;
     }
 
     # error pages
diff --git a/build/common/worker/docker-entrypoint.sh b/build/common/worker/docker-entrypoint.sh
index da1934b6..a191b159 100755
--- a/build/common/worker/docker-entrypoint.sh
+++ b/build/common/worker/docker-entrypoint.sh
@@ -28,11 +28,11 @@ function configureEnv() {
       exit 1
     fi
 
-    envsubst "${MARIADB_HOST}
+    envsubst '${MARIADB_HOST}
       ${REDIS_CACHE}
       ${REDIS_QUEUE}
       ${REDIS_SOCKETIO}
-      ${SOCKETIO_PORT}" < /opt/frappe/common_site_config.json.template > /home/frappe/frappe-bench/sites/common_site_config.json
+      ${SOCKETIO_PORT}' < /opt/frappe/common_site_config.json.template > /home/frappe/frappe-bench/sites/common_site_config.json
   fi
 }
 
diff --git a/build/erpnext-assets/docker-entrypoint.sh b/build/erpnext-assets/docker-entrypoint.sh
index 90bdf4b2..17b712e3 100755
--- a/build/erpnext-assets/docker-entrypoint.sh
+++ b/build/erpnext-assets/docker-entrypoint.sh
@@ -13,12 +13,12 @@ rsync -a --delete /var/www/html/assets/erpnext /assets
 
 chmod -R 755 /assets
 
-if [[ -z "$ERPNEXT_PY" ]]; then
-    export ERPNEXT_PY=0.0.0.0
+if [[ -z "$FRAPPE_PY" ]]; then
+    export FRAPPE_PY=0.0.0.0
 fi
 
-if [[ -z "$ERPNEXT_PY_PORT" ]]; then
-    export ERPNEXT_PY_PORT=8000
+if [[ -z "$FRAPPE_PY_PORT" ]]; then
+    export FRAPPE_PY_PORT=8000
 fi
 
 if [[ -z "$FRAPPE_SOCKETIO" ]]; then
@@ -29,7 +29,12 @@ if [[ -z "$FRAPPE_SOCKETIO_PORT" ]]; then
     export FRAPPE_SOCKETIO_PORT=9000
 fi
 
-envsubst "${API_HOST} ${API_PORT} ${ERPNEXT_PY} ${ERPNEXT_PY_PORT} ${FRAPPE_SOCKETIO} ${FRAPPE_SOCKETIO_PORT}" \
+envsubst '${API_HOST}
+    ${API_PORT}
+    ${FRAPPE_PY}
+    ${FRAPPE_PY_PORT}
+    ${FRAPPE_SOCKETIO}
+    ${FRAPPE_SOCKETIO_PORT}' \
     < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 
 exec "$@"
diff --git a/build/frappe-assets/docker-entrypoint.sh b/build/frappe-assets/docker-entrypoint.sh
index 4b791d10..f1caec04 100755
--- a/build/frappe-assets/docker-entrypoint.sh
+++ b/build/frappe-assets/docker-entrypoint.sh
@@ -9,7 +9,6 @@ set -e
 rsync -a --delete /var/www/html/assets/js /assets
 rsync -a --delete /var/www/html/assets/css /assets
 rsync -a --delete /var/www/html/assets/frappe /assets
-rsync -a --delete /var/www/html/assets/erpnext /assets
 
 chmod -R 755 /assets
 
@@ -29,7 +28,12 @@ if [[ -z "$FRAPPE_SOCKETIO_PORT" ]]; then
     export FRAPPE_SOCKETIO_PORT=9000
 fi
 
-envsubst "${API_HOST} ${API_PORT} ${FRAPPE_PY} ${FRAPPE_PY_PORT} ${FRAPPE_SOCKETIO} ${FRAPPE_SOCKETIO_PORT}" \
+envsubst '${API_HOST}
+    ${API_PORT}
+    ${FRAPPE_PY}
+    ${FRAPPE_PY_PORT}
+    ${FRAPPE_SOCKETIO}
+    ${FRAPPE_SOCKETIO_PORT}' \
     < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 
 exec "$@"