reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #512 from bboreham/stop_not_kill

Browse Source 
Use docker stop instead of docker kill
This commit is contained in:
rade committed 2015-04-01 17:27:54 +01:00
2 parents a152d24892 05b7162239
commit e66225ca9b
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
weave
+4 -4
View File
@@ -759,7 +759,7 @@ case "$COMMAND" in
;;
stop)
[ $# -eq 0 ] || usage
if ! docker kill $CONTAINER_NAME >/dev/null 2>&1 ; then
if ! docker stop $CONTAINER_NAME >/dev/null 2>&1 ; then
echo "Weave is not running." >&2
fi
docker rm -f $CONTAINER_NAME >/dev/null 2>&1 || true
@@ -767,15 +767,15 @@ case "$COMMAND" in
;;
stop-dns)
[ $# -eq 0 ] || usage
if ! docker kill $DNS_CONTAINER_NAME >/dev/null 2>&1 ; then
if ! docker stop $DNS_CONTAINER_NAME >/dev/null 2>&1 ; then
echo "WeaveDNS is not running." >&2
fi
docker rm -f $DNS_CONTAINER_NAME >/dev/null 2>&1 || true
;;
reset)
[ $# -eq 0 ] || usage
docker kill $CONTAINER_NAME >/dev/null 2>&1 || true
docker kill $DNS_CONTAINER_NAME >/dev/null 2>&1 || true
docker stop $CONTAINER_NAME >/dev/null 2>&1 || true
docker stop $DNS_CONTAINER_NAME >/dev/null 2>&1 || true
docker rm -f $CONTAINER_NAME >/dev/null 2>&1 || true
docker rm -f $DNS_CONTAINER_NAME >/dev/null 2>&1 || true
conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true