Removing confusing variable from getDNSDomain, just return "" when disabled

proxy/create_container_interceptor.go

@@ -61,7 +61,7 @@ func (i *createContainerInterceptor) InterceptRequest(r *http.Request) error {
 			}
 		}
 		hostname = i.proxy.hostnameMatchRegexp.ReplaceAllString(hostname, i.proxy.HostnameReplacement)
-		if dnsDomain, withDNS := i.proxy.getDNSDomain(); withDNS {
+		if dnsDomain := i.proxy.getDNSDomain(); dnsDomain != "" {
 			i.setHostname(&container, hostname, dnsDomain)
 			if err := i.proxy.setWeaveDNS(container.HostConfig, container.Hostname, dnsDomain); err != nil {
 				return err

proxy/proxy.go

@@ -395,13 +395,15 @@ func (proxy *Proxy) setWeaveDNS(hostConfig *docker.HostConfig, hostname, dnsDoma
 	return nil
 }
 
-func (proxy *Proxy) getDNSDomain() (domain string, running bool) {
+func (proxy *Proxy) getDNSDomain() (domain string) {
 	if proxy.WithoutDNS {
-		return "", false
+		return ""
+	}
+
+	if proxy.WithDNS {
+		domain = nameserver.DefaultDomain
 	}
 
-	domain = nameserver.DefaultDomain
-	running = proxy.WithDNS
 	weaveContainer, err := proxy.client.InspectContainer("weave")
 	if err != nil ||
 		weaveContainer.NetworkSettings == nil ||
@@ -421,5 +423,5 @@ func (proxy *Proxy) getDNSDomain() (domain string, running bool) {
 		return
 	}
 
-	return string(b), true
+	return string(b)
 }

proxy/start_container_interceptor.go

@@ -29,7 +29,7 @@ func (i *startContainerInterceptor) InterceptRequest(r *http.Request) error {
 	}
 
 	i.proxy.addWeaveWaitVolume(hostConfig)
-	if dnsDomain, withDNS := i.proxy.getDNSDomain(); withDNS {
+	if dnsDomain := i.proxy.getDNSDomain(); dnsDomain != "" {
 		if err := i.proxy.setWeaveDNS(hostConfig, container.Config.Hostname, dnsDomain); err != nil {
 			return err
 		}