p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26211 from aaronlehmann/no-advertise-addr-detection-on-join

Browse Source 
cluster: Do not autodetect advertise address on join
Upstream-commit: beba6ea311fdff128ac2f1de78138c5da71d0f23
Component: engine
This commit is contained in:
Tõnis Tiigi
2016-08-31 17:19:23 -07:00
committed by GitHub
parent d6cc83cde2 b88197c265
commit 436151d741
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/engine/daemon/cluster/cluster.go
View File

@ -467,11 +467,13 @@ func (c *Cluster) Join(req types.JoinRequest) error {
}
var advertiseAddr string
advertiseHost, advertisePort, err := c.resolveAdvertiseAddr(req.AdvertiseAddr, listenPort)
// For joining, we don't need to provide an advertise address,
// since the remote side can detect it.
if err == nil {
advertiseAddr = net.JoinHostPort(advertiseHost, advertisePort)
if req.AdvertiseAddr != "" {
advertiseHost, advertisePort, err := c.resolveAdvertiseAddr(req.AdvertiseAddr, listenPort)
// For joining, we don't need to provide an advertise address,
// since the remote side can detect it.
if err == nil {
advertiseAddr = net.JoinHostPort(advertiseHost, advertisePort)
}
}
// todo: check current state existing