Remove DOCKER_EXECDRIVER env

Since --exec-driver flag has been removed, we don't need environment DOCKER_EXECDRIVER in integration-cli and Makefile any more. Signed-off-by: Lei Jitang <[email protected]>
ncdc · Nov 9, 2015 · 3c4dab5 · 3c4dab5
1 parent e357be4
commit 3c4dab5
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,
 	}
 }