Merge pull request #18096 from Microsoft/jjh/dockerinfoav

Windows: [TP4] docker info crashes Upstream-commit: b205b06d3e4ec4d1850f1a2d7eebb43f13e9ef46 Component: engine
2015-11-19 21:48:02 +01:00
parent c97969e0fa 9f741a440b
commit 60990134ed
1 changed files with 3 additions and 0 deletions
@@ -152,6 +152,9 @@ func (daemon *Daemon) DisconnectContainerFromNetwork(containerName string, netwo
 func (daemon *Daemon) GetNetworkDriverList() map[string]bool {
 	pluginList := make(map[string]bool)

+	if !daemon.NetworkControllerEnabled() {
+		return nil
+	}
 	c := daemon.netController
 	networks := c.Networks()