tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 23:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Propagate service tags on Tasks

Browse Source 
closes #188

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2020-08-04 18:20:34 +02:00
parent 8582cb3928
commit e7bc8081ba
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ecs/pkg/amazon/backend/cloudformation.go
View File

@ -179,6 +179,7 @@ func (b Backend) Convert(project *types.Project) (*cloudformation.Template, erro
}, },
}, },
}, },
PropagateTags: ecsapi.PropagateTagsService,
SchedulingStrategy: ecsapi.SchedulingStrategyReplica, SchedulingStrategy: ecsapi.SchedulingStrategyReplica,
ServiceRegistries: []ecs.Service_ServiceRegistry{serviceRegistry}, ServiceRegistries: []ecs.Service_ServiceRegistry{serviceRegistry},
Tags: []tags.Tag{ Tags: []tags.Tag{

18
ecs/pkg/amazon/backend/convert.go
View File

@ -37,18 +37,6 @@ func Convert(project *types.Project, service types.ServiceConfig) (*ecs.TaskDefi
fmt.Sprintf(" %s.local", project.Name), fmt.Sprintf(" %s.local", project.Name),
})) }))
tags := []tags.Tag{
{
Key: compose.ProjectTag,
Value: project.Name,
},
{
Key: compose.ServiceTag,
Value: service.Name,
},
}
tags = append(tags, toTags(service.Labels)...)
return &ecs.TaskDefinition{ return &ecs.TaskDefinition{
ContainerDefinitions: []ecs.TaskDefinition_ContainerDefinition{ ContainerDefinitions: []ecs.TaskDefinition_ContainerDefinition{
{ {
@ -56,10 +44,6 @@ func Convert(project *types.Project, service types.ServiceConfig) (*ecs.TaskDefi
DisableNetworking: service.NetworkMode == "none", DisableNetworking: service.NetworkMode == "none",
DnsSearchDomains: service.DNSSearch, DnsSearchDomains: service.DNSSearch,
DnsServers: service.DNS, DnsServers: service.DNS,
DockerLabels: map[string]string{
compose.ProjectTag: project.Name,
compose.ServiceTag: service.Name,
},
DockerSecurityOptions: service.SecurityOpt, DockerSecurityOptions: service.SecurityOpt,
EntryPoint: service.Entrypoint, EntryPoint: service.Entrypoint,
Environment: toKeyValuePair(service.Environment), Environment: toKeyValuePair(service.Environment),
@ -93,7 +77,6 @@ func Convert(project *types.Project, service types.ServiceConfig) (*ecs.TaskDefi
SystemControls: toSystemControls(service.Sysctls), SystemControls: toSystemControls(service.Sysctls),
Ulimits: toUlimits(service.Ulimits), Ulimits: toUlimits(service.Ulimits),
User: service.User, User: service.User,
VolumesFrom: nil, VolumesFrom: nil,
WorkingDirectory: service.WorkingDir, WorkingDirectory: service.WorkingDir,
}, },
@ -107,7 +90,6 @@ func Convert(project *types.Project, service types.ServiceConfig) (*ecs.TaskDefi
PlacementConstraints: toPlacementConstraints(service.Deploy), PlacementConstraints: toPlacementConstraints(service.Deploy),
ProxyConfiguration: nil, ProxyConfiguration: nil,
RequiresCompatibilities: []string{ecsapi.LaunchTypeFargate}, RequiresCompatibilities: []string{ecsapi.LaunchTypeFargate},
Tags: tags,
}, nil }, nil
} }

1
ecs/pkg/amazon/backend/testdata/simple/simple-cloudformation-conversion.golden vendored
View File

@ -116,6 +116,7 @@
] ]
} }
}, },
"PropagateTags": "SERVICE",
"SchedulingStrategy": "REPLICA", "SchedulingStrategy": "REPLICA",
"ServiceRegistries": [ "ServiceRegistries": [
{ {