From 9cca120fb379616ebd7d35a1249f3f064bb6a05a Mon Sep 17 00:00:00 2001
From: Mathijs van Veluw <black.dex@gmail.com>
Date: Sun, 7 Dec 2025 13:12:05 +0100
Subject: [PATCH 1/2] Fix release workflow (#6532)

---
 .github/workflows/release.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b2821ab9..e7604b8f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -363,6 +363,7 @@ jobs:
         working-directory: ${{ runner.temp }}/digests
         env:
           BASE_IMAGE: "${{ matrix.base_image }}"
+          BASE_IMAGE_TAG: "${{ matrix.base_image == 'debian' && '' || format('-{0}', matrix.base_image) }}"
           BASE_TAGS: "${{ env.BASE_TAGS }}"
           CONTAINER_REGISTRIES: "${{ env.CONTAINER_REGISTRIES }}"
         run: |
@@ -371,27 +372,27 @@ jobs:
           IFS=',' read -ra TAGS <<< "${BASE_TAGS}"
           for img in "${IMAGES[@]}"; do
             for tag in "${TAGS[@]}"; do
-              echo "Creating manifest for $img:$tag-${BASE_IMAGE}"
+              echo "Creating manifest for ${img}:${tag}${BASE_IMAGE_TAG}"
 
               OUTPUT=$(docker buildx imagetools create \
-                -t "$img:$tag-${BASE_IMAGE}" \
-                $(printf "$img:$tag-${BASE_IMAGE}@sha256:%s " *) 2>&1)
+                -t "${img}:${tag}${BASE_IMAGE_TAG}" \
+                $(printf "${img}:${tag}-${BASE_IMAGE}@sha256:%s " *) 2>&1)
               STATUS=$?
 
-              if [ $STATUS -ne 0 ]; then
-                echo "Manifest creation failed for $img"
-                echo "$OUTPUT"
-              exit $STATUS
+              if [ ${STATUS} -ne 0 ]; then
+                echo "Manifest creation failed for ${img}"
+                echo "${OUTPUT}"
+              exit ${STATUS}
               fi
 
-              echo "Manifest created for $img"
-              echo "$OUTPUT"
+              echo "Manifest created for ${img}"
+              echo "${OUTPUT}"
             done
           done
           set -e
 
           # Extract digest SHA for subsequent steps
-          GET_DIGEST_SHA="$(echo "$OUTPUT" | grep -oE 'sha256:[a-f0-9]{64}' | tail -1)"
+          GET_DIGEST_SHA="$(echo "${OUTPUT}" | grep -oE 'sha256:[a-f0-9]{64}' | tail -1)"
           echo "DIGEST_SHA=${GET_DIGEST_SHA}" | tee -a "${GITHUB_ENV}"
 
       # Attest container images

From b77c01b8bb91f47d2aaa0fb09b0ff2fa69d73c76 Mon Sep 17 00:00:00 2001
From: Daniel <daniel.barabasa@gmail.com>
Date: Sun, 7 Dec 2025 17:07:07 +0200
Subject: [PATCH 2/2] Further fixes for the release workflow (#6533)

---
 .github/workflows/release.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e7604b8f..7bae2e15 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -362,8 +362,7 @@ jobs:
       - name: Create manifest list, push it and extract digest SHA
         working-directory: ${{ runner.temp }}/digests
         env:
-          BASE_IMAGE: "${{ matrix.base_image }}"
-          BASE_IMAGE_TAG: "${{ matrix.base_image == 'debian' && '' || format('-{0}', matrix.base_image) }}"
+          BASE_IMAGE_TAG: "${{ matrix.base_image != 'debian' && format('-{0}', matrix.base_image) || '' }}"
           BASE_TAGS: "${{ env.BASE_TAGS }}"
           CONTAINER_REGISTRIES: "${{ env.CONTAINER_REGISTRIES }}"
         run: |
@@ -376,16 +375,16 @@ jobs:
 
               OUTPUT=$(docker buildx imagetools create \
                 -t "${img}:${tag}${BASE_IMAGE_TAG}" \
-                $(printf "${img}:${tag}-${BASE_IMAGE}@sha256:%s " *) 2>&1)
+                $(printf "${img}@sha256:%s " *) 2>&1)
               STATUS=$?
 
               if [ ${STATUS} -ne 0 ]; then
-                echo "Manifest creation failed for ${img}"
+                echo "Manifest creation failed for ${img}:${tag}${BASE_IMAGE_TAG}"
                 echo "${OUTPUT}"
               exit ${STATUS}
               fi
 
-              echo "Manifest created for ${img}"
+              echo "Manifest created for ${img}:${tag}${BASE_IMAGE_TAG}"
               echo "${OUTPUT}"
             done
           done