From 05b71622393526da2575b426f27337dc1f4a6ad2 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 1 Apr 2015 16:58:16 +0100 Subject: [PATCH] Use docker stop instead of docker kill --- weave | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/weave b/weave index 264c1bc6..003635a2 100755 --- a/weave +++ b/weave @@ -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