Allow docker0 to have >1 IP address

and log the one we end up using
This commit is contained in:
Bryan Boreham committed 2016-12-09 15:22:49 +00:00
1 parent fcda8985fb
commit c03a2caac2
1 file changed
+2 -1
+2 -1
View File
@@ -152,10 +152,11 @@ func NewProxy(c Config) (*Proxy, error) {
if err != nil {
return nil, err
}
if len(netDev.CIDRs) != 1 {
if len(netDev.CIDRs) < 1 {
return nil, fmt.Errorf("Could not obtain address of %s", c.DockerBridge)
}
p.dockerBridgeIP = netDev.CIDRs[0].IP.String()
Log.Infof("Using docker bridge IP for DNS: %v", p.dockerBridgeIP)
}
p.hostnameMatchRegexp, err = regexp.Compile(c.HostnameMatch)