use weavedns search-domain by default

iff no hostname/dns-search specified
This commit is contained in:
Paul Bellamy committed 2015-06-16 15:13:19 +01:00
1 parent 8b5d0e3fbd
commit 2c3baa9119
4 files changed
+70 -12

No files matched your search

+8 -4
View File
@@ -92,10 +92,6 @@ func (i *createContainerInterceptor) setWeaveDNS(container *createContainerReque
container.HostConfig.DNS = append(container.HostConfig.DNS, i.proxy.dockerBridgeIP)
if len(container.HostConfig.DNSSearch) == 0 {
container.HostConfig.DNSSearch = []string{"."}
}
name := r.URL.Query().Get("name")
if container.Hostname == "" && name != "" {
container.Hostname = name
@@ -103,6 +99,14 @@ func (i *createContainerInterceptor) setWeaveDNS(container *createContainerReque
container.Domainname = strings.TrimSuffix(dnsDomain, ".")
}
if len(container.HostConfig.DNSSearch) == 0 {
if container.Hostname == "" {
container.HostConfig.DNSSearch = []string{dnsDomain}
} else {
container.HostConfig.DNSSearch = []string{"."}
}
}
return nil
}