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

daemon: buildCreateEndpointOptions: remove intermediate vars

Browse source 
These were not adding much, so just getting rid of them. Also added a
TODO to move this code to the type.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-23 15:34:34 +02:00
parent 45de99aa06
commit cc79024761
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
daemon/network.go
View file

@ -875,12 +875,9 @@ func buildCreateEndpointOptions(c *container.Container, n *libnetwork.Network, e
if err != nil {
return nil, err
}
genericOption := options.Generic{
createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(options.Generic{
netlabel.MacAddress: mac,
}
createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(genericOption))
}))
}
}
@ -904,12 +901,10 @@ func buildCreateEndpointOptions(c *container.Container, n *libnetwork.Network, e
}
}
portSpecs := c.Config.ExposedPorts
ports := make([]nat.Port, len(portSpecs))
var i int
for p := range portSpecs {
ports[i] = p
i++
// TODO(thaJeztah): Move this code to a method on nat.PortSet.
ports := make([]nat.Port, 0, len(c.Config.ExposedPorts))
for p := range c.Config.ExposedPorts {
ports = append(ports, p)
}
nat.SortPortMap(ports, bindings)
@ -918,12 +913,14 @@ func buildCreateEndpointOptions(c *container.Container, n *libnetwork.Network, e
publishedPorts []networktypes.PortBinding
)
for _, port := range ports {
expose := networktypes.TransportPort{}
expose.Proto = networktypes.ParseProtocol(port.Proto())
expose.Port = uint16(port.Int())
exposedPorts = append(exposedPorts, expose)
portProto := networktypes.ParseProtocol(port.Proto())
portNum := uint16(port.Int())
exposedPorts = append(exposedPorts, networktypes.TransportPort{
Proto: portProto,
Port: portNum,
})
pb := networktypes.PortBinding{Port: expose.Port, Proto: expose.Proto}
pb := networktypes.PortBinding{Port: portNum, Proto: portProto}
binding := bindings[port]
for i := 0; i < len(binding); i++ {
pbCopy := pb.GetCopy()
@ -946,17 +943,10 @@ func buildCreateEndpointOptions(c *container.Container, n *libnetwork.Network, e
}
}
var dns []string
if len(c.HostConfig.DNS) > 0 {
dns = c.HostConfig.DNS
createOptions = append(createOptions, libnetwork.CreateOptionDNS(c.HostConfig.DNS))
} else if len(daemonDNS) > 0 {
dns = daemonDNS
}
if len(dns) > 0 {
createOptions = append(createOptions,
libnetwork.CreateOptionDNS(dns))
createOptions = append(createOptions, libnetwork.CreateOptionDNS(daemonDNS))
}
createOptions = append(createOptions, libnetwork.CreateOptionPortMapping(publishedPorts), libnetwork.CreateOptionExposedPorts(exposedPorts))