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

Replace two array with a map type, make it easier to understand.

Browse Source 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 1989b1b58cc8c416e430a1fd824626b259dab5f6
Component: engine
This commit is contained in:
Yanqiang Miao
2016-09-22 11:18:07 +08:00
parent ad119a9fca
commit 792dff1fb0
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/engine/daemon/container_operations.go
View File

@ -501,23 +501,20 @@ func (daemon *Daemon) allocateNetwork(container *container.Container) error {
}
}
var (
networks []string
epConfigs []*network.EndpointSettings
)
// the intermediate map is necessary because "connectToNetwork" modifies "container.NetworkSettings.Networks"
networks := make(map[string]*network.EndpointSettings)
for n, epConf := range container.NetworkSettings.Networks {
if n == defaultNetName {
continue
}
networks = append(networks, n)
epConfigs = append(epConfigs, epConf)
networks[n] = epConf
}
for i, epConf := range epConfigs {
for netName, epConf := range networks {
cleanOperationalData(epConf)
if err := daemon.connectToNetwork(container, networks[i], epConf.EndpointSettings, updateSettings); err != nil {
if err := daemon.connectToNetwork(container, netName, epConf.EndpointSettings, updateSettings); err != nil {
return err
}
}