From 6860d02a1afc5d5f6eefd30c8ff422c311b1a633 Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Tue, 18 Aug 2015 09:40:49 +0100
Subject: [PATCH] Use port or dns container to check for weavedns

Due to: https://github.com/weaveworks/weave/pull/1319
---
 scope | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scope b/scope
index 52ffba426..19a7cc8ab 100755
--- a/scope
+++ b/scope
@@ -21,6 +21,7 @@ IMAGE_VERSION=${VERSION:-$IMAGE_VERSION}
 SCOPE_IMAGE=weaveworks/scope:$IMAGE_VERSION
 SCOPE_CONTAINER_NAME=weavescope
 WEAVE_CONTAINER_NAME=weave
+WEAVEDNS_CONTAINER_NAME=weavedns
 HOSTNAME=scope
 DOMAINNAME=weave.local
 FQDN=$HOSTNAME.$DOMAINNAME
@@ -94,7 +95,7 @@ weave_dns_add() {
 }
 
 weave_dns_present() {
-    return $(docker run --rm gliderlabs/alpine nc -z $DOCKER_BRIDGE_IP 53; echo $?)
+    docker run --rm gliderlabs/alpine nc -z $DOCKER_BRIDGE_IP 53 || is_running $WEAVEDNS_CONTAINER_NAME
 }
 
 set_docker_bridge_ip() {