From a85e6a4d4a5afc866b153e46e19ed3c15d3a24ec Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Fri, 9 Oct 2015 20:52:45 -0400 Subject: [PATCH] Update integration test userns support with flag name change `--root` is now `--userns-remap` Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) --- hack/make/.integration-daemon-start | 2 +- integration-cli/docker_utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/make/.integration-daemon-start b/hack/make/.integration-daemon-start index f696145ab6..0882d510ee 100644 --- a/hack/make/.integration-daemon-start +++ b/hack/make/.integration-daemon-start @@ -29,7 +29,7 @@ fi # example usage: DOCKER_STORAGE_OPTS="dm.basesize=20G,dm.loopdatasize=200G" extra_params="" if [ "$DOCKER_REMAP_ROOT" ]; then - extra_params="--root $DOCKER_REMAP_ROOT" + extra_params="--userns-remap $DOCKER_REMAP_ROOT" fi if [ -z "$DOCKER_TEST_HOST" ]; then diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go index f0cd31c3e9..070dd86e5b 100644 --- a/integration-cli/docker_utils.go +++ b/integration-cli/docker_utils.go @@ -108,7 +108,7 @@ func (d *Daemon) Start(arg ...string) error { ) if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" { - args = append(args, []string{"--root", root}...) + args = append(args, []string{"--userns-remap", root}...) } // If we don't explicitly set the log-level or debug flag(-D) then