From 1dc28e9025a021ef3c8ba1d43a4d08022b21b86a Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Mon, 22 Dec 2014 15:59:29 +0800
Subject: [PATCH] Assign iface parameter from defined variable.

---
 weave               | 4 ++--
 weavedns/Dockerfile | 2 +-
 weaver/Dockerfile   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/weave b/weave
index 7e0f1d56..f4c2a7ce 100755
--- a/weave
+++ b/weave
@@ -430,7 +430,7 @@ case "$COMMAND" in
         # Set WEAVE_DOCKER_ARGS in the environment in order to supply
         # additional parameters, such as resource limits, to docker
         # when launching the weave container.
-        CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME -p $PORT:$PORT/tcp -p $PORT:$PORT/udp $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR "$@")
+        CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME -p $PORT:$PORT/tcp -p $PORT:$PORT/udp $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR -iface $CONTAINER_IFNAME "$@")
         with_container_netns $CONTAINER launch >/dev/null
         echo $CONTAINER
         ;;
@@ -441,7 +441,7 @@ case "$COMMAND" in
         check_not_running $DNS_CONTAINER_NAME $DNS_IMAGE
         create_bridge
         docker_bridge_ip
-        DNS_CONTAINER=$(docker run --privileged -d --name=$DNS_CONTAINER_NAME -p $DOCKER_BRIDGE_IP:53:53/udp -v /var/run/docker.sock:/var/run/docker.sock $DNS_IMAGE "$@")
+        DNS_CONTAINER=$(docker run --privileged -d --name=$DNS_CONTAINER_NAME -p $DOCKER_BRIDGE_IP:53:53/udp -v /var/run/docker.sock:/var/run/docker.sock $DNS_IMAGE -iface $CONTAINER_IFNAME "$@")
         with_container_netns $DNS_CONTAINER attach $CIDR >/dev/null
         populate_dns
         echo $DNS_CONTAINER
diff --git a/weavedns/Dockerfile b/weavedns/Dockerfile
index e2b55499..a2e5b516 100644
--- a/weavedns/Dockerfile
+++ b/weavedns/Dockerfile
@@ -2,4 +2,4 @@ FROM scratch
 WORKDIR /home/weave
 ADD ./weavedns /home/weave/
 EXPOSE 53/udp
-ENTRYPOINT ["/home/weave/weavedns", "-wait", "5", "-iface", "ethwe"]
+ENTRYPOINT ["/home/weave/weavedns", "-wait", "5"]
diff --git a/weaver/Dockerfile b/weaver/Dockerfile
index 9baf50bb..4fb0d508 100644
--- a/weaver/Dockerfile
+++ b/weaver/Dockerfile
@@ -3,4 +3,4 @@ MAINTAINER Zettio weave@zett.io
 WORKDIR /home/weave
 ADD ./weaver /home/weave/
 CMD []
-ENTRYPOINT ["/home/weave/weaver", "-iface", "ethwe", "-wait", "5"]
+ENTRYPOINT ["/home/weave/weaver", "-wait", "5"]