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.
This commit is contained in:
Matthias Radestock committed 2015-05-07 09:27:22 +01:00
1 parent 63829a07c5
commit 04ceb5620b
1 file changed
+2 -2
+2 -2
View File
@@ -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() {