1
0
Эх сурвалжийг харах

Merge pull request #623 from docker/external

Prefer external.name over x-aws-securitygroup
Nicolas De loof 5 жил өмнө
parent
commit
387370d074

+ 4 - 0
ecs/cloudformation.go

@@ -566,7 +566,11 @@ func createCloudMap(project *types.Project, template *cloudformation.Template) {
 }
 }
 
 
 func convertNetwork(project *types.Project, net types.NetworkConfig, vpc string, template *cloudformation.Template) string {
 func convertNetwork(project *types.Project, net types.NetworkConfig, vpc string, template *cloudformation.Template) string {
+	if net.External.External {
+		return net.Name
+	}
 	if sg, ok := net.Extensions[extensionSecurityGroup]; ok {
 	if sg, ok := net.Extensions[extensionSecurityGroup]; ok {
+		logrus.Warn("to use an existing security-group, set `network.external` and `network.name` in your compose file")
 		logrus.Debugf("Security Group for network %q set by user to %q", net.Name, sg)
 		logrus.Debugf("Security Group for network %q set by user to %q", net.Name, sg)
 		return sg.(string)
 		return sg.(string)
 	}
 	}