Merge pull request #931 from paulbellamy/weavedns_default_search_domain

[dns] resolve names in `weave.local` by default unless hostname or search path is specified

proxy/create_container_interceptor.go

@@ -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
 }