From 04ceb5620b1d11360aaf765aa7ecded949e9e650 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 7 May 2015 09:27:22 +0100 Subject: [PATCH] allow user to supply args to docker for remote execution DOCKER_CLIENT_ARGS - for args to docker WEAVEEXEC_DOCKER_ARGS - for extra args to `docker run` Closes #626. --- weave | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weave b/weave index c03426aa..09a0b9aa 100755 --- a/weave +++ b/weave @@ -43,7 +43,7 @@ usage() { } exec_remote() { - docker run --rm --privileged --net=host \ + docker $DOCKER_CLIENT_ARGS run --rm --privileged --net=host \ -v /var/run/docker.sock:/var/run/docker.sock \ -v /proc:/hostproc \ -e PROCFS=/hostproc \ @@ -55,7 +55,7 @@ exec_remote() { -e WEAVE_PORT \ -e WEAVE_CONTAINER_NAME \ -e DOCKER_BRIDGE \ - $EXEC_IMAGE --local "$@" + $WEAVEEXEC_DOCKER_ARGS $EXEC_IMAGE --local "$@" } check_docker_version() {