tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #857 from docker/ecs_pin_search_sidecar_image 

Pinned and publish docker/ecs-searchdomain-sidecar:1.0
This commit is contained in:
Nicolas De loof 2020-10-31 10:40:32 +01:00 committed by GitHub
parent 714ed52d98 3cfb252ff0
commit dc8a432352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -104,6 +104,12 @@ build-aci-sidecar: ## build aci sidecar image locally and tag it with make buil
publish-aci-sidecar: build-aci-sidecar ## build & publish aci sidecar image with make publish-aci-sidecar tag=0.1 publish-aci-sidecar: build-aci-sidecar ## build & publish aci sidecar image with make publish-aci-sidecar tag=0.1
docker pull docker/aci-hostnames-sidecar:$(tag) && echo "Failure: Tag already exists" || docker push docker/aci-hostnames-sidecar:$(tag) docker pull docker/aci-hostnames-sidecar:$(tag) && echo "Failure: Tag already exists" || docker push docker/aci-hostnames-sidecar:$(tag)
build-ecs-search-sidecar: ## build ecs search sidecar image locally and tag it with make build-ecs-search-sidecar tag=0.1
docker build -t docker/ecs-searchdomain-sidecar:$(tag) ecs/resolv
publish-ecs-search-sidecar: build-ecs-search-sidecar ## build & publish ecs search sidecar image with make publish-ecs-search-sidecar tag=0.1
docker pull docker/ecs-searchdomain-sidecar:$(tag) && echo "Failure: Tag already exists" || docker push docker/ecs-searchdomain-sidecar:$(tag)
clean-aci-e2e: ## Make sure no ACI tests are currently runnnig in the CI when invoking this. Delete ACI E2E tests resources that might have leaked when ctrl-C E2E tests. clean-aci-e2e: ## Make sure no ACI tests are currently runnnig in the CI when invoking this. Delete ACI E2E tests resources that might have leaked when ctrl-C E2E tests.
az group list | jq '.[].name' | grep E2E-Test | xargs -n1 az group delete -y --no-wait -g az group list | jq '.[].name' | grep E2E-Test | xargs -n1 az group delete -y --no-wait -g

2
ecs/convert.go
View File

@ -37,7 +37,7 @@ import (
) )
const secretsInitContainerImage = "docker/ecs-secrets-sidecar" const secretsInitContainerImage = "docker/ecs-secrets-sidecar"
const searchDomainInitContainerImage = "docker/ecs-searchdomain-sidecar" const searchDomainInitContainerImage = "docker/ecs-searchdomain-sidecar:1.0"
func (b *ecsAPIService) createTaskDefinition(project *types.Project, service types.ServiceConfig, resources awsResources) (*ecs.TaskDefinition, error) { func (b *ecsAPIService) createTaskDefinition(project *types.Project, service types.ServiceConfig, resources awsResources) (*ecs.TaskDefinition, error) {
cpu, mem, err := toLimits(service) cpu, mem, err := toLimits(service)

2
ecs/testdata/simple/simple-cloudformation-conversion.golden vendored
View File

@ -234,7 +234,7 @@
"TestSimpleConvert.local" "TestSimpleConvert.local"
], ],
"Essential": "false", "Essential": "false",
"Image": "docker/ecs-searchdomain-sidecar", "Image": "docker/ecs-searchdomain-sidecar:1.0",
"LogConfiguration": { "LogConfiguration": {
"LogDriver": "awslogs", "LogDriver": "awslogs",
"Options": { "Options": {