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

weave --local launch* with V2 plugin on exits with error.

Browse Source 
For example:
```
$ docker ps
CONTAINER ID  IMAGE  COMMAND  CREATED  STATUS  PORTS  NAMES
$ docker plugin ls
ID            NAME                        DESCRIPTION                  ENABLED
e80beb4367a6  weaveworks/pluginv2:latest  Weave Net plugin for Docker  true
$ weave --local launch
weaveworks/pluginv2 is already running.
$ weave --local launch-proxy
weaveworks/pluginv2 is already running.
$ weave --local launch-router
weaveworks/pluginv2 is already running.
$ weave --local launch-plugin
```
This commit is contained in:
Marc CARRE authored and Bryan Boreham committed 2017-04-12 13:05:40 +00:00
1 parent d3d2de5f1f
commit 3031372442
1 file changed
+7
Download Patch File Download Diff File Expand all files Collapse all files
weave
+7
View File
@@ -1206,6 +1206,10 @@ check_running() {
fi
}
check_not_running_v2_plugin() {
is_docker_plugin_enabled "$1" && echo "$1 is already running." >&2 && return 1
}
# Docker Plugin V2
is_docker_plugin_enabled() {
[ "$(docker plugin inspect -f '{{ .Enabled }}' "$1" 2>/dev/null)" = "true" ]
@@ -1977,6 +1981,7 @@ EOF
deprecation_warnings "$@"
check_not_running router $CONTAINER_NAME $BASE_IMAGE
check_not_running proxy $PROXY_CONTAINER_NAME $BASE_EXEC_IMAGE
check_not_running_v2_plugin "$PLUGIN_V2_NAME"
COMMON_ARGS=$(common_launch_args "$@")
launch_router --plugin "$@"
launch_proxy $COMMON_ARGS
@@ -1984,6 +1989,7 @@ EOF
launch-router)
deprecation_warnings "$@"
check_not_running router $CONTAINER_NAME $BASE_IMAGE
check_not_running_v2_plugin "$PLUGIN_V2_NAME"
launch_router "$@"
echo $ROUTER_CONTAINER
;;
@@ -2001,6 +2007,7 @@ EOF
launch-proxy)
deprecation_warnings "$@"
check_not_running proxy $PROXY_CONTAINER_NAME $BASE_EXEC_IMAGE
check_not_running_v2_plugin "$PLUGIN_V2_NAME"
launch_proxy "$@"
echo $PROXY_CONTAINER
;;