Skip to content

Commit

Permalink
dockerTools.pullImage: change the docker deamon readiness mechanism
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
nlewo authored and Mic92 committed Sep 13, 2017
1 parent 6076d9f commit 7c1278d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/build-support/docker/pull.sh
Expand Up @@ -25,7 +25,7 @@ done
# run docker daemon
dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &

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

0 comments on commit 7c1278d

Please sign in to comment.