From dd8bc9761faf61b83ab9d0a99fd0e94a4aedb2ad Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 24 Aug 2026 11:34:45 +0200
Subject: [PATCH 1/2] feat(build-product-image): Support new structured output
 format

In https://github.com/stackabletech/docker-images/pull/1613 the
output format was changed. This commit adjusts the jq query to
deal with the new format.
---
 build-product-image/action.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build-product-image/action.yaml b/build-product-image/action.yaml
index 3b6f7ee..5d69ce1 100644
--- a/build-product-image/action.yaml
+++ b/build-product-image/action.yaml
@@ -136,7 +136,9 @@ runs:
         echo "boil-target-tags: "$(< boil-target-tags.json)
 
         # Extract the canonical image manifest tag from the boil-target-tags.json file
-        CANONICAL_IMAGE_MANIFEST_URI=$(jq --arg IMAGE_REPOSITORY "$IMAGE_REPOSITORY" --raw-output '.[$IMAGE_REPOSITORY].canonical' < boil-target-tags.json)
+        # This action only ever builds a single image in a single version. As such, we can safely
+        # target index 0 in the jq query below.
+        CANONICAL_IMAGE_MANIFEST_URI=$(jq --arg IMAGE_REPOSITORY "$IMAGE_REPOSITORY" --raw-output '.[$IMAGE_REPOSITORY][0].canonical' < boil-target-tags.json)
         CANONICAL_IMAGE_MANIFEST_TAG=$(echo "$CANONICAL_IMAGE_MANIFEST_URI" | cut -d : -f 2)
 
         [[ -n "$CANONICAL_IMAGE_MANIFEST_URI" ]]

From bdceddf2058b97411d2d60781a4575f28915909d Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 24 Aug 2026 12:02:48 +0200
Subject: [PATCH 2/2] chore(build-product-image): Also index other tags
 correctly

---
 build-product-image/action.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build-product-image/action.yaml b/build-product-image/action.yaml
index 5d69ce1..95a9c7b 100644
--- a/build-product-image/action.yaml
+++ b/build-product-image/action.yaml
@@ -148,7 +148,9 @@ runs:
         echo "CANONICAL_IMAGE_MANIFEST_TAG=$CANONICAL_IMAGE_MANIFEST_TAG" | tee -a "$GITHUB_OUTPUT"
 
         # Extract all other/additional tags and default to an empty array ([]).
-        OTHER_IMAGE_MANIFEST_URIS=$(jq --arg IMAGE_REPOSITORY "$IMAGE_REPOSITORY" --raw-output --compact-output '.[$IMAGE_REPOSITORY].others // []' < boil-target-tags.json)
+        # This action only ever builds a single image in a single version. As such, we can safely
+        # target index 0 in the jq query below.
+        OTHER_IMAGE_MANIFEST_URIS=$(jq --arg IMAGE_REPOSITORY "$IMAGE_REPOSITORY" --raw-output --compact-output '.[$IMAGE_REPOSITORY][0].others // []' < boil-target-tags.json)
         OTHER_IMAGE_MANIFEST_TAGS=$(echo "$OTHER_IMAGE_MANIFEST_URIS" | jq --raw-output --compact-output 'map(split(":")[1])')
 
         echo "OTHER_IMAGE_MANIFEST_URIS=$OTHER_IMAGE_MANIFEST_URIS" | tee -a "$GITHUB_OUTPUT"