Merge pull request #621 from errordeveloper/fix-binding-hostproc-within-container-where-is-already-bound

Should not pass value of `$PROCFS`

Fixes #622.
This commit is contained in:
rade committed 2015-04-30 14:06:19 +01:00
commit 87f47a60ae
1 file changed
+2 -2
+2 -2
View File
@@ -14,7 +14,6 @@ IMAGE_VERSION=${VERSION:-$IMAGE_VERSION}
DOCKERHUB_USER=weaveworks
BASE_EXEC_IMAGE=$DOCKERHUB_USER/weaveexec
EXEC_IMAGE=$BASE_EXEC_IMAGE:$IMAGE_VERSION
PROCFS=${PROCFS:-/proc}
usage() {
echo "Usage:"
@@ -44,7 +43,7 @@ usage() {
exec_remote() {
docker run --rm --privileged --net=host \
-v /var/run/docker.sock:/var/run/docker.sock \
-v "$PROCFS":/hostproc \
-v /proc:/hostproc \
-e PROCFS=/hostproc \
-e VERSION \
-e WEAVE_DOCKER_ARGS \
@@ -124,6 +123,7 @@ BASE_DNS_IMAGE=$DOCKERHUB_USER/weavedns
IMAGE=$BASE_IMAGE:$IMAGE_VERSION
DNS_IMAGE=$BASE_DNS_IMAGE:$IMAGE_VERSION
PROCFS=${PROCFS:-/proc}
DOCKER_BRIDGE=${DOCKER_BRIDGE:-docker0}
CONTAINER_NAME=${WEAVE_CONTAINER_NAME:-weave}
DNS_CONTAINER_NAME=weavedns