Remove --with-dns option from proxy

This commit is contained in:
Bryan Boreham committed 2015-12-12 14:12:39 +00:00
1 parent b51b1adfcd
commit 68d6c262d1
4 files changed
+1 -17

No files matched your search

-6
View File
@@ -18,7 +18,6 @@ import (
docker "github.com/fsouza/go-dockerclient"
. "github.com/weaveworks/weave/common"
weavedocker "github.com/weaveworks/weave/common/docker"
"github.com/weaveworks/weave/nameserver"
)
const (
@@ -58,7 +57,6 @@ type Config struct {
NoRewriteHosts bool
TLSConfig TLSConfig
Version string
WithDNS bool
WithoutDNS bool
}
@@ -501,10 +499,6 @@ func (proxy *Proxy) getDNSDomain() (domain string) {
return ""
}
if proxy.WithDNS {
domain = nameserver.DefaultDomain
}
weaveContainer, err := proxy.client.InspectContainer("weave")
var weaveIP string
if err == nil && weaveContainer.NetworkSettings != nil {