aws ecr terraform

Author: CLJ2006

ansible/roles/deploy-ecs-proxies/templates/terraform/locals.tf

@@ -54,7 +54,8 @@ ecs_service = [
               '${local.account_id}.dkr.ecr.eu-west-2.amazonaws.com/'
               + service_id + '_' + container.name
               + (
-                  ":ecs-{{ build_label }}" if var.use_ecs_tag and container.name == "canary_canary-api"
+                  ":ecs-{{ build_label }}" 
+                  if use_ecs_tag and container.name == "canary-canary-api"
                   else ":{{ build_label }}"
                 )
           }
@@ -65,6 +66,7 @@ ecs_service = [
 ]
 
 
+
   exposed_service = element(matchkeys(local.ecs_service, local.ecs_service.*.expose, list(true)), 0)
 
   private_alb_arn_suffix = data.terraform_remote_state.pre-reqs.outputs.private_alb_arn_suffix

azure/templates/deploy-service.yml

@@ -233,6 +233,9 @@ steps:
         export DEPLOYED_VERSION="${{ parameters.fully_qualified_service_name }}"
       fi
 
+      export TF_VAR_use_ecs_tag=$([[ "${is_pull_request}" == "false" ]] && echo true || echo false)
+      export use_ecs_tag=$TF_VAR_use_ecs_tag
+
       account=${{ parameters.aws_account }} \
       PROXY_VARS_FILE="${proxy_vars_file}" \
       SOURCE_COMMIT_ID="$(Build.SourceVersion)" \