From 9b28670308af22b1616d2cb6a1e692cf153a6322 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Fri, 9 Oct 2015 19:09:02 -0700 Subject: [PATCH] fix logic because jess is the worst Signed-off-by: Jessica Frazelle Docker-DCO-1.1-Signed-off-by: Jessica Frazelle Upstream-commit: 930b27a86bf02969600259ce3a5d3fcff10edcb5 Component: engine --- components/engine/hack/make.sh | 1 + components/engine/integration-cli/requirements.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/hack/make.sh b/components/engine/hack/make.sh index e3ce1cc1dd..c7318953b4 100755 --- a/components/engine/hack/make.sh +++ b/components/engine/hack/make.sh @@ -220,6 +220,7 @@ test_env() { DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \ DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \ DOCKER_HOST="$DOCKER_HOST" \ + DOCKER_REMAP_ROOT="$DOCKER_REMAP_ROOT" \ DOCKER_REMOTE_DAEMON="$DOCKER_REMOTE_DAEMON" \ GOPATH="$GOPATH" \ HOME="$ABS_DEST/fake-HOME" \ diff --git a/components/engine/integration-cli/requirements.go b/components/engine/integration-cli/requirements.go index 4ae4f0fd15..7248bc679b 100644 --- a/components/engine/integration-cli/requirements.go +++ b/components/engine/integration-cli/requirements.go @@ -152,9 +152,9 @@ var ( func() bool { root := os.Getenv("DOCKER_REMAP_ROOT") if root != "" { - return true + return false } - return false + return true }, "Test cannot be run when remapping root", }