Merge pull request #6 from toluna-terraform/remove_latest_tag

Remove latest tag
toluna-terraform · Feb 20, 2022 · 1bdfc36 · 1bdfc36
2 parents 84b270b + 2add326
commit 1bdfc36
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/main.tf b/main.tf
@@ -1,5 +1,5 @@
 locals {
-  image_uri = "${var.ecr_repo_url}:latest"
+  image_uri = "${var.ecr_repo_url}:${var.from_env}"
   artifacts_bucket_name = "s3-codepipeline-${var.app_name}-${var.env_type}"
 }
 

diff --git a/templates/pre_buildspec.yml.tpl b/templates/pre_buildspec.yml.tpl
@@ -9,11 +9,17 @@ phases:
       - BUILD_CONDITION=$(cat ci.txt)
       - PR_NUMBER=$(cat pr.txt)
       - SRC_CHANGED=$(cat src_changed.txt)
+      - |
+        if [ "${PIPELINE_TYPE}" == "cd"];then
+          export FROM_ENV="${FROM_ENV}"
+        else
+          export FROM_ENV=$(cat new_version.txt)
+        fi
   build:
     commands:
-      - printf '{"ImageURI":"${ECR_REPO_URL}:${FROM_ENV}"}' > imageDetail.json
+      - printf '{"ImageURI":"${ECR_REPO_URL}:%s"}' "$FROM_ENV" > imageDetail.json
       - aws ecs describe-task-definition --task-definition ${TASK_DEF_NAME} --query "taskDefinition" --output json > tmp_taskdef.json
-      - sed -i -E 's/'${APP_NAME}'-main:.*,/'${APP_NAME}'-main:'${FROM_ENV}'",/' tmp_taskdef.json
+      - sed -i -E 's/'${APP_NAME}'-main:.*,/'${APP_NAME}'-main:'$FROM_ENV'",/' tmp_taskdef.json
       - jq 'del(.revision,.taskDefinitionArn,.status,.compatibilities,.requiresAttributes,.registeredAt,.registeredBy) | .containerDefinitions[0].image="<IMAGE1_NAME>"' tmp_taskdef.json > taskdef.json
       - echo $APPSPEC > appspec.json
       - cat appspec.json