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 #843 from docker/pin_image_version 

Pin version of ACI sidecar image, so that we don’t affect prod users when re-publishing :latest.
This commit is contained in:
Guillaume Tardif 2020-10-29 09:37:07 +01:00 committed by GitHub
parent 699e7c5074 5bdcfe2e4a
commit 5450791ba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -98,6 +98,12 @@ validate: validate-go-mod validate-headers ## Validate sources
pre-commit: cli test e2e-local lint validate pre-commit: cli test e2e-local lint validate
build-aci-sidecar: ## build aci sidecar image locally and tag it with make build-aci-sidecar tag=0.1
docker build -t docker/aci-hostnames-sidecar:$(tag) aci/etchosts
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)
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
aci/convert/convert.go
View File

@ -42,7 +42,7 @@ const (
// ComposeDNSSidecarName name of the dns sidecar container // ComposeDNSSidecarName name of the dns sidecar container
ComposeDNSSidecarName = "aci--dns--sidecar" ComposeDNSSidecarName = "aci--dns--sidecar"
dnsSidecarImage = "docker/aci-hostnames-sidecar" dnsSidecarImage = "docker/aci-hostnames-sidecar:1.0"
) )
// ToContainerGroup converts a compose project into a ACI container group // ToContainerGroup converts a compose project into a ACI container group