diff --git a/1.10/dind/dockerd-entrypoint.sh b/1.10/dind/dockerd-entrypoint.sh index 24b77ae9b..c5e9818b5 100755 --- a/1.10/dind/dockerd-entrypoint.sh +++ b/1.10/dind/dockerd-entrypoint.sh @@ -6,13 +6,14 @@ if [ "$#" -eq 0 -o "${1:0:1}" = '-' ]; then --host=unix:///var/run/docker.sock \ --host=tcp://0.0.0.0:2375 \ --storage-driver=vfs \ + "${DOCKER_DAEMON_ARGS}" \ "$@" fi if [ "$1" = 'docker' -a "$2" = 'daemon' ]; 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)" "$@" + set -- sh "$(which dind)" "${DOCKER_DAEMON_ARGS}" "$@" fi exec "$@" diff --git a/1.11/dind/dockerd-entrypoint.sh b/1.11/dind/dockerd-entrypoint.sh index 24b77ae9b..c5e9818b5 100755 --- a/1.11/dind/dockerd-entrypoint.sh +++ b/1.11/dind/dockerd-entrypoint.sh @@ -6,13 +6,14 @@ if [ "$#" -eq 0 -o "${1:0:1}" = '-' ]; then --host=unix:///var/run/docker.sock \ --host=tcp://0.0.0.0:2375 \ --storage-driver=vfs \ + "${DOCKER_DAEMON_ARGS}" \ "$@" fi if [ "$1" = 'docker' -a "$2" = 'daemon' ]; 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)" "$@" + set -- sh "$(which dind)" "${DOCKER_DAEMON_ARGS}" "$@" fi exec "$@" diff --git a/1.12-rc/dind/dockerd-entrypoint.sh b/1.12-rc/dind/dockerd-entrypoint.sh index 24b77ae9b..c5e9818b5 100755 --- a/1.12-rc/dind/dockerd-entrypoint.sh +++ b/1.12-rc/dind/dockerd-entrypoint.sh @@ -6,13 +6,14 @@ if [ "$#" -eq 0 -o "${1:0:1}" = '-' ]; then --host=unix:///var/run/docker.sock \ --host=tcp://0.0.0.0:2375 \ --storage-driver=vfs \ + "${DOCKER_DAEMON_ARGS}" \ "$@" fi if [ "$1" = 'docker' -a "$2" = 'daemon' ]; 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)" "$@" + set -- sh "$(which dind)" "${DOCKER_DAEMON_ARGS}" "$@" fi exec "$@"