From f592be2bbcec8356ed844a248752b5ddccbeeceb Mon Sep 17 00:00:00 2001
From: Jonathan Azoff <azoff@users.noreply.github.com>
Date: Fri, 15 May 2020 00:20:39 -0700
Subject: [PATCH] Allow max retries on socket connect for buildctl

Signed-off-by: Jonathan Azoff <jon@azof.fr>
---
 .../buildctl-daemonless.sh                    | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/examples/buildctl-daemonless/buildctl-daemonless.sh b/examples/buildctl-daemonless/buildctl-daemonless.sh
index f2e8e17f0..84a6877ff 100755
--- a/examples/buildctl-daemonless/buildctl-daemonless.sh
+++ b/examples/buildctl-daemonless/buildctl-daemonless.sh
@@ -9,6 +9,7 @@
 set -eu
 
 : ${BUILDCTL=buildctl}
+: ${BUILDCTL_CONNECT_RETRIES_MAX=10}
 : ${BUILDKITD=buildkitd}
 : ${BUILDKITD_FLAGS=}
 : ${ROOTLESSKIT=rootlesskit}
@@ -21,34 +22,34 @@ tmp=$(mktemp -d /tmp/buildctl-daemonless.XXXXXX)
 trap "kill \$(cat $tmp/pid); rm -rf $tmp" EXIT
 
 startBuildkitd() {
-	addr=
-	helper=
-	if [ $(id -u) = 0 ]; then
-		addr=unix:///run/buildkit/buildkitd.sock
-	else
-		addr=unix://$XDG_RUNTIME_DIR/buildkit/buildkitd.sock
-		helper=$ROOTLESSKIT
-	fi
-	$helper $BUILDKITD $BUILDKITD_FLAGS --addr=$addr >$tmp/log 2>&1 &
-	pid=$!
-	echo $pid >$tmp/pid
-	echo $addr >$tmp/addr
+    addr=
+    helper=
+    if [ $(id -u) = 0 ]; then
+        addr=unix:///run/buildkit/buildkitd.sock
+    else
+        addr=unix://$XDG_RUNTIME_DIR/buildkit/buildkitd.sock
+        helper=$ROOTLESSKIT
+    fi
+    $helper $BUILDKITD $BUILDKITD_FLAGS --addr=$addr >$tmp/log 2>&1 &
+    pid=$!
+    echo $pid >$tmp/pid
+    echo $addr >$tmp/addr
 }
 
 # buildkitd supports NOTIFY_SOCKET but as far as we know, there is no easy way
 # to wait for NOTIFY_SOCKET activation using busybox-builtin commands...
 waitForBuildkitd() {
-	addr=$(cat $tmp/addr)
-	try=0
-	max=10
-	until $BUILDCTL --addr=$addr debug workers >/dev/null 2>&1; do
-		if [ $try -gt $max ]; then
-			echo >&2 "could not connect to $addr after $max trials"
-			exit 1
-		fi
-		sleep $(awk "BEGIN{print (100 + $try * 20) * 0.001}")
-		try=$(expr $try + 1)
-	done
+    addr=$(cat $tmp/addr)
+    try=0
+    max=$BUILDCTL_CONNECT_RETRIES_MAX
+    until $BUILDCTL --addr=$addr debug workers >/dev/null 2>&1; do
+        if [ $try -gt $max ]; then
+            echo >&2 "could not connect to $addr after $max trials"
+            exit 1
+        fi
+        sleep $(awk "BEGIN{print (100 + $try * 20) * 0.001}")
+        try=$(expr $try + 1)
+    done
 }
 
 startBuildkitd