From ea266f8f7ad74f671cc7595c17ea122a5593bec4 Mon Sep 17 00:00:00 2001 From: allencloud Date: Sun, 25 Sep 2016 19:30:52 +0800 Subject: [PATCH] fix #26890 avoid duplicate overlay drivers in info Signed-off-by: allencloud --- daemon/network.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/network.go b/daemon/network.go index 57547993ed..9482c26eb0 100644 --- a/daemon/network.go +++ b/daemon/network.go @@ -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)