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

remove weavedns container on weave reset

Browse Source 
(and some cosmetics)

Fixes #171
This commit is contained in:
Matthias Radestock committed 2014-11-06 22:38:07 +00:00
1 parent 66ac78ccc0
commit 2fd9b91fc1
1 file changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files
weave
+5 -3
View File
@@ -452,14 +452,16 @@ case "$COMMAND" in
echo "Weave is not running."
fi
docker rm -f $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
check_command_and_run conntrack conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true
;;
reset)
[ $# -eq 0 ] || usage
docker kill $CONTAINER_NAME >/dev/null 2>&1 || true
docker rm -f $CONTAINER_NAME >/dev/null 2>&1 || true
docker kill $CONTAINER_NAME >/dev/null 2>&1 || true
docker kill $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
check_command_and_run conntrack conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true
destroy_bridge
for LOCAL_IFNAME in $(ip link show | grep v${CONTAINER_IFNAME}pl | cut -d ' ' -f 2 | tr -d ':') ; do