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

Merge pull request #1819 from weaveworks/1818-dont-launch-when-plugin-running

Browse Source 
don't launch anything when plugin is running; fixes #1818 . LGTM.
This commit is contained in:
Bryan Boreham committed 2015-12-22 12:55:57 +00:00
2 parents b40b78ece0 3ade796e8d
commit abf1db0045
1 file changed
+4 -6
Download Patch File Download Diff File Expand all files Collapse all files
weave
+4 -6
View File
@@ -1843,15 +1843,13 @@ EOF
;;
launch)
deprecation_warnings "$@"
check_not_running $CONTAINER_NAME $BASE_IMAGE
check_not_running $PROXY_CONTAINER_NAME $BASE_EXEC_IMAGE
check_not_running $CONTAINER_NAME $BASE_IMAGE
check_not_running $PROXY_CONTAINER_NAME $BASE_EXEC_IMAGE
check_not_running $PLUGIN_CONTAINER_NAME $BASE_PLUGIN_IMAGE
COMMON_ARGS=$(common_launch_args "$@")
launch_router "$@"
launch_proxy $COMMON_ARGS
if [ -z $WEAVE_NO_PLUGIN ] && check_docker_server_api_version 1.21 ; then
check_not_running $PLUGIN_CONTAINER_NAME $BASE_PLUGIN_IMAGE
launch_plugin $COMMON_ARGS
fi
[ -z $WEAVE_NO_PLUGIN ] && check_docker_server_api_version 1.21 && launch_plugin $COMMON_ARGS
;;
launch-router)
deprecation_warnings "$@"