Merge pull request docker#9692 from floatingstatic/linklocal

laurazard · web-flow · commit 57f98eff03ca · 2022-08-01T16:11:00.000+02:00
Fix LinkLocalIPs in V2
diff --git a/pkg/compose/convergence.go b/pkg/compose/convergence.go
@@ -605,8 +605,9 @@ func (s *composeService) connectContainerToNetwork(ctx context.Context, id strin
 		ipv4Address = cfg.Ipv4Address
 		ipv6Address = cfg.Ipv6Address
 		ipam = &network.EndpointIPAMConfig{
-			IPv4Address: ipv4Address,
-			IPv6Address: ipv6Address,
+			IPv4Address:  ipv4Address,
+			IPv6Address:  ipv6Address,
+			LinkLocalIPs: cfg.LinkLocalIPs,
 		}
 	}
 	err := s.apiClient().NetworkConnect(ctx, netwrk, id, &network.EndpointSettings{
diff --git a/pkg/compose/create.go b/pkg/compose/create.go
@@ -306,8 +306,9 @@ func (s *composeService) getCreateOptions(ctx context.Context, p *types.Project,
 			ipv4Address = config.Ipv4Address
 			ipv6Address = config.Ipv6Address
 			ipam = &network.EndpointIPAMConfig{
-				IPv4Address: ipv4Address,
-				IPv6Address: ipv6Address,
+				IPv4Address:  ipv4Address,
+				IPv6Address:  ipv6Address,
+				LinkLocalIPs: config.LinkLocalIPs,
 			}
 		}
 		networkConfig = &network.NetworkingConfig{

Original file line number	Diff line number	Diff line change
`@@ -605,8 +605,9 @@ func (s *composeService) connectContainerToNetwork(ctx context.Context, id strin`
`605`	`605`	`ipv4Address = cfg.Ipv4Address`
`606`	`606`	`ipv6Address = cfg.Ipv6Address`
`607`	`607`	`ipam = &network.EndpointIPAMConfig{`
`608`		`- IPv4Address: ipv4Address,`
`609`		`- IPv6Address: ipv6Address,`
	`608`	`+ IPv4Address: ipv4Address,`
	`609`	`+ IPv6Address: ipv6Address,`
	`610`	`+ LinkLocalIPs: cfg.LinkLocalIPs,`
`610`	`611`	`}`
`611`	`612`	`}`
`612`	`613`	`err := s.apiClient().NetworkConnect(ctx, netwrk, id, &network.EndpointSettings{`
Original file line number	Diff line number	Diff line change
`@@ -306,8 +306,9 @@ func (s composeService) getCreateOptions(ctx context.Context, p types.Project,`
`306`	`306`	`ipv4Address = config.Ipv4Address`
`307`	`307`	`ipv6Address = config.Ipv6Address`
`308`	`308`	`ipam = &network.EndpointIPAMConfig{`
`309`		`- IPv4Address: ipv4Address,`
`310`		`- IPv6Address: ipv6Address,`
	`309`	`+ IPv4Address: ipv4Address,`
	`310`	`+ IPv6Address: ipv6Address,`
	`311`	`+ LinkLocalIPs: config.LinkLocalIPs,`
`311`	`312`	`}`
`312`	`313`	`}`
`313`	`314`	`networkConfig = &network.NetworkingConfig{`