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

Don't do the hostproc dance, use --pid=host
This commit is contained in:
Tom Wilkie
2015-05-27 13:52:14 +01:00
2 changed files with 2 additions and 3 deletions

View File

@@ -1,3 +1,3 @@
#!/bin/sh
exec /home/weave/probe -proc.root=/hostproc
exec /home/weave/probe

3
scope
View File

@@ -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 "$@")