From 292a50a891cdcea786ef728d90012a690f5881d9 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 15 May 2017 14:53:45 +0000 Subject: [PATCH] Don't check if the plugin is enabled before trying to remove the default 'weave network' If the plugin wasn't enabled then that network shouldn't exist. If the network 'weave' doesn't exist then util_op remove-plugin-network will do nothing. If it does exist for some reason then docker will pause for a while and remove it anyway. --- weave | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weave b/weave index 39382bfd..8a6b23c8 100755 --- a/weave +++ b/weave @@ -1303,7 +1303,7 @@ launch() { } stop() { - ! is_plugin_v1_enabled || util_op remove-plugin-network weave || true + util_op remove-plugin-network weave || true warn_if_stopping_proxy_in_env docker stop $CONTAINER_NAME >/dev/null 2>&1 || echo "Weave is not running." >&2 # In case user has upgraded from