tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-31 01:24:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

simplification

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2025-01-10 11:28:49 +01:00 committed by Guillaume Lours
parent fa39503469
commit e81de103db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/compose/create.go
View File

@ -424,11 +424,11 @@ func (s *composeService) prepareContainerMACAddress(ctx context.Context, service
return macAddress, nil return macAddress, nil
} }
func getAliases(project *types.Project, service types.ServiceConfig, serviceIndex int, networkKey string, useNetworkAliases bool) []string { func getAliases(project *types.Project, service types.ServiceConfig, serviceIndex int, cfg *types.ServiceNetworkConfig, useNetworkAliases bool) []string {
aliases := []string{getContainerName(project.Name, service, serviceIndex)} aliases := []string{getContainerName(project.Name, service, serviceIndex)}
if useNetworkAliases { if useNetworkAliases {
aliases = append(aliases, service.Name) aliases = append(aliases, service.Name)
if cfg := service.Networks[networkKey]; cfg != nil { if cfg != nil {
aliases = append(aliases, cfg.Aliases...) aliases = append(aliases, cfg.Aliases...)
} }
} }
@ -456,7 +456,7 @@ func createEndpointSettings(p *types.Project, service types.ServiceConfig, servi
driverOpts = config.DriverOpts driverOpts = config.DriverOpts
} }
return &network.EndpointSettings{ return &network.EndpointSettings{
Aliases: getAliases(p, service, serviceIndex, networkKey, useNetworkAliases), Aliases: getAliases(p, service, serviceIndex, config, useNetworkAliases),
Links: links, Links: links,
IPAddress: ipv4Address, IPAddress: ipv4Address,
IPv6Gateway: ipv6Address, IPv6Gateway: ipv6Address,