kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1494 from aboch/sipt

Browse source 
Do not update hosts file with internal networks endpoint IP
This commit is contained in:
Jana Radhakrishnan 2016-10-26 13:00:22 -07:00 • committed by GitHub
commit fd70adfac5
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libnetwork/endpoint.go
View file

@ -469,12 +469,14 @@ func (ep *endpoint) sbJoin(sb *sandbox, options ...EndpointOption) error {
n.getController().watchSvcRecord(ep) n.getController().watchSvcRecord(ep)
} }
address := "" if doUpdateHostsFile(n, sb) {
if ip := ep.getFirstInterfaceAddress(); ip != nil { address := ""
address = ip.String() if ip := ep.getFirstInterfaceAddress(); ip != nil {
} address = ip.String()
if err = sb.updateHostsFile(address); err != nil { }
return err if err = sb.updateHostsFile(address); err != nil {
return err
}
} }
if err = sb.updateDNS(n.enableIPv6); err != nil { if err = sb.updateDNS(n.enableIPv6); err != nil {
return err return err
@ -556,6 +558,10 @@ func (ep *endpoint) sbJoin(sb *sandbox, options ...EndpointOption) error {
return nil return nil
} }
func doUpdateHostsFile(n *network, sb *sandbox) bool {
return !n.ingress && n.Name() != libnGWNetwork
}
func (ep *endpoint) rename(name string) error { func (ep *endpoint) rename(name string) error {
var err error var err error
n := ep.getNetwork() n := ep.getNetwork()