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

Set task tags

Browse Source 
Signed-off-by: aiordache <anca.iordache@docker.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
aiordache 2020-07-24 20:01:17 +02:00 committed by Nicolas De Loof
parent f5703310ef
commit cec3187bbb
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,14 +37,29 @@ 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{
{ {
Command: service.Command, Command: service.Command,
DisableNetworking: service.NetworkMode == "none", DisableNetworking: service.NetworkMode == "none",
DnsSearchDomains: service.DNSSearch, DnsSearchDomains: service.DNSSearch,
DnsServers: service.DNS, DnsServers: service.DNS,
DockerLabels: nil, 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),
@ -78,8 +93,9 @@ 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,
WorkingDirectory: service.WorkingDir, VolumesFrom: nil,
WorkingDirectory: service.WorkingDir,
}, },
}, },
Cpu: cpu, Cpu: cpu,
@ -91,7 +107,7 @@ 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: toTags(service.Labels), Tags: tags,
}, nil }, nil
} }

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

@ -219,6 +219,10 @@
"Properties": { "Properties": {
"ContainerDefinitions": [ "ContainerDefinitions": [
{ {
"DockerLabels": {
"com.docker.compose.project": "TestSimpleConvert",
"com.docker.compose.service": "simple"
},
"Environment": [ "Environment": [
{ {
"Name": "LOCALDOMAIN", "Name": "LOCALDOMAIN",
@ -270,6 +274,16 @@
"NetworkMode": "awsvpc", "NetworkMode": "awsvpc",
"RequiresCompatibilities": [ "RequiresCompatibilities": [
"FARGATE" "FARGATE"
],
"Tags": [
{
"Key": "com.docker.compose.project",
"Value": "TestSimpleConvert"
},
{
"Key": "com.docker.compose.service",
"Value": "simple"
}
] ]
}, },
"Type": "AWS::ECS::TaskDefinition" "Type": "AWS::ECS::TaskDefinition"