kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #17816 from coolljt0725/remove_execdriver_env

Browse source 
Remove DOCKER_EXECDRIVER env
This commit is contained in:
Vincent Demeester 2015-11-09 19:59:18 +01:00
commit e509fe604c
4 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -7,7 +7,6 @@ DOCKER_ENVS := \
-e BUILDFLAGS \ -e BUILDFLAGS \
-e DOCKER_CLIENTONLY \ -e DOCKER_CLIENTONLY \
-e DOCKER_DEBUG \ -e DOCKER_DEBUG \
-e DOCKER_EXECDRIVER \
-e DOCKER_EXPERIMENTAL \ -e DOCKER_EXPERIMENTAL \
-e DOCKER_REMAP_ROOT \ -e DOCKER_REMAP_ROOT \
-e DOCKER_GRAPHDRIVER \ -e DOCKER_GRAPHDRIVER \

1
docs/Makefile
View file

@ -6,7 +6,6 @@
DOCKER_ENVS := \ DOCKER_ENVS := \
-e BUILDFLAGS \ -e BUILDFLAGS \
-e DOCKER_CLIENTONLY \ -e DOCKER_CLIENTONLY \
-e DOCKER_EXECDRIVER \
-e DOCKER_GRAPHDRIVER \ -e DOCKER_GRAPHDRIVER \
-e TESTDIRS \ -e TESTDIRS \
-e TESTFLAGS \ -e TESTFLAGS \

1
hack/make.sh
View file

@ -212,7 +212,6 @@ test_env() {
# use "env -i" to tightly control the environment variables that bleed into the tests # use "env -i" to tightly control the environment variables that bleed into the tests
env -i \ env -i \
DEST="$DEST" \ DEST="$DEST" \
DOCKER_EXECDRIVER="$DOCKER_EXECDRIVER" \
DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \ DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \
DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \ DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \
DOCKER_HOST="$DOCKER_HOST" \ DOCKER_HOST="$DOCKER_HOST" \

2
integration-cli/docker_utils.go
View file

@ -113,7 +113,6 @@ type Daemon struct {
stdout, stderr io.ReadCloser stdout, stderr io.ReadCloser
cmd *exec.Cmd cmd *exec.Cmd
storageDriver string storageDriver string
execDriver string
wait chan error wait chan error
userlandProxy bool userlandProxy bool
useDefaultHost bool useDefaultHost bool
@ -155,7 +154,6 @@ func NewDaemon(c *check.C) *Daemon {
folder: daemonFolder, folder: daemonFolder,
root: daemonRoot, root: daemonRoot,
storageDriver: os.Getenv("DOCKER_GRAPHDRIVER"), storageDriver: os.Getenv("DOCKER_GRAPHDRIVER"),
execDriver: os.Getenv("DOCKER_EXECDRIVER"),
userlandProxy: userlandProxy, userlandProxy: userlandProxy,
} }
} }