From 284d78c6b2b04360c3566c7f4e94231961c900d3 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 19 Oct 2015 12:35:05 +0000 Subject: [PATCH] Update fetch_router_args in line with changes elsewhere --- weave | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weave b/weave index 609573bd..231a4d33 100755 --- a/weave +++ b/weave @@ -1476,9 +1476,9 @@ launch_router() { # Recreate the parameter values that are set when the router is first launched fetch_router_args() { - IPRANGE=$(docker inspect -f '{{.Args}}' $CONTAINER_NAME | grep -o -e '-ipalloc-range [^ ]*') - # This doesn't get back the right syntax, but it's enough for our purposes - DNS_PORT_MAPPING=$(docker inspect -f '{{with index .HostConfig.PortBindings "53/udp"}}{{.}}{{end}}' $CONTAINER_NAME) + CONTAINER_ARGS=$(docker inspect -f '{{.Args}}' $CONTAINER_NAME) + IPRANGE=$(echo $CONTAINER_ARGS | grep -o -e '-ipalloc-range [^ ]*') + NO_DNS_OPT=$(echo $CONTAINER_ARGS | grep -o -e '--no-dns') } attach_router() {