1. docker
  2. Commit 3c4dab51d33f6e90c45de83c01474bc60aee3766
Browse code

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 <leijiang@huawei.com>

Lei Jitang authored on 2015/11/09 10:17:32
Showing 4 changed files
Makefile
History View file @ 3c4dab5
... ... 
@@ -7,7 +7,6 @@ DOCKER_ENVS := \
7 7 
 	-e BUILDFLAGS \
8 8 
 	-e DOCKER_CLIENTONLY \
9 9 
 	-e DOCKER_DEBUG \
10 
-	-e DOCKER_EXECDRIVER \
11 10 
 	-e DOCKER_EXPERIMENTAL \
12 11 
 	-e DOCKER_REMAP_ROOT \
13 12 
 	-e DOCKER_GRAPHDRIVER \
docs/Makefile
History View file @ 3c4dab5
... ... 
@@ -6,7 +6,6 @@
6 6 
 DOCKER_ENVS := \
7 7 
 	-e BUILDFLAGS \
8 8 
 	-e DOCKER_CLIENTONLY \
9 
-	-e DOCKER_EXECDRIVER \
10 9 
 	-e DOCKER_GRAPHDRIVER \
11 10 
 	-e TESTDIRS \
12 11 
 	-e TESTFLAGS \
hack/make.sh
History View file @ 3c4dab5
... ... 
@@ -212,7 +212,6 @@ test_env() {
212 212 
 	# use "env -i" to tightly control the environment variables that bleed into the tests
213 213 
 	env -i \
214 214 
 		DEST="$DEST" \
215 
-		DOCKER_EXECDRIVER="$DOCKER_EXECDRIVER" \
216 215 
 		DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \
217 216 
 		DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \
218 217 
 		DOCKER_HOST="$DOCKER_HOST" \
integration-cli/docker_utils.go
History View file @ 3c4dab5
... ... 
@@ -113,7 +113,6 @@ type Daemon struct {
113 113 
 	stdout, stderr    io.ReadCloser
114 114 
 	cmd               *exec.Cmd
115 115 
 	storageDriver     string
116 
-	execDriver        string
117 116 
 	wait              chan error
118 117 
 	userlandProxy     bool
119 118 
 	useDefaultHost    bool
... ... 
@@ -155,7 +154,6 @@ func NewDaemon(c *check.C) *Daemon {
155 155 
 		folder:        daemonFolder,
156 156 
 		root:          daemonRoot,
157 157 
 		storageDriver: os.Getenv("DOCKER_GRAPHDRIVER"),
158 
-		execDriver:    os.Getenv("DOCKER_EXECDRIVER"),
159 158 
 		userlandProxy: userlandProxy,
160 159 
 	}
161 160 
 }