From 216a0fe4fc48249483a5183ff75184b7f5e9f222 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 7 Jan 2016 14:29:51 +0000 Subject: [PATCH] refactor: WEAVE_CIDR=none is redundant when --net=host --- weave | 2 -- 1 file changed, 2 deletions(-) diff --git a/weave b/weave index 7de34242..f70ec5fa 100755 --- a/weave +++ b/weave @@ -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 \