From 132e7907355987f717a4fe6e1ca3d8f79e7987c3 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Mon, 4 Sep 2017 10:52:16 +0200 Subject: 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. --- pkgs/build-support/docker/pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh index db643f5e88e5a..0b1e9f310ee92 100644 --- a/pkgs/build-support/docker/pull.sh +++ b/pkgs/build-support/docker/pull.sh @@ -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 -- cgit 1.4.1