From 1ff05ac060b2aaba2b0396d5bccebf80d4543699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=B6ltje?= Date: Wed, 11 Mar 2020 14:39:18 -0400 Subject: [PATCH] run.sh: handle unix:// prefix in DOCKER_HOST MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit docker currently requires the `unix://` prefix when pointing `DOCKER_HOST` at a socket. fixes #7281 Signed-off-by: Christian Höltje --- script/run/run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/run/run.sh b/script/run/run.sh index 8bc6798f3..bacf39d88 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -21,10 +21,10 @@ IMAGE="docker/compose:$VERSION" # Setup options for connecting to docker host if [ -z "$DOCKER_HOST" ]; then - DOCKER_HOST="/var/run/docker.sock" + DOCKER_HOST='unix:///var/run/docker.sock' fi -if [ -S "$DOCKER_HOST" ]; then - DOCKER_ADDR="-v $DOCKER_HOST:$DOCKER_HOST -e DOCKER_HOST" +if [ -S "${DOCKER_HOST#unix://}" ]; then + DOCKER_ADDR="-v ${DOCKER_HOST#unix://}:${DOCKER_HOST#unix://} -e DOCKER_HOST" else DOCKER_ADDR="-e DOCKER_HOST -e DOCKER_TLS_VERIFY -e DOCKER_CERT_PATH" fi