tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9692 from floatingstatic/linklocal 

Fix LinkLocalIPs in V2
This commit is contained in:
Laura Brehm 2022-08-01 16:11:00 +02:00 committed by GitHub
parent 1eeb12fe1e 8d84a12333
commit 57f98eff03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/compose/convergence.go
View File

@ -605,8 +605,9 @@ func (s *composeService) connectContainerToNetwork(ctx context.Context, id strin
ipv4Address = cfg.Ipv4Address ipv4Address = cfg.Ipv4Address
ipv6Address = cfg.Ipv6Address ipv6Address = cfg.Ipv6Address
ipam = &network.EndpointIPAMConfig{ ipam = &network.EndpointIPAMConfig{
IPv4Address: ipv4Address, IPv4Address: ipv4Address,
IPv6Address: ipv6Address, IPv6Address: ipv6Address,
LinkLocalIPs: cfg.LinkLocalIPs,
} }
} }
err := s.apiClient().NetworkConnect(ctx, netwrk, id, &network.EndpointSettings{ err := s.apiClient().NetworkConnect(ctx, netwrk, id, &network.EndpointSettings{

5
pkg/compose/create.go
View File

@ -306,8 +306,9 @@ func (s *composeService) getCreateOptions(ctx context.Context, p *types.Project,
ipv4Address = config.Ipv4Address ipv4Address = config.Ipv4Address
ipv6Address = config.Ipv6Address ipv6Address = config.Ipv6Address
ipam = &network.EndpointIPAMConfig{ ipam = &network.EndpointIPAMConfig{
IPv4Address: ipv4Address, IPv4Address: ipv4Address,
IPv6Address: ipv6Address, IPv6Address: ipv6Address,
LinkLocalIPs: config.LinkLocalIPs,
} }
} }
networkConfig = &network.NetworkingConfig{ networkConfig = &network.NetworkingConfig{