From 63cc4a31bdea2601c8adc08194759657f1476b16 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 13 Dec 2022 13:36:39 -0800
Subject: [PATCH] Docker: limited the waiting time for control socket removal.
 Fixes https://github.com/nginx/unit/issues/728 Refs
 https://github.com/nginx/unit/issues/718

---
 pkg/docker/docker-entrypoint.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkg/docker/docker-entrypoint.sh b/pkg/docker/docker-entrypoint.sh
index 7f65d94a..3d134ea2 100755
--- a/pkg/docker/docker-entrypoint.sh
+++ b/pkg/docker/docker-entrypoint.sh
@@ -2,6 +2,9 @@
 
 set -e
 
+WAITLOOPS=5
+SLEEPSEC=1
+
 curl_put()
 {
     RET=$(/usr/bin/curl -s -w '%{http_code}' -X PUT --data-binary @$1 --unix-socket /var/run/control.unit.sock http://localhost/$2)
@@ -57,7 +60,18 @@ if [ "$1" = "unitd" ] || [ "$1" = "unitd-debug" ]; then
             echo "$0: Stopping Unit daemon after initial configuration..."
             kill -TERM $(/bin/cat /var/run/unit.pid)
 
-            while [ -S /var/run/control.unit.sock ]; do echo "$0: Waiting for control socket to be removed..."; /bin/sleep 0.1; done
+            for i in $(/usr/bin/seq $WAITLOOPS); do
+                if [ -S /var/run/control.unit.sock ]; then
+                    echo "$0 Waiting for control socket to be removed..."
+                    /bin/sleep $SLEEPSEC
+                else
+                    break
+                fi
+            done
+            if [ -S /var/run/control.unit.sock ]; then
+                kill -KILL $(/bin/cat /var/run/unit.pid)
+                rm -f /var/run/control.unit.sock
+            fi
 
             echo
             echo "$0: Unit initial configuration complete; ready for start up..."