Skip to content

Commit 7c1278d

Browse files
nlewoMic92
authored andcommittedSep 13, 2017
dockerTools.pullImage: change the docker deamon readiness mechanism
To wait for the docker deamon, curl requests are sent. However, if a http proxy is set, it will respond instead of the docker daemon. To avoid this, we send docker ps command instead of curl command. (cherry picked from commit 132e790)
1 parent 6076d9f commit 7c1278d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

Diff for: ‎pkgs/build-support/docker/pull.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ done
2525
# run docker daemon
2626
dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &
2727

28-
until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do
28+
until docker ps 2>/dev/null; do
2929
printf '.'
3030
sleep 1
3131
done

0 commit comments

Comments
 (0)
Please sign in to comment.