beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the name of the first unix socket in DOCKER_OPTS

Browse source 
Otherwise the while loop waits forever, checking for
a filename made up of all the names.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
This commit is contained in:
Bryan Boreham 2016-07-29 14:04:43 +01:00
parent 3b7ea4d8c3
commit 68dab9bd09
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/init/upstart/docker.conf
View file

@ -58,7 +58,7 @@ post-start script
if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then
DOCKER_SOCKET=/var/run/docker.sock DOCKER_SOCKET=/var/run/docker.sock
else else
DOCKER_SOCKET=$(printf "%s" "$DOCKER_OPTS" | grep -oP -e '(-H|--host)\W*unix://\K(\S+)') DOCKER_SOCKET=$(printf "%s" "$DOCKER_OPTS" | grep -oP -e '(-H|--host)\W*unix://\K(\S+)' | sed 1q)
fi fi
if [ -n "$DOCKER_SOCKET" ]; then if [ -n "$DOCKER_SOCKET" ]; then