github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-04 02:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #349 from weaveworks/67-rm

Browse Source 
Rm temporary containers.
This commit is contained in:
Tom Wilkie
2015-08-12 14:56:44 +01:00
parent 106d16677f e2a4bc9796
commit 8a7080c8d4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scope
View File

@@ -94,7 +94,7 @@ weave_dns_add() {
}
weave_dns_present() {
return $(docker run gliderlabs/alpine nc -z $DOCKER_BRIDGE_IP 53; echo $?)
return $(docker run --rm gliderlabs/alpine nc -z $DOCKER_BRIDGE_IP 53; echo $?)
}
set_docker_bridge_ip() {
@@ -164,7 +164,7 @@ case "$COMMAND" in
-v /var/run/docker.sock:/var/run/docker.sock \
$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")
IP_ADDRS=$(docker run --rm --net=host gliderlabs/alpine /bin/sh -c "$IP_ADDR_CMD")
if command_exists weave && is_running $WEAVE_CONTAINER_NAME && weave_dns_present; then
if [ -z "$IP_ADDRS" ]; then
echo "Could not determine local IP address; Weave DNS integration will not work correctly."