From 922877bf9269f6cfcf36b7fee7ade55df15306d5 Mon Sep 17 00:00:00 2001
From: Davide Bortolami <d@fermiumlabs.com>
Date: Wed, 4 Mar 2020 14:15:25 +0000
Subject: [PATCH] Fixes #101

Nginx will now wait up to 10 seconds for frappe-python and frappe-socketio to be available
---
 build/erpnext-assets/docker-entrypoint.sh | 7 +++++++
 build/frappe-assets/docker-entrypoint.sh  | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/build/erpnext-assets/docker-entrypoint.sh b/build/erpnext-assets/docker-entrypoint.sh
index 4919fb34..2774a9f4 100755
--- a/build/erpnext-assets/docker-entrypoint.sh
+++ b/build/erpnext-assets/docker-entrypoint.sh
@@ -37,4 +37,11 @@ envsubst '${API_HOST}
     ${SOCKETIO_PORT}' \
     < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 
+echo "Waiting for frappe-python to be available on $FRAPPE_PY port $FRAPPE_PY_PORT"
+timeout 10 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' $FRAPPE_PY $FRAPPE_PY_PORT
+echo "Frappe-python available on $FRAPPE_PY port $FRAPPE_PY_PORT"
+echo "Waiting for frappe-socketio to be available on $FRAPPE_PY port $FRAPPE_PY_PORT"
+timeout 10 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' $FRAPPE_SOCKETIO $SOCKETIO_PORT
+echo "Frappe-socketio available on $FRAPPE_PY port $FRAPPE_PY_PORT"
+
 exec "$@"
diff --git a/build/frappe-assets/docker-entrypoint.sh b/build/frappe-assets/docker-entrypoint.sh
index f68e7fd3..6603aad9 100755
--- a/build/frappe-assets/docker-entrypoint.sh
+++ b/build/frappe-assets/docker-entrypoint.sh
@@ -36,4 +36,11 @@ envsubst '${API_HOST}
     ${SOCKETIO_PORT}' \
     < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 
+echo "Waiting for frappe-python to be available on $FRAPPE_PY port $FRAPPE_PY_PORT"
+timeout 10 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' $FRAPPE_PY $FRAPPE_PY_PORT
+echo "Frappe-python available on $FRAPPE_PY port $FRAPPE_PY_PORT"
+echo "Waiting for frappe-socketio to be available on $FRAPPE_PY port $FRAPPE_PY_PORT"
+timeout 10 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' $FRAPPE_SOCKETIO $SOCKETIO_PORT
+echo "Frappe-socketio available on $FRAPPE_PY port $FRAPPE_PY_PORT"
+
 exec "$@"