From a34e214201cb88dd11875242eb23b6e0f8302344 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 11 Nov 2014 12:52:17 +0000 Subject: [PATCH] expose DNS port via Dockerfile rather than 'docker run' argument That is "the Docker way". Related to #141. --- weave | 2 +- weavedns/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/weave b/weave index 37814a15..c602e51d 100755 --- a/weave +++ b/weave @@ -358,7 +358,7 @@ case "$COMMAND" in shift 1 check_not_running $DNS_CONTAINER_NAME $DNS_IMAGE create_bridge - CONTAINER=$(docker run --privileged -d --name=$DNS_CONTAINER_NAME --expose=53/udp -v /var/run/docker.sock:/var/run/docker.sock $DNS_IMAGE "$@" | tail -n 1) + CONTAINER=$(docker run --privileged -d --name=$DNS_CONTAINER_NAME -v /var/run/docker.sock:/var/run/docker.sock $DNS_IMAGE "$@" | tail -n 1) with_container_netns $CONTAINER attach $CIDR >/dev/null echo $CONTAINER ;; diff --git a/weavedns/Dockerfile b/weavedns/Dockerfile index cb93e00c..e2b55499 100644 --- a/weavedns/Dockerfile +++ b/weavedns/Dockerfile @@ -1,5 +1,5 @@ FROM scratch -# EXPOSE 53/udp WORKDIR /home/weave ADD ./weavedns /home/weave/ +EXPOSE 53/udp ENTRYPOINT ["/home/weave/weavedns", "-wait", "5", "-iface", "ethwe"]