centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-13 23:06:15 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19429 from mavenugo/epv21

Browse Source 
nil ptr check for endpointsettings when used with older clients
This commit is contained in:
Antonio Murdaca
2016-01-19 08:43:04 +01:00
parent 42ee908b3f 35dbce109b
commit 6a1100cafc
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
daemon/container_operations_unix.go
View File

@@ -757,21 +757,20 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName
return nil
}
if !containertypes.NetworkMode(idOrName).IsUserDefined() && hasUserDefinedIPAddress(endpointConfig) {
return runconfig.ErrUnsupportedNetworkAndIP
}
if !containertypes.NetworkMode(idOrName).IsUserDefined() && len(endpointConfig.Aliases) > 0 {
return runconfig.ErrUnsupportedNetworkAndAlias
}
controller := daemon.netController
if err := validateNetworkingConfig(n, endpointConfig); err != nil {
return err
}
if endpointConfig != nil {
if !containertypes.NetworkMode(idOrName).IsUserDefined() && hasUserDefinedIPAddress(endpointConfig) {
return runconfig.ErrUnsupportedNetworkAndIP
}
if err := validateNetworkingConfig(n, endpointConfig); err != nil {
return err
}
if !containertypes.NetworkMode(idOrName).IsUserDefined() && len(endpointConfig.Aliases) > 0 {
return runconfig.ErrUnsupportedNetworkAndAlias
}
container.NetworkSettings.Networks[n.Name()] = endpointConfig
}