alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

dockerTools.pullImage: change the docker deamon readiness mechanism

Browse source 
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.
This commit is contained in:
Antoine Eiche 2017-09-04 10:52:16 +02:00
parent 65e6a7e0ec
commit 132e790735
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/docker/pull.sh
View file

@ -25,7 +25,7 @@ done
# run docker daemon # run docker daemon
dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock & 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 '.' printf '.'
sleep 1 sleep 1
done done