p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #941 from dnephin/fix-compose-network-name

Browse Source 
Fix compose network name
This commit is contained in:
Sebastiaan van Stijn
2018-03-26 23:41:44 +02:00
committed by GitHub
parent d3efe30878 fcffd67028
commit 236a84759a
16 changed files with 763 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/stack/swarm/deploy_bundlefile.go
View File

@ -39,7 +39,7 @@ func deployBundle(ctx context.Context, dockerCli command.Cli, opts options.Deplo
networks := make(map[string]types.NetworkCreate)
for _, service := range bundle.Services {
for _, networkName := range service.Networks {
networks[networkName] = types.NetworkCreate{
networks[namespace.Scope(networkName)] = types.NetworkCreate{
Labels: convert.AddStackLabel(namespace, nil),
}
}

5
cli/command/stack/swarm/deploy_composefile.go
View File

@ -181,8 +181,7 @@ func createNetworks(
existingNetworkMap[network.Name] = network
}
for internalName, createOpts := range networks {
name := namespace.Scope(internalName)
for name, createOpts := range networks {
if _, exists := existingNetworkMap[name]; exists {
continue
}
@ -193,7 +192,7 @@ func createNetworks(
fmt.Fprintf(dockerCli.Out(), "Creating network %s\n", name)
if _, err := client.NetworkCreate(ctx, name, createOpts); err != nil {
return errors.Wrapf(err, "failed to create network %s", internalName)
return errors.Wrapf(err, "failed to create network %s", name)
}
}
return nil