From 15ac42ede9470458b3d4503ee7663bee8a5a6a19 Mon Sep 17 00:00:00 2001
From: "eve n.u" <eve@eatbigger.fish>
Date: Mon, 19 Feb 2024 13:44:01 -0800
Subject: [PATCH] fix deploy workflow: use of overrides

---
 .github/workflows/deploy-template.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy-template.yml b/.github/workflows/deploy-template.yml
index ae00d533c..68cc653d9 100644
--- a/.github/workflows/deploy-template.yml
+++ b/.github/workflows/deploy-template.yml
@@ -24,7 +24,7 @@ on:
 
 env:
   AWS_REGION: us-east-1
-  ECR_REPOSITORY: pubpub-v7-${{ inputs.service }}
+  ECR_REPOSITORY_PREFIX: pubpub-v7
   ECS_SERVICE: ${{ inputs.proper-name }}-${{inputs.service}}
   ECS_CLUSTER: ${{inputs.proper-name}}-ecs-cluster-${{inputs.environment}}
   ECS_TASK_DEFINITION_TEMPLATE: ${{ inputs.proper-name }}-${{inputs.service}}
@@ -70,10 +70,10 @@ jobs:
         id: label
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          IMAGE_TAG: ${{ steps.gettag.outputs.tag }}
         run: |
-          sha_short=$(git describe --always --abbrev=40 --dirty)
-          echo "label=$ECR_REGISTRY/$ECR_REPOSITORY_PREFIX-${CONTAINER_NAME}:$sha_short" >> $GITHUB_OUTPUT
-          echo "base_label=$ECR_REGISTRY/$ECR_REPOSITORY_PREFIX:$sha_short" >> $GITHUB_OUTPUT
+          echo "label=$ECR_REGISTRY/$ECR_REPOSITORY_PREFIX-${CONTAINER_NAME}:$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "base_label=$ECR_REGISTRY/$ECR_REPOSITORY_PREFIX:$IMAGE_TAG" >> $GITHUB_OUTPUT
 
       - name: Fill in the new image ID in the Amazon ECS task definition
         id: task-def-service