review feedback

This commit is contained in:
Paul Bellamy committed 2015-09-22 15:09:32 +01:00
1 parent 74c3b0d079
commit 3e4d8a3ffe
5 files changed
+29 -17

No files matched your search

+4
View File
@@ -396,6 +396,10 @@ func (proxy *Proxy) setWeaveDNS(hostConfig *docker.HostConfig, hostname, dnsDoma
}
func (proxy *Proxy) getDNSDomain() (domain string, running bool) {
if proxy.WithoutDNS {
return "", false
}
domain = nameserver.DefaultDomain
running = proxy.WithDNS
weaveContainer, err := proxy.client.InspectContainer("weave")