diff options
| author | Antoine Eiche <lewo@abesis.fr> | 2017-09-04 10:52:16 +0200 |
|---|---|---|
| committer | Antoine Eiche <lewo@abesis.fr> | 2017-09-04 10:52:16 +0200 |
| commit | 132e7907355987f717a4fe6e1ca3d8f79e7987c3 (patch) | |
| tree | d23fa781e430eec51965708d9a52ff781d99877f /pkgs/build-support/docker | |
| parent | 65e6a7e0ec99524b1d1f778c3dc87259c8ea5b2c (diff) | |
| download | nixlib-132e7907355987f717a4fe6e1ca3d8f79e7987c3.tar nixlib-132e7907355987f717a4fe6e1ca3d8f79e7987c3.tar.gz nixlib-132e7907355987f717a4fe6e1ca3d8f79e7987c3.tar.bz2 nixlib-132e7907355987f717a4fe6e1ca3d8f79e7987c3.tar.lz nixlib-132e7907355987f717a4fe6e1ca3d8f79e7987c3.tar.xz nixlib-132e7907355987f717a4fe6e1ca3d8f79e7987c3.tar.zst nixlib-132e7907355987f717a4fe6e1ca3d8f79e7987c3.zip | |
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.
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh index db643f5e88e5..0b1e9f310ee9 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 |