docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wait to fire start event until socket is created 

Previously, this check only worked if no host was specified and was
hard coded to check for "/var/run/docker.sock"

This change generalizes that check and captures any specified socket
and waits for it to be created.

Caveat: This will only check the first socket specified, but it is an
improvement over none at all.

Fixes #185160

Signed-off-by: Andrew Guenther <guenther.andrew.j@gmail.com>
This commit is contained in:
Andrew Guenther 2015-12-08 18:55:17 -08:00 committed by Andrew Guenther
parent 69c381c8d1
commit 9f401254bd
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/init/upstart/docker.conf
View File

@ -46,15 +46,23 @@ end script
# See https://github.com/docker/docker/issues/6647 # See https://github.com/docker/docker/issues/6647
post-start script post-start script
DOCKER_OPTS= DOCKER_OPTS=
DOCKER_SOCKET=
if [ -f /etc/default/$UPSTART_JOB ]; then if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB . /etc/default/$UPSTART_JOB
fi fi
if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then
while ! [ -e /var/run/docker.sock ]; do DOCKER_SOCKET=/var/run/docker.sock
else
DOCKER_SOCKET=$(printf "%s" "$DOCKER_OPTS" | grep -oP -e '(-H|--host)\W*unix://\K(\S+)')
fi
if [ -n "$DOCKER_SOCKET" ]; then
while ! [ -e "$DOCKER_SOCKET" ]; do
initctl status $UPSTART_JOB | grep -qE "(stop|respawn)/" && exit 1 initctl status $UPSTART_JOB | grep -qE "(stop|respawn)/" && exit 1
echo "Waiting for /var/run/docker.sock" echo "Waiting for $DOCKER_SOCKET"
sleep 0.1 sleep 0.1
done done
echo "/var/run/docker.sock is up" echo "$DOCKER_SOCKET is up"
fi fi
end script end script