Browse Source

Merge pull request #26891 from allencloud/fix-26890-duplicate-overlay-drivers-in-info

fix #26890 avoid duplicate overlay drivers in info
Alexander Morozov 8 years ago
parent
commit
8dc63675c5
1 changed files with 5 additions and 5 deletions
  1. 5 5
      daemon/network.go

+ 5 - 5
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)