github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 01:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use port or dns container to check for weavedns

Browse Source 
Due to: https://github.com/weaveworks/weave/pull/1319
This commit is contained in:
Paul Bellamy
2015-08-18 09:40:49 +01:00
parent a1b0088bf3
commit 6860d02a1a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scope
View File

@@ -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() {