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

daemon: rename some vars that collided with imports

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-12-28 11:23:06 +01:00
parent 598c295707
commit 288cf20f98
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
daemon/inspect.go
View file

@ -46,10 +46,10 @@ func (daemon *Daemon) ContainerInspectCurrent(name string, size bool) (*types.Co
}
apiNetworks := make(map[string]*networktypes.EndpointSettings)
for name, epConf := range ctr.NetworkSettings.Networks {
for nwName, epConf := range ctr.NetworkSettings.Networks {
if epConf.EndpointSettings != nil {
// We must make a copy of this pointer object otherwise it can race with other operations
apiNetworks[name] = epConf.EndpointSettings.Copy()
apiNetworks[nwName] = epConf.EndpointSettings.Copy()
}
}
@ -93,28 +93,28 @@ func (daemon *Daemon) ContainerInspectCurrent(name string, size bool) (*types.Co
// containerInspect120 serializes the master version of a container into a json type.
func (daemon *Daemon) containerInspect120(name string) (*v1p20.ContainerJSON, error) {
container, err := daemon.GetContainer(name)
ctr, err := daemon.GetContainer(name)
if err != nil {
return nil, err
}
container.Lock()
defer container.Unlock()
ctr.Lock()
defer ctr.Unlock()
base, err := daemon.getInspectData(container)
base, err := daemon.getInspectData(ctr)
if err != nil {
return nil, err
}
mountPoints := container.GetMountPoints()
mountPoints := ctr.GetMountPoints()
config := &v1p20.ContainerConfig{
Config: container.Config,
MacAddress: container.Config.MacAddress,
NetworkDisabled: container.Config.NetworkDisabled,
ExposedPorts: container.Config.ExposedPorts,
VolumeDriver: container.HostConfig.VolumeDriver,
Config: ctr.Config,
MacAddress: ctr.Config.MacAddress,
NetworkDisabled: ctr.Config.NetworkDisabled,
ExposedPorts: ctr.Config.ExposedPorts,
VolumeDriver: ctr.HostConfig.VolumeDriver,
}
networkSettings := daemon.getBackwardsCompatibleNetworkSettings(container.NetworkSettings)
networkSettings := daemon.getBackwardsCompatibleNetworkSettings(ctr.NetworkSettings)
return &v1p20.ContainerJSON{
ContainerJSONBase: base,