From 8472272afebb427ecbef0c1f57941c4e0f645a51 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 28 Mar 2016 14:10:31 +0100
Subject: [PATCH] refactor(ish): bail early if weaveDNS is disabled

---
 weave | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index e1a352dc..84d5e819 100755
--- a/weave
+++ b/weave
@@ -1098,7 +1098,7 @@ dns_domain() {
 }
 
 dns_args() {
-    docker_bridge_ip
+    DOMAIN=$(dns_domain) || return 0
     NAME_ARG=""
     HOSTNAME_SPECIFIED=
     DNS_SEARCH_SPECIFIED=
@@ -1128,7 +1128,7 @@ dns_args() {
         shift
     done
     [ -n "$WITHOUT_DNS" ] && return 0
-    DOMAIN=$(dns_domain) || return 0
+    docker_bridge_ip
     DNS_ARGS="--dns $DOCKER_BRIDGE_IP"
     if [ -n "$NAME_ARG" -a -z "$HOSTNAME_SPECIFIED" ] ; then
         HOSTNAME="$NAME_ARG.${DOMAIN%.}"