Merge pull request #1951 from weaveworks/issues/1940-remove-proxy-dockerbridgeip-dep

Use netlink instead of shelling out to `weave docker-bridge-ip`
This commit is contained in:
Bryan Boreham committed 2016-02-08 11:05:10 +00:00
commit ed3c50f43e
3 files changed
+20 -21

No files matched your search

-1
View File
@@ -36,7 +36,6 @@ func callWeave(args ...string) ([]byte, []byte, error) {
}
}
propagateEnv("DOCKER_BRIDGE")
propagateEnv("DOCKER_HOST")
// Propagate WEAVE_DEBUG, to make debugging easier.
+7 -3
View File
@@ -62,6 +62,7 @@ type Config struct {
Version string
WithoutDNS bool
NoMulticastRoute bool
DockerBridge string
DockerHost string
ProcPath string
}
@@ -152,11 +153,14 @@ func NewProxy(c Config) (*Proxy, error) {
p.client = client.Client
if !p.WithoutDNS {
dockerBridgeIP, stderr, err := callWeave("docker-bridge-ip")
netDevs, err := GetBridgeNetDev(c.ProcPath, c.DockerBridge)
if err != nil {
return nil, fmt.Errorf(string(stderr))
return nil, err
}
p.dockerBridgeIP = string(dockerBridgeIP)
if len(netDevs) != 1 || len(netDevs[0].CIDRs) != 1 {
return nil, fmt.Errorf("Could not obtain address of %s", c.DockerBridge)
}
p.dockerBridgeIP = netDevs[0].CIDRs[0].IP.String()
}
p.hostnameMatchRegexp, err = regexp.Compile(c.HostnameMatch)