Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-04 14:47:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

pkg/compose: defaultNetworkSettings: slight refactor

Browse source 
- use an intermediate serviceNetworks slice so that we don't have
  to call service.NetworksByPriority multiple times.
- shift the primary network from the slice (if any), so that
  we can drop some checks for "additional networks"
- group code related to setting up the primary network as first
  step, then append remaining networks.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2026-02-04 17:36:11 +01:00 • committed by Guillaume Lours
parent 08c32e9033
commit fefdc95224
1 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

51
pkg/compose/create.go
View file

@ -525,7 +525,7 @@ func defaultNetworkSettings(project *types.Project,
}
if len(project.Networks) == 0 {
return "none", nil, nil
return network.NetworkNone, nil, nil
}
if versions.LessThan(version, APIVersion149) {
@ -536,35 +536,17 @@ func defaultNetworkSettings(project *types.Project,
}
}
var primaryNetworkKey string
if len(service.Networks) > 0 {
primaryNetworkKey = service.NetworksByPriority()[0]
} else {
primaryNetworkKey = "default"
serviceNetworks := service.NetworksByPriority()
primaryNetworkKey := "default"
if len(serviceNetworks) > 0 {
primaryNetworkKey = serviceNetworks[0]
serviceNetworks = serviceNetworks[1:]
}
primaryNetworkMobyNetworkName := project.Networks[primaryNetworkKey].Name
primaryNetworkEndpoint, err := createEndpointSettings(project, service, serviceIndex, primaryNetworkKey, links, useNetworkAliases)
if err != nil {
return "", nil, err
}
endpointsConfig := map[string]*network.EndpointSettings{}
// Starting from API version 1.44, the Engine will take several EndpointsConfigs
// so we can pass all the extra networks we want the container to be connected to
// in the network configuration instead of connecting the container to each extra
// network individually after creation.
if len(service.Networks) > 1 {
serviceNetworks := service.NetworksByPriority()
for _, networkKey := range serviceNetworks[1:] {
mobyNetworkName := project.Networks[networkKey].Name
epSettings, err := createEndpointSettings(project, service, serviceIndex, networkKey, links, useNetworkAliases)
if err != nil {
return "", nil, err
}
endpointsConfig[mobyNetworkName] = epSettings
}
}
if primaryNetworkEndpoint.MacAddress.String() == "" {
primaryNetworkEndpoint.MacAddress, err = parseMACAddr(service.MacAddress)
if err != nil {
@ -572,7 +554,24 @@ func defaultNetworkSettings(project *types.Project,
}
}
endpointsConfig[primaryNetworkMobyNetworkName] = primaryNetworkEndpoint
primaryNetworkMobyNetworkName := project.Networks[primaryNetworkKey].Name
endpointsConfig := map[string]*network.EndpointSettings{
primaryNetworkMobyNetworkName: primaryNetworkEndpoint,
}
// Starting from API version 1.44, the Engine will take several EndpointsConfigs
// so we can pass all the extra networks we want the container to be connected to
// in the network configuration instead of connecting the container to each extra
// network individually after creation.
for _, networkKey := range serviceNetworks {
epSettings, err := createEndpointSettings(project, service, serviceIndex, networkKey, links, useNetworkAliases)
if err != nil {
return "", nil, err
}
mobyNetworkName := project.Networks[networkKey].Name
endpointsConfig[mobyNetworkName] = epSettings
}
networkConfig := &network.NetworkingConfig{
EndpointsConfig: endpointsConfig,
}