From 0c059b2f845c1cdd2a07a8e09c0b6120f57f251c Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 27 May 2015 12:02:40 +0000 Subject: [PATCH] Don't do the hostproc dance, use --pid=host --- docker/run-probe | 2 +- scope | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/run-probe b/docker/run-probe index 23251387a0..fc9ec1bbbb 100755 --- 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 index 83644ca43a..4333be4c9e 100755 --- 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 "$@")