浏览代码

Merge pull request #857 from docker/ecs_pin_search_sidecar_image

Pinned and publish docker/ecs-searchdomain-sidecar:1.0
Nicolas De loof 5 年之前
父节点
当前提交
dc8a432352
共有 3 个文件被更改,包括 8 次插入2 次删除
  1. 6 0
      Makefile
  2. 1 1
      ecs/convert.go
  3. 1 1
      ecs/testdata/simple/simple-cloudformation-conversion.golden

+ 6 - 0
Makefile

@@ -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
 	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.
 	 az group list | jq '.[].name' | grep E2E-Test | xargs -n1 az group delete -y --no-wait -g
 

+ 1 - 1
ecs/convert.go

@@ -37,7 +37,7 @@ import (
 )
 
 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) {
 	cpu, mem, err := toLimits(service)

+ 1 - 1
ecs/testdata/simple/simple-cloudformation-conversion.golden

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