reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #173 from rade/141_dns_without_icc

Browse Source 
LGTM.  Closes #141
This commit is contained in:
Bryan Boreham committed 2014-11-11 10:50:56 +00:00
2 parents 34022ce2fc 2fb79da625
commit 30143d4d6c
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
weave
+2 -2
View File
@@ -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 -v /var/run/docker.sock:/var/run/docker.sock $DNS_IMAGE "$@" | tail -n 1)
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)
with_container_netns $CONTAINER attach $CIDR >/dev/null
echo $CONTAINER
;;
@@ -396,7 +396,7 @@ case "$COMMAND" in
CIDR=$1
shift 1
create_bridge
DNS_ARG=$(docker inspect --format '--dns {{ .NetworkSettings.IPAddress }}' $DNS_CONTAINER_NAME 2>/dev/null) || true
DNS_ARG=$(docker inspect --format '--dns {{ .NetworkSettings.IPAddress }}'" --link $DNS_CONTAINER_NAME:$DNS_CONTAINER_NAME" $DNS_CONTAINER_NAME 2>/dev/null) || true
CONTAINER=$(docker run $DNS_ARG -d "$@" | tail -n 1)
with_container_netns $CONTAINER attach $CIDR >/dev/null
tell_dns PUT $CONTAINER $CIDR