refactor(ish): bail early if weaveDNS is disabled

This commit is contained in:
Matthias Radestock committed 2016-03-28 14:10:31 +01:00
1 parent 648632d5ac
commit 8472272afe
1 file changed
+2 -2
+2 -2
View File
@@ -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%.}"