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

Merge pull request #29878 from mavenugo/npfilter2

Browse source 
Cherry-pick #29877 : Use GetAllByCap to get list of network plugins in docker info
This commit is contained in:
Victor Vieux 2017-01-04 14:54:32 -08:00 committed by GitHub
commit 7f20c11c47
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/network.go
View file

@ -407,6 +407,13 @@ func (daemon *Daemon) GetNetworkDriverList() []string {
}
pluginList := daemon.netController.BuiltinDrivers()
managedPlugins := daemon.PluginStore.GetAllManagedPluginsByCap(driverapi.NetworkPluginEndpointType)
for _, plugin := range managedPlugins {
pluginList = append(pluginList, plugin.Name())
}
pluginMap := make(map[string]bool)
for _, plugin := range pluginList {
pluginMap[plugin] = true