8000 Use docker stop instead of docker kill by bboreham · Pull Request #512 · weaveworks/weave · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Use docker stop instead of docker kill #512

Merged
merged 1 commit into from
Apr 1, 2015
Merged

Use docker stop instead of docker kill #512

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions weave
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,23 +759,23 @@ 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
conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true
;;
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
Expand Down
0