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

Merge pull request #1783 from weaveworks/1777-do-not-bitch-on-stop

Browse Source 
Don't complain when stopping Scope if it wasn't running
This commit is contained in:
Alfonso Acosta
2016-08-11 16:57:05 +01:00
committed by GitHub
parent 1d4904d56f 0a1232ec3c
commit 04349cc86d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scope
View File

@@ -239,12 +239,12 @@ EOF
stop)
[ $# -eq 0 ] || usage
if ! docker stop $SCOPE_CONTAINER_NAME >/dev/null 2>&1 ; then
echo "Weave Scope is not running." >&2
if docker inspect $SCOPE_CONTAINER_NAME >/dev/null 2>&1 ; then
docker stop $SCOPE_CONTAINER_NAME >/dev/null
fi
if check_docker_for_mac ; then
if ! docker stop $SCOPE_APP_CONTAINER_NAME >/dev/null 2>&1 ; then
echo "Weave Scope app is not running." >&2
if docker inspect $SCOPE_APP_CONTAINER_NAME >/dev/null 2>&1 ; then
docker stop $SCOPE_CONTAINER_NAME >/dev/null
fi
fi
;;