From a73d96e731e2dd5d6822c99a9af4dcbfbbedb2be Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Tue, 28 Apr 2020 03:00:19 +1000 Subject: [PATCH] Remove --userland-proxy-path (no longer necessary) --- 19.03-rc/dind/dockerd-entrypoint.sh | 2 +- 19.03/dind/dockerd-entrypoint.sh | 2 +- dockerd-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/19.03-rc/dind/dockerd-entrypoint.sh b/19.03-rc/dind/dockerd-entrypoint.sh index 42aab58a8..d5f59fa9e 100755 --- a/19.03-rc/dind/dockerd-entrypoint.sh +++ b/19.03-rc/dind/dockerd-entrypoint.sh @@ -173,7 +173,7 @@ if [ "$1" = 'dockerd' ]; then --copy-up=/etc \ --copy-up=/run \ ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" --userland-proxy-path=rootlesskit-docker-proxy + "$@" elif [ -x '/usr/local/bin/dind' ]; then # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it set -- '/usr/local/bin/dind' "$@" diff --git a/19.03/dind/dockerd-entrypoint.sh b/19.03/dind/dockerd-entrypoint.sh index 42aab58a8..d5f59fa9e 100755 --- a/19.03/dind/dockerd-entrypoint.sh +++ b/19.03/dind/dockerd-entrypoint.sh @@ -173,7 +173,7 @@ if [ "$1" = 'dockerd' ]; then --copy-up=/etc \ --copy-up=/run \ ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" --userland-proxy-path=rootlesskit-docker-proxy + "$@" elif [ -x '/usr/local/bin/dind' ]; then # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it set -- '/usr/local/bin/dind' "$@" diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 42aab58a8..d5f59fa9e 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -173,7 +173,7 @@ if [ "$1" = 'dockerd' ]; then --copy-up=/etc \ --copy-up=/run \ ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" --userland-proxy-path=rootlesskit-docker-proxy + "$@" elif [ -x '/usr/local/bin/dind' ]; then # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it set -- '/usr/local/bin/dind' "$@"