From 9bf9651488ee461cc8eb8f2785f25c4d68589c58 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Wed, 21 Jan 2026 22:48:00 +0100 Subject: [PATCH 1/4] Attempt to fix manifest annotations --- .github/workflows/build.yml | 10 ++++++++++ create-manifest-for-target/action.yml | 5 ++++- create-manifest/action.yml | 5 ++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d78b7ed..ffef7ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,14 @@ on: description: Dockerfile path type: string default: Dockerfile + title: + description: Custom image title (overrides repository name) + type: string + required: false + description: + description: Custom image description (overrides repository description) + type: string + required: false jobs: build: @@ -47,3 +55,5 @@ jobs: dockerfile: ${{ inputs.dockerfile }} platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} + title: ${{ inputs.title }} + description: ${{ inputs.description }} diff --git a/create-manifest-for-target/action.yml b/create-manifest-for-target/action.yml index 1feeda4..7f4edfb 100644 --- a/create-manifest-for-target/action.yml +++ b/create-manifest-for-target/action.yml @@ -65,7 +65,10 @@ runs: shell: bash run: | mapfile -t tags < <(jq -r '.tags[] | "-t\n" + .' <<< "$DOCKER_METADATA_OUTPUT_JSON") - mapfile -t annotations < <(jq -r '.labels | to_entries[] | "--annotation\nindex:" + .key + "=" + .value + "\n--annotation\nmanifest:" + .key + "=" + .value' <<< "$DOCKER_METADATA_OUTPUT_JSON") + mapfile -t annotations < <(jq -r ' + .labels | to_entries[] | select(.value != "") | + "--annotation\nindex:" + .key + "=" + .value + "\n--annotation\nmanifest-descriptor:" + .key + "=" + .value + ' <<< "$DOCKER_METADATA_OUTPUT_JSON") images=$(printf '${{ inputs.image-name }}@sha256:%s ' *) docker buildx imagetools create "${tags[@]}" "${annotations[@]}" $images diff --git a/create-manifest/action.yml b/create-manifest/action.yml index 659dadc..074ff1d 100644 --- a/create-manifest/action.yml +++ b/create-manifest/action.yml @@ -55,7 +55,10 @@ runs: shell: bash run: | mapfile -t tags < <(jq -r '.tags[] | "-t\n" + .' <<< "$DOCKER_METADATA_OUTPUT_JSON") - mapfile -t annotations < <(jq -r '.labels | to_entries[] | "--annotation\nindex:" + .key + "=" + .value + "\n--annotation\nmanifest:" + .key + "=" + .value' <<< "$DOCKER_METADATA_OUTPUT_JSON") + mapfile -t annotations < <(jq -r ' + .labels | to_entries[] | select(.value != "") | + "--annotation\nindex:" + .key + "=" + .value + "\n--annotation\nmanifest-descriptor:" + .key + "=" + .value + ' <<< "$DOCKER_METADATA_OUTPUT_JSON") images=$(printf '${{ inputs.image-name }}@sha256:%s ' *) docker buildx imagetools create "${tags[@]}" "${annotations[@]}" $images From 3b5f9f66608c692642c689d15b19e363a9139e4f Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Wed, 21 Jan 2026 22:48:27 +0100 Subject: [PATCH 2/4] Temp debug statements --- create-manifest-for-target/action.yml | 6 ++++++ create-manifest/action.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/create-manifest-for-target/action.yml b/create-manifest-for-target/action.yml index 7f4edfb..7006400 100644 --- a/create-manifest-for-target/action.yml +++ b/create-manifest-for-target/action.yml @@ -64,6 +64,9 @@ runs: working-directory: ${{ runner.temp }}/digests/${{ env.SAFE_IMAGE_NAME }}/${{ inputs.target }} shell: bash run: | + echo "DEBUG: DOCKER_METADATA_OUTPUT_JSON labels:" + jq '.labels' <<< "$DOCKER_METADATA_OUTPUT_JSON" + mapfile -t tags < <(jq -r '.tags[] | "-t\n" + .' <<< "$DOCKER_METADATA_OUTPUT_JSON") mapfile -t annotations < <(jq -r ' .labels | to_entries[] | select(.value != "") | @@ -71,6 +74,9 @@ runs: ' <<< "$DOCKER_METADATA_OUTPUT_JSON") images=$(printf '${{ inputs.image-name }}@sha256:%s ' *) + echo "DEBUG: annotations array:" + printf '%s\n' "${annotations[@]}" + docker buildx imagetools create "${tags[@]}" "${annotations[@]}" $images - name: Inspect image shell: bash diff --git a/create-manifest/action.yml b/create-manifest/action.yml index 074ff1d..647d8b4 100644 --- a/create-manifest/action.yml +++ b/create-manifest/action.yml @@ -54,6 +54,9 @@ runs: working-directory: ${{ runner.temp }}/digests shell: bash run: | + echo "DEBUG: DOCKER_METADATA_OUTPUT_JSON labels:" + jq '.labels' <<< "$DOCKER_METADATA_OUTPUT_JSON" + mapfile -t tags < <(jq -r '.tags[] | "-t\n" + .' <<< "$DOCKER_METADATA_OUTPUT_JSON") mapfile -t annotations < <(jq -r ' .labels | to_entries[] | select(.value != "") | @@ -61,6 +64,9 @@ runs: ' <<< "$DOCKER_METADATA_OUTPUT_JSON") images=$(printf '${{ inputs.image-name }}@sha256:%s ' *) + echo "DEBUG: annotations array:" + printf '%s\n' "${annotations[@]}" + docker buildx imagetools create "${tags[@]}" "${annotations[@]}" $images - name: Inspect image shell: bash From 2287ebc65bf279fac82a021c61166f122d343661 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Wed, 21 Jan 2026 22:49:28 +0100 Subject: [PATCH 3/4] Bump version to rc.1 --- .github/workflows/build-php.yml | 6 +++--- .github/workflows/build.yml | 2 +- .github/workflows/merge-php.yml | 6 +++--- .github/workflows/merge.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml index eefcef8..80e1e1b 100644 --- a/.github/workflows/build-php.yml +++ b/.github/workflows/build-php.yml @@ -43,21 +43,21 @@ jobs: id: buildx uses: docker/setup-buildx-action@v3.1.0 - name: Build and Push by digest (runtime) - uses: Ilyes512/github-actions/build-target@1.0.9 + uses: Ilyes512/github-actions/build-target@1.0.10-rc.1 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} dockerfile: ${{ inputs.dockerfile }} target: runtime - name: Build and Push by digest (builder) - uses: Ilyes512/github-actions/build-target@1.0.9 + uses: Ilyes512/github-actions/build-target@1.0.10-rc.1 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} dockerfile: ${{ inputs.dockerfile }} target: builder - name: Build and Push by digest (builder_nodejs) - uses: Ilyes512/github-actions/build-target@1.0.9 + uses: Ilyes512/github-actions/build-target@1.0.10-rc.1 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffef7ab..69b7009 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: with: string: ${{ inputs.image-name }} - name: Build and Push by digest - uses: Ilyes512/github-actions/build-image@1.0.9 + uses: Ilyes512/github-actions/build-image@1.0.10-rc.1 with: dockerfile: ${{ inputs.dockerfile }} platform: ${{ inputs.platform }} diff --git a/.github/workflows/merge-php.yml b/.github/workflows/merge-php.yml index 6be2ac7..a57fdd6 100644 --- a/.github/workflows/merge-php.yml +++ b/.github/workflows/merge-php.yml @@ -59,21 +59,21 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Create Manifest (runtime) - uses: Ilyes512/github-actions/create-manifest-for-target@1.0.9 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.10-rc.1 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: runtime description: ${{ inputs.description-runtime }} title: ${{ inputs.title-runtime }} - name: Create Manifest (builder) - uses: Ilyes512/github-actions/create-manifest-for-target@1.0.9 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.10-rc.1 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: builder description: ${{ inputs.description-builder }} title: ${{ inputs.title-builder }} - name: Create Manifest (builder_nodejs) - uses: Ilyes512/github-actions/create-manifest-for-target@1.0.9 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.10-rc.1 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: builder_nodejs diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 0099d83..62612be 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -42,7 +42,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Create Manifest - uses: Ilyes512/github-actions/create-manifest@1.0.9 + uses: Ilyes512/github-actions/create-manifest@1.0.10-rc.1 with: image-name: ${{ steps.image_name.outputs.lowercase }} title: ${{ inputs.title }} From eb824e43add533660b8bd9ce1bde91f2c9060336 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Wed, 21 Jan 2026 22:51:10 +0100 Subject: [PATCH 4/4] Bump version --- .github/workflows/build-php.yml | 6 +++--- .github/workflows/build.yml | 2 +- .github/workflows/merge-php.yml | 6 +++--- .github/workflows/merge.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml index 80e1e1b..d78b374 100644 --- a/.github/workflows/build-php.yml +++ b/.github/workflows/build-php.yml @@ -43,21 +43,21 @@ jobs: id: buildx uses: docker/setup-buildx-action@v3.1.0 - name: Build and Push by digest (runtime) - uses: Ilyes512/github-actions/build-target@1.0.10-rc.1 + uses: Ilyes512/github-actions/build-target@1.0.10 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} dockerfile: ${{ inputs.dockerfile }} target: runtime - name: Build and Push by digest (builder) - uses: Ilyes512/github-actions/build-target@1.0.10-rc.1 + uses: Ilyes512/github-actions/build-target@1.0.10 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} dockerfile: ${{ inputs.dockerfile }} target: builder - name: Build and Push by digest (builder_nodejs) - uses: Ilyes512/github-actions/build-target@1.0.10-rc.1 + uses: Ilyes512/github-actions/build-target@1.0.10 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69b7009..1b178dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: with: string: ${{ inputs.image-name }} - name: Build and Push by digest - uses: Ilyes512/github-actions/build-image@1.0.10-rc.1 + uses: Ilyes512/github-actions/build-image@1.0.10 with: dockerfile: ${{ inputs.dockerfile }} platform: ${{ inputs.platform }} diff --git a/.github/workflows/merge-php.yml b/.github/workflows/merge-php.yml index a57fdd6..fff93a8 100644 --- a/.github/workflows/merge-php.yml +++ b/.github/workflows/merge-php.yml @@ -59,21 +59,21 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Create Manifest (runtime) - uses: Ilyes512/github-actions/create-manifest-for-target@1.0.10-rc.1 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.10 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: runtime description: ${{ inputs.description-runtime }} title: ${{ inputs.title-runtime }} - name: Create Manifest (builder) - uses: Ilyes512/github-actions/create-manifest-for-target@1.0.10-rc.1 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.10 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: builder description: ${{ inputs.description-builder }} title: ${{ inputs.title-builder }} - name: Create Manifest (builder_nodejs) - uses: Ilyes512/github-actions/create-manifest-for-target@1.0.10-rc.1 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.10 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: builder_nodejs diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 62612be..e3612be 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -42,7 +42,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Create Manifest - uses: Ilyes512/github-actions/create-manifest@1.0.10-rc.1 + uses: Ilyes512/github-actions/create-manifest@1.0.10 with: image-name: ${{ steps.image_name.outputs.lowercase }} title: ${{ inputs.title }}