From 4dfb622e5f3b78f1dbb9de5a9a821146814c9032 Mon Sep 17 00:00:00 2001 From: Olaf Klischat Date: Fri, 1 Dec 2017 00:20:16 +0100 Subject: [PATCH] $DOCKERD_OPTIONS introduced --- 17.09/dind/dockerd-entrypoint.sh | 4 +++- 17.11/dind/dockerd-entrypoint.sh | 4 +++- dockerd-entrypoint.sh | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/17.09/dind/dockerd-entrypoint.sh b/17.09/dind/dockerd-entrypoint.sh index 05cc91b7c..b2bf0944d 100755 --- a/17.09/dind/dockerd-entrypoint.sh +++ b/17.09/dind/dockerd-entrypoint.sh @@ -8,13 +8,15 @@ if [ "$#" -eq 0 -o "${1#-}" != "$1" ]; then set -- dockerd \ --host=unix:///var/run/docker.sock \ --host=tcp://0.0.0.0:2375 \ + $DOCKERD_OPTIONS \ "$@" fi if [ "$1" = 'dockerd' ]; then # if we're running Docker, let's pipe through dind # (and we'll run dind explicitly with "sh" since its shebang is /bin/bash) - set -- sh "$(which dind)" "$@" + shift + set -- sh "$(which dind)" dockerd $DOCKERD_OPTIONS "$@" fi exec "$@" diff --git a/17.11/dind/dockerd-entrypoint.sh b/17.11/dind/dockerd-entrypoint.sh index 05cc91b7c..b2bf0944d 100755 --- a/17.11/dind/dockerd-entrypoint.sh +++ b/17.11/dind/dockerd-entrypoint.sh @@ -8,13 +8,15 @@ if [ "$#" -eq 0 -o "${1#-}" != "$1" ]; then set -- dockerd \ --host=unix:///var/run/docker.sock \ --host=tcp://0.0.0.0:2375 \ + $DOCKERD_OPTIONS \ "$@" fi if [ "$1" = 'dockerd' ]; then # if we're running Docker, let's pipe through dind # (and we'll run dind explicitly with "sh" since its shebang is /bin/bash) - set -- sh "$(which dind)" "$@" + shift + set -- sh "$(which dind)" dockerd $DOCKERD_OPTIONS "$@" fi exec "$@" diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 05cc91b7c..b2bf0944d 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -8,13 +8,15 @@ if [ "$#" -eq 0 -o "${1#-}" != "$1" ]; then set -- dockerd \ --host=unix:///var/run/docker.sock \ --host=tcp://0.0.0.0:2375 \ + $DOCKERD_OPTIONS \ "$@" fi if [ "$1" = 'dockerd' ]; then # if we're running Docker, let's pipe through dind # (and we'll run dind explicitly with "sh" since its shebang is /bin/bash) - set -- sh "$(which dind)" "$@" + shift + set -- sh "$(which dind)" dockerd $DOCKERD_OPTIONS "$@" fi exec "$@"