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 #1633 from ndeloof/ipaddress 

configure service with ipAddress
This commit is contained in:
Nicolas De loof 2021-05-04 20:32:40 +02:00 committed by GitHub
parent c64317a981 ba588275a3
commit 7840be9693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
local/compose/convergence.go
View File

@ -328,7 +328,8 @@ func (s *composeService) createMobyContainer(ctx context.Context, project *types
aliases = append(aliases, cfg.Aliases...)
}
}
err = s.connectContainerToNetwork(ctx, created.ID, netwrk.Name, aliases...)
err = s.connectContainerToNetwork(ctx, created.ID, netwrk.Name, cfg, aliases...)
if err != nil {
return err
}
@ -336,9 +337,19 @@ func (s *composeService) createMobyContainer(ctx context.Context, project *types
return nil
}
func (s *composeService) connectContainerToNetwork(ctx context.Context, id string, netwrk string, aliases ...string) error {
func (s *composeService) connectContainerToNetwork(ctx context.Context, id string, netwrk string, cfg *types.ServiceNetworkConfig, aliases ...string) error {
var (
ipv4ddress string
ipv6Address string
)
if cfg != nil {
ipv4ddress = cfg.Ipv4Address
ipv6Address = cfg.Ipv6Address
}
err := s.apiClient.NetworkConnect(ctx, netwrk, id, &network.EndpointSettings{
Aliases: aliases,
Aliases: aliases,
IPAddress: ipv4ddress,
GlobalIPv6Address: ipv6Address,
})
if err != nil {
return err