From d5a7e7376851d11ecdd98552e0283cd41b2157b9 Mon Sep 17 00:00:00 2001
From: Lucas Bajolet <lucas.bajolet@hashicorp.com>
Date: Tue, 9 Apr 2024 20:23:59 +0000
Subject: [PATCH] backport of commit de25c29daad8c688c875922b7cbbb023082e1a86

---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c15c8c6ac..4f3bedfa6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
     outputs:
       product-version: ${{ steps.set-product-version.outputs.product-version }}
       base-product-version: ${{ steps.set-product-version.outputs.base-product-version }}
-      product-date: ${{ steps.get-product-version.outputs.product-date }}
+      product-date: ${{ steps.set-product-version.outputs.product-date }}
       product-prerelease-version: ${{ steps.set-product-version.outputs.prerelease-product-version }}
       set-ld-flags: ${{ steps.set-ld-flags.outputs.set-ld-flags }}
     steps:
@@ -242,10 +242,10 @@ jobs:
           target: release-light
           arch: ${{ matrix.arch }}
           tags: |
-            docker.io/hashicorp/${{ env.REPO_NAME }}:light
+            ${{ steps.set-product-version.output.prerelease-product-version == '' && format('docker.io/hashicorp/{0}:light', env.REPO_NAME) }}
             docker.io/hashicorp/${{ env.REPO_NAME }}:light-${{ env.version }}
             docker.io/hashicorp/${{ env.REPO_NAME }}:${{ env.version }}
-            public.ecr.aws/hashicorp/${{ env.REPO_NAME }}:light
+            ${{ steps.set-product-version.output.prerelease-product-version == '' && format('public.ecr.aws/hashicorp/{0}:light', env.REPO_NAME) }}
             public.ecr.aws/hashicorp/${{ env.REPO_NAME }}:light-${{ env.version }}
             public.ecr.aws/hashicorp/${{ env.REPO_NAME }}:${{ env.version }}
           dev_tags: |
@@ -272,9 +272,9 @@ jobs:
           target: release-full
           arch: ${{ matrix.arch }}
           tags: |
-            docker.io/hashicorp/${{ env.REPO_NAME }}:full
+            ${{ steps.set-product-version.output.prerelease-product-version == '' && format('docker.io/hashicorp/{0}:full', env.REPO_NAME) }}
             docker.io/hashicorp/${{ env.REPO_NAME }}:full-${{ env.version }}
-            public.ecr.aws/hashicorp/${{ env.REPO_NAME }}:full
+            ${{ steps.set-product-version.output.prerelease-product-version == '' && format('public.ecr.aws/hashicorp/{0}:full', env.REPO_NAME) }}
             public.ecr.aws/hashicorp/${{ env.REPO_NAME }}:full-${{ env.version }}
           dev_tags: |
             docker.io/hashicorppreview/${{ env.REPO_NAME }}:full-${{ env.version }}