Merge pull request moby#39589 from thaJeztah/prevent_network_attach_p…

…anic Prevent panic on network attach
JunGuoCS · Jul 29, 2019 · 9c92080 · 9c92080
2 parents 917a8b4 + 651e694
commit 9c92080
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/daemon/container_operations.go b/daemon/container_operations.go
@@ -237,7 +237,10 @@ func (daemon *Daemon) buildSandboxOptions(container *container.Container) ([]lib
 
 func (daemon *Daemon) updateNetworkSettings(container *container.Container, n libnetwork.Network, endpointConfig *networktypes.EndpointSettings) error {
 	if container.NetworkSettings == nil {
-		container.NetworkSettings = &network.Settings{Networks: make(map[string]*network.EndpointSettings)}
+		container.NetworkSettings = &network.Settings{}
+	}
+	if container.NetworkSettings.Networks == nil {
+		container.NetworkSettings.Networks = make(map[string]*network.EndpointSettings)
 	}
 
 	if !container.HostConfig.NetworkMode.IsHost() && containertypes.NetworkMode(n.Type()).IsHost() {