mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
nil ptr check for endpointsettings when used with older clients
Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
parent
637f49b5af
commit
35dbce109b
1 changed files with 11 additions and 12 deletions
|
@ -757,21 +757,20 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
controller := daemon.netController
|
||||||
|
|
||||||
|
if endpointConfig != nil {
|
||||||
if !containertypes.NetworkMode(idOrName).IsUserDefined() && hasUserDefinedIPAddress(endpointConfig) {
|
if !containertypes.NetworkMode(idOrName).IsUserDefined() && hasUserDefinedIPAddress(endpointConfig) {
|
||||||
return runconfig.ErrUnsupportedNetworkAndIP
|
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 {
|
if err := validateNetworkingConfig(n, endpointConfig); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if endpointConfig != nil {
|
if !containertypes.NetworkMode(idOrName).IsUserDefined() && len(endpointConfig.Aliases) > 0 {
|
||||||
|
return runconfig.ErrUnsupportedNetworkAndAlias
|
||||||
|
}
|
||||||
container.NetworkSettings.Networks[n.Name()] = endpointConfig
|
container.NetworkSettings.Networks[n.Name()] = endpointConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue