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

fix #26890 avoid duplicate overlay drivers in info

Browse Source 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ea266f8f7ad74f671cc7595c17ea122a5593bec4
Component: engine
This commit is contained in:
allencloud
2016-09-25 19:30:52 +08:00
parent 7ccf7f0db3
commit 32c9e42dd1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/engine/daemon/network.go
View File

@ -357,12 +357,14 @@ func (daemon *Daemon) DisconnectContainerFromNetwork(containerName string, netwo
// GetNetworkDriverList returns the list of plugins drivers
// registered for network.
func (daemon *Daemon) GetNetworkDriverList() []string {
pluginList := []string{}
pluginMap := make(map[string]bool)
if !daemon.NetworkControllerEnabled() {
return nil
}
// TODO: Replace this with proper libnetwork API
pluginList := []string{"overlay"}
pluginMap := map[string]bool{"overlay": true}
networks := daemon.netController.Networks()
for _, network := range networks {
@ -371,8 +373,6 @@ func (daemon *Daemon) GetNetworkDriverList() []string {
pluginMap[network.Type()] = true
}
}
// TODO : Replace this with proper libnetwork API
pluginList = append(pluginList, "overlay")
sort.Strings(pluginList)