0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix link doesn't work sometimes when container start with multiple networks

Browse source 
If there is multiple networks to connect to on container starting,
the order of these networks is random because we "range a map". But
the defautl network "bridge" should be connected first since only
"bridge" support link and we should have do some settings on sandbox
creation, and only the first connect will setting the sandbox.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 57c0a653e3)
This commit is contained in:
Lei Jitang 2016-05-26 03:20:53 -04:00 • committed by Tibor Vass
parent aa123b73d1
commit c51fced060
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
daemon/container_operations.go
View file

@ -408,7 +408,21 @@ func (daemon *Daemon) allocateNetwork(container *container.Container) error {
updateSettings = true
}
// always connect default network first since only default
// network mode support link and we need do some setting
// on sanbox initialize for link, but the sandbox only be initialized
// on first network connecting.
defaultNetName := runconfig.DefaultDaemonNetworkMode().NetworkName()
if nConf, ok := container.NetworkSettings.Networks[defaultNetName]; ok {
if err := daemon.connectToNetwork(container, defaultNetName, nConf, updateSettings); err != nil {
return err
}
}
for n, nConf := range container.NetworkSettings.Networks {
if n == defaultNetName {
continue
}
if err := daemon.connectToNetwork(container, n, nConf, updateSettings); err != nil {
return err
}