refactor: WEAVE_CIDR=none is redundant when --net=host

This commit is contained in:
Matthias Radestock committed 2016-01-07 14:29:51 +00:00
1 parent 80770d39e5
commit 216a0fe4fc
1 file changed
-2
-2
View File
@@ -124,7 +124,6 @@ exec_remote() {
-e DOCKER_CLIENT_HOST="$DOCKER_CLIENT_HOST" \
-e DOCKER_CLIENT_ARGS \
-e PROXY_HOST="$PROXY_HOST" \
-e WEAVE_CIDR=none \
-e COVERAGE \
$WEAVEEXEC_DOCKER_ARGS $EXEC_IMAGE --local "$@"
}
@@ -1676,7 +1675,6 @@ launch_proxy() {
-v /var/run/weave:/var/run/weave \
-v /proc:/hostproc \
-e PROCFS=/hostproc \
-e WEAVE_CIDR=none \
-e DOCKER_BRIDGE \
-e WEAVE_DEBUG \
-e COVERAGE \