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

Fix external networks 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2017-12-11 11:29:45 -05:00
parent 29d3510d50
commit 9da2602f38
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/compose/convert/compose.go
View File

@ -62,7 +62,7 @@ func Networks(namespace Namespace, networks networkMap, servicesNetworks map[str
for internalName := range servicesNetworks { for internalName := range servicesNetworks {
network := networks[internalName] network := networks[internalName]
if network.External.External { if network.External.External {
externalNetworks = append(externalNetworks, network.External.Name) externalNetworks = append(externalNetworks, network.Name)
continue continue
} }

4
cli/compose/convert/compose_test.go
View File

@ -55,11 +55,9 @@ func TestNetworks(t *testing.T) {
}, },
}, },
"outside": composetypes.NetworkConfig{ "outside": composetypes.NetworkConfig{
External: composetypes.External{ External: composetypes.External{External: true},
External: true,
Name: "special", Name: "special",
}, },
},
"attachablenet": composetypes.NetworkConfig{ "attachablenet": composetypes.NetworkConfig{
Driver: "overlay", Driver: "overlay",
Attachable: true, Attachable: true,

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

@ -230,7 +230,7 @@ func convertServiceNetworks(
} }
target := namespace.Scope(networkName) target := namespace.Scope(networkName)
if networkConfig.External.External { if networkConfig.External.External {
target = networkConfig.External.Name target = networkConfig.Name
} }
netAttachConfig := swarm.NetworkAttachmentConfig{ netAttachConfig := swarm.NetworkAttachmentConfig{
Target: target, Target: target,

8
cli/compose/convert/service_test.go
View File

@ -219,11 +219,9 @@ func TestConvertServiceNetworksOnlyDefault(t *testing.T) {
func TestConvertServiceNetworks(t *testing.T) { func TestConvertServiceNetworks(t *testing.T) {
networkConfigs := networkMap{ networkConfigs := networkMap{
"front": composetypes.NetworkConfig{ "front": composetypes.NetworkConfig{
External: composetypes.External{ External: composetypes.External{External: true},
External: true,
Name: "fronttier", Name: "fronttier",
}, },
},
"back": composetypes.NetworkConfig{}, "back": composetypes.NetworkConfig{},
} }
networks := map[string]*composetypes.ServiceNetworkConfig{ networks := map[string]*composetypes.ServiceNetworkConfig{
@ -259,11 +257,9 @@ func TestConvertServiceNetworks(t *testing.T) {
func TestConvertServiceNetworksCustomDefault(t *testing.T) { func TestConvertServiceNetworksCustomDefault(t *testing.T) {
networkConfigs := networkMap{ networkConfigs := networkMap{
"default": composetypes.NetworkConfig{ "default": composetypes.NetworkConfig{
External: composetypes.External{ External: composetypes.External{External: true},
External: true,
Name: "custom", Name: "custom",
}, },
},
} }
networks := map[string]*composetypes.ServiceNetworkConfig{} networks := map[string]*composetypes.ServiceNetworkConfig{}