tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-25 22:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

run.sh: handle unix:// prefix in DOCKER_HOST

Browse Source 
docker currently requires the `unix://` prefix when pointing `DOCKER_HOST` at a socket.

fixes #7281

Signed-off-by: Christian Höltje <docwhat@gerf.org>
This commit is contained in:
Christian Höltje 2020-03-11 14:39:18 -04:00 committed by Ulysses Souza
parent 60514c1adb
commit 1ff05ac060
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
script/run/run.sh
View File

@ -21,10 +21,10 @@ IMAGE="docker/compose:$VERSION"
# Setup options for connecting to docker host # Setup options for connecting to docker host
if [ -z "$DOCKER_HOST" ]; then if [ -z "$DOCKER_HOST" ]; then
DOCKER_HOST="/var/run/docker.sock" DOCKER_HOST='unix:///var/run/docker.sock'
fi fi
if [ -S "$DOCKER_HOST" ]; then if [ -S "${DOCKER_HOST#unix://}" ]; then
DOCKER_ADDR="-v $DOCKER_HOST:$DOCKER_HOST -e DOCKER_HOST" DOCKER_ADDR="-v ${DOCKER_HOST#unix://}:${DOCKER_HOST#unix://} -e DOCKER_HOST"
else else
DOCKER_ADDR="-e DOCKER_HOST -e DOCKER_TLS_VERIFY -e DOCKER_CERT_PATH" DOCKER_ADDR="-e DOCKER_HOST -e DOCKER_TLS_VERIFY -e DOCKER_CERT_PATH"
fi fi