diff --git a/weave b/weave index e773009e..3209cdd0 100755 --- a/weave +++ b/weave @@ -439,7 +439,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 ${PASSWORD:+-e WEAVE_PASSWORD="$PASSWORD"} ${PASSWORDFILE:+--env-file="$PASSWORDFILE"} $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR "$@") + CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME -p $PORT:$PORT/tcp -p $PORT:$PORT/udp ${PASSWORD:+-e WEAVE_PASSWORD="$PASSWORD"} ${PASSWORDFILE:+--env-file="$PASSWORDFILE"} $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR -iface $CONTAINER_IFNAME "$@") with_container_netns $CONTAINER launch >/dev/null echo $CONTAINER ;; @@ -450,7 +450,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 995b669d..a096586b 100644 --- a/weavedns/Dockerfile +++ b/weavedns/Dockerfile @@ -3,4 +3,4 @@ MAINTAINER Weaveworks Inc 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 523d2fb7..38c18b91 100644 --- a/weaver/Dockerfile +++ b/weaver/Dockerfile @@ -2,4 +2,4 @@ FROM scratch MAINTAINER Weaveworks Inc WORKDIR /home/weave ADD ./weaver /home/weave/ -ENTRYPOINT ["/home/weave/weaver", "-iface", "ethwe", "-wait", "5"] +ENTRYPOINT ["/home/weave/weaver", "-wait", "5"]