diff --git a/Makefile b/Makefile index 119d11b887..c1f58806e2 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ DOCKER_ENVS := \ -e BUILDFLAGS \ -e DOCKER_CLIENTONLY \ -e DOCKER_DEBUG \ - -e DOCKER_EXECDRIVER \ -e DOCKER_EXPERIMENTAL \ -e DOCKER_REMAP_ROOT \ -e DOCKER_GRAPHDRIVER \ diff --git a/docs/Makefile b/docs/Makefile index 021e8f6e5e..711462ea5b 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -6,7 +6,6 @@ DOCKER_ENVS := \ -e BUILDFLAGS \ -e DOCKER_CLIENTONLY \ - -e DOCKER_EXECDRIVER \ -e DOCKER_GRAPHDRIVER \ -e TESTDIRS \ -e TESTFLAGS \ diff --git a/hack/make.sh b/hack/make.sh index 64f02ea5a5..45728872ef 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -212,7 +212,6 @@ test_env() { # use "env -i" to tightly control the environment variables that bleed into the tests env -i \ DEST="$DEST" \ - DOCKER_EXECDRIVER="$DOCKER_EXECDRIVER" \ DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \ DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \ DOCKER_HOST="$DOCKER_HOST" \ diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go index cee8481204..bc28e0deeb 100644 --- a/integration-cli/docker_utils.go +++ b/integration-cli/docker_utils.go @@ -113,7 +113,6 @@ type Daemon struct { stdout, stderr io.ReadCloser cmd *exec.Cmd storageDriver string - execDriver string wait chan error userlandProxy bool useDefaultHost bool @@ -155,7 +154,6 @@ func NewDaemon(c *check.C) *Daemon { folder: daemonFolder, root: daemonRoot, storageDriver: os.Getenv("DOCKER_GRAPHDRIVER"), - execDriver: os.Getenv("DOCKER_EXECDRIVER"), userlandProxy: userlandProxy, } }