Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only set default aliases when the network is user defined. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2017-05-26 14:25:20 -04:00
parent 341703d21e
commit d5b505ee8c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli/compose/convert/service.go
View File

@ -214,19 +214,22 @@ func convertServiceNetworks(
if !ok && networkName != defaultNetwork { if !ok && networkName != defaultNetwork {
return nil, errors.Errorf("undefined network %q", networkName) return nil, errors.Errorf("undefined network %q", networkName)
} }
var aliases []string
if network != nil {
aliases = network.Aliases
}
target := namespace.Scope(networkName) target := namespace.Scope(networkName)
if networkConfig.External.External { if networkConfig.External.External {
target = networkConfig.External.Name target = networkConfig.External.Name
} }
netAttachConfig := swarm.NetworkAttachmentConfig{ netAttachConfig := swarm.NetworkAttachmentConfig{
Target: target, Target: target,
Aliases: aliases,
} }
// Only add default aliases to user defined networks. Other networks do
// not support aliases.
if container.NetworkMode(target).IsUserDefined() { if container.NetworkMode(target).IsUserDefined() {
var aliases []string netAttachConfig.Aliases = append(netAttachConfig.Aliases, name)
if network != nil {
aliases = network.Aliases
}
netAttachConfig.Aliases = append(aliases, name)
} }
nets = append(nets, netAttachConfig) nets = append(nets, netAttachConfig)
} }