From ad42f27e03bd25ce0d731ecfdc942175f5f33caa Mon Sep 17 00:00:00 2001 From: Konstantin Suvorov Date: Wed, 23 Mar 2016 16:20:06 +0300 Subject: [PATCH] Support custom docker args for weave-plugin WEAVEPLUGIN_DOCKER_ARGS environment variable is used to pass custom args when creating plugin container --- weave | 2 ++ 1 file changed, 2 insertions(+) diff --git a/weave b/weave index dff6fde4..8fe5c13c 100755 --- a/weave +++ b/weave @@ -151,6 +151,7 @@ exec_remote() { -e WEAVE_DEBUG \ -e WEAVE_DOCKER_ARGS \ -e WEAVEPROXY_DOCKER_ARGS \ + -e WEAVEPLUGIN_DOCKER_ARGS \ -e WEAVE_PASSWORD \ -e WEAVE_PORT \ -e WEAVE_HTTP_ADDR \ @@ -1742,6 +1743,7 @@ launch_plugin_if_not_running() { --restart=always \ -v /run/docker/plugins:/run/docker/plugins \ -e WEAVE_HTTP_ADDR \ + $WEAVEPLUGIN_DOCKER_ARGS \ $PLUGIN_IMAGE "$@" wait_for_status $PLUGIN_CONTAINER_NAME http_call_unix $PLUGIN_CONTAINER_NAME status.sock util_op create-plugin-network weave weavemesh