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.

Makefile

@@ -98,6 +98,12 @@ validate: validate-go-mod validate-headers ## Validate sources
 
 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.
 	 az group list | jq '.[].name' | grep E2E-Test | xargs -n1 az group delete -y --no-wait -g
 

aci/convert/convert.go

@@ -42,7 +42,7 @@ const (
 	// ComposeDNSSidecarName name of the dns sidecar container
 	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