p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25229 from bboreham/multi-unix-sockets

Browse Source 
Fix Upstart post-start script when using multiple Unix sockets
Upstream-commit: 016c0076ee0dbaac58674466573f037ea894ed77
Component: engine
This commit is contained in:
Vincent Demeester
2016-08-01 19:43:07 +02:00
committed by GitHub
parent 0e7aaf609b 9111a66ef5
commit 97a0178f2f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/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
DOCKER_SOCKET=/var/run/docker.sock
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
if [ -n "$DOCKER_SOCKET" ]; then