Move --probe.docker=true to scope script

weaveworks · Jul 16, 2015 · 32f7b22 · 32f7b22
1 parent 6e4495b
commit 32f7b22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -9,7 +9,7 @@ usage() {
 # as docker doesn't allow it when started with --net=host
 
 APP_ARGS=""
-PROBE_ARGS="-docker"
+PROBE_ARGS=""
 
 while true; do
     case "$1" in

diff --git a/scope b/scope
@@ -90,7 +90,7 @@ weave_dns_add() {
     CONTAINER_FQDN="$2"
     shift 2
 
-	for ip in $*; do
+    for ip in $*; do
         weave dns-add $ip $CONTAINER_ID -h $CONTAINER_FQDN
     done
 }
@@ -160,7 +160,7 @@ case "$COMMAND" in
 
         CONTAINER=$(docker run --privileged -d --name=$SCOPE_CONTAINER_NAME --net=host --pid=host \
             -v /var/run/docker.sock:/var/run/docker.sock \
-            $WEAVESCOPE_DOCKER_ARGS $SCOPE_IMAGE $WEAVESCOPE_DNS_ARGS "$@")
+            $WEAVESCOPE_DOCKER_ARGS $SCOPE_IMAGE $WEAVESCOPE_DNS_ARGS --probe.docker true "$@")
 
         IP_ADDRS=$(docker run --net=host gliderlabs/alpine /bin/sh -c "$IP_ADDR_CMD")
         if is_running $DNS_CONTAINER_NAME && is_running $WEAVE_CONTAINER_NAME && command_exists weave; then