From 019eeab896613d09639a7b90fef0768babeeaa49 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Tue, 10 Feb 2015 16:26:49 -0800
Subject: [PATCH] Pass environment variables to remote invocations

---
 weave | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/weave b/weave
index ba2347fb..ee6bff5f 100755
--- a/weave
+++ b/weave
@@ -53,7 +53,11 @@ TOOLS_IMAGE=$BASE_TOOLS_IMAGE:$IMAGE_VERSION
 exec_remote() {
     docker run -t --rm \
         -v /var/run/docker.sock:/var/run/docker.sock \
-        -v /proc:/hostproc \
+        -v "$PROCFS":/hostproc \
+        -e VERSION="$VERSION" \
+        -e WEAVE_DOCKER_ARGS="$WEAVE_DOCKER_ARGS" \
+        -e WEAVE_PASSWORD="$WEAVE_PASSWORD" \
+        -e DOCKER_BRIDGE="$DOCKER_BRIDGE" \
         -e PROCFS=/hostproc --privileged --net=host \
         $BASE_TOOLS_IMAGE --local "$@"
 }
@@ -78,8 +82,6 @@ MTU=65535
 PORT=6783
 HTTP_PORT=6784
 DNS_HTTP_PORT=6785
-DOCKER_BRIDGE=${DOCKER_BRIDGE:-docker0}
-PROCFS=${PROCFS:-/proc}
 
 COMMAND=$1