From 0df0d6d11fa226e9c00c61352f890ded84491c2c Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Mon, 2 Mar 2020 05:09:57 +0530
Subject: [PATCH] fix: use SOCKETIO_PORT instead of FRAPPE_SOCKETIO_PORT

---
 build/common/nginx-default.conf.template  | 2 +-
 build/erpnext-assets/docker-entrypoint.sh | 6 +++---
 build/frappe-assets/docker-entrypoint.sh  | 6 +++---
 installation/docker-compose-erpnext.yml   | 2 +-
 installation/docker-compose-frappe.yml    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/common/nginx-default.conf.template b/build/common/nginx-default.conf.template
index c2e0e0ba..b9fc161a 100644
--- a/build/common/nginx-default.conf.template
+++ b/build/common/nginx-default.conf.template
@@ -3,7 +3,7 @@ upstream frappe-server {
 }
 
 upstream socketio-server {
-    server ${FRAPPE_SOCKETIO}:${FRAPPE_SOCKETIO_PORT} fail_timeout=0;
+    server ${FRAPPE_SOCKETIO}:${SOCKETIO_PORT} fail_timeout=0;
 }
 
 server {
diff --git a/build/erpnext-assets/docker-entrypoint.sh b/build/erpnext-assets/docker-entrypoint.sh
index 17b712e3..4919fb34 100755
--- a/build/erpnext-assets/docker-entrypoint.sh
+++ b/build/erpnext-assets/docker-entrypoint.sh
@@ -25,8 +25,8 @@ if [[ -z "$FRAPPE_SOCKETIO" ]]; then
     export FRAPPE_SOCKETIO=0.0.0.0
 fi
 
-if [[ -z "$FRAPPE_SOCKETIO_PORT" ]]; then
-    export FRAPPE_SOCKETIO_PORT=9000
+if [[ -z "$SOCKETIO_PORT" ]]; then
+    export SOCKETIO_PORT=9000
 fi
 
 envsubst '${API_HOST}
@@ -34,7 +34,7 @@ envsubst '${API_HOST}
     ${FRAPPE_PY}
     ${FRAPPE_PY_PORT}
     ${FRAPPE_SOCKETIO}
-    ${FRAPPE_SOCKETIO_PORT}' \
+    ${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 f1caec04..f68e7fd3 100755
--- a/build/frappe-assets/docker-entrypoint.sh
+++ b/build/frappe-assets/docker-entrypoint.sh
@@ -24,8 +24,8 @@ if [[ -z "$FRAPPE_SOCKETIO" ]]; then
     export FRAPPE_SOCKETIO=0.0.0.0
 fi
 
-if [[ -z "$FRAPPE_SOCKETIO_PORT" ]]; then
-    export FRAPPE_SOCKETIO_PORT=9000
+if [[ -z "$SOCKETIO_PORT" ]]; then
+    export SOCKETIO_PORT=9000
 fi
 
 envsubst '${API_HOST}
@@ -33,7 +33,7 @@ envsubst '${API_HOST}
     ${FRAPPE_PY}
     ${FRAPPE_PY_PORT}
     ${FRAPPE_SOCKETIO}
-    ${FRAPPE_SOCKETIO_PORT}' \
+    ${SOCKETIO_PORT}' \
     < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 
 exec "$@"
diff --git a/installation/docker-compose-erpnext.yml b/installation/docker-compose-erpnext.yml
index 4d4713fb..93b7c6a1 100644
--- a/installation/docker-compose-erpnext.yml
+++ b/installation/docker-compose-erpnext.yml
@@ -8,7 +8,7 @@ services:
       - FRAPPE_PY=erpnext-python
       - FRAPPE_PY_PORT=8000
       - FRAPPE_SOCKETIO=frappe-socketio
-      - FRAPPE_SOCKETIO_PORT=9000
+      - SOCKETIO_PORT=9000
       - LETSENCRYPT_HOST=${SITES}
       - VIRTUAL_HOST=${SITES}
       - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
diff --git a/installation/docker-compose-frappe.yml b/installation/docker-compose-frappe.yml
index f0af5ba3..869fb73c 100644
--- a/installation/docker-compose-frappe.yml
+++ b/installation/docker-compose-frappe.yml
@@ -8,7 +8,7 @@ services:
       - FRAPPE_PY=frappe-python
       - FRAPPE_PY_PORT=8000
       - FRAPPE_SOCKETIO=frappe-socketio
-      - FRAPPE_SOCKETIO_PORT=9000
+      - SOCKETIO_PORT=9000
       - LETSENCRYPT_HOST=${SITES}
       - VIRTUAL_HOST=${SITES}
       - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}