mirror of
https://github.com/weaveworks/scope.git
synced 2026-03-03 18:20:27 +00:00
Merge pull request #122 from tomwilkie/112-pid-host
Don't do the hostproc dance, use --pid=host
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
exec /home/weave/probe -proc.root=/hostproc
|
||||
exec /home/weave/probe
|
||||
|
||||
3
scope
3
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 "$@")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user