Merge pull request #122 from tomwilkie/112-pid-host

Don't do the hostproc dance, use --pid=host
weaveworks · May 27, 2015 · 2743013 · 2743013
2 parents 8ca5fd6 + 0c059b2
commit 2743013
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/docker/run-probe b/docker/run-probe
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /home/weave/probe -proc.root=/hostproc
+exec /home/weave/probe
diff --git a/scope b/scope
@@ -128,8 +128,7 @@ case "$COMMAND" in
 			WEAVESCOPE_DNS_ARGS="--dns $DOCKER_BRIDGE_IP --searchpath $DOMAINNAME"
 		fi
 
-		CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME --net=host \
-			-v /proc:/hostproc \
+		CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME --net=host --pid=host \
 			-v /var/run/docker.sock:/var/run/docker.sock \
 			$WEAVESCOPE_DOCKER_ARGS $SCOPE_IMAGE $WEAVESCOPE_DNS_ARGS "$@")