From 5b99d10df28d7c6a7a9bbaee2afe01af6b0fce18 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Wed, 21 Jan 2026 23:09:08 +0100 Subject: [PATCH 1/3] Use oci-mediatypes --- build-image/action.yml | 2 +- build-target/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-image/action.yml b/build-image/action.yml index 270da97..4987e18 100644 --- a/build-image/action.yml +++ b/build-image/action.yml @@ -49,7 +49,7 @@ runs: platforms: ${{ inputs.platform }} labels: ${{ steps.meta.outputs.labels }} provenance: false - outputs: type=image,name=${{ inputs.image-name }},push-by-digest=true,name-canonical=true + outputs: type=image,name=${{ inputs.image-name }},push-by-digest=true,name-canonical=true,oci-mediatypes=true cache-from: type=gha,scope=${{ inputs.dockerfile }}-${{ env.PLATFORM_PAIR }} cache-to: type=gha,mode=max,scope=${{ inputs.dockerfile }}-${{ env.PLATFORM_PAIR }} - name: Export digest diff --git a/build-target/action.yml b/build-target/action.yml index 586a942..5915aca 100644 --- a/build-target/action.yml +++ b/build-target/action.yml @@ -57,7 +57,7 @@ runs: target: ${{ inputs.target }} labels: ${{ steps.meta.outputs.labels }} provenance: false - outputs: type=image,name=${{ inputs.image-name }},push-by-digest=true,name-canonical=true + outputs: type=image,name=${{ inputs.image-name }},push-by-digest=true,name-canonical=true,oci-mediatypes=true cache-from: type=gha,scope=${{ inputs.dockerfile }}-${{ env.PLATFORM_PAIR }}-${{ inputs.target }} cache-to: type=gha,mode=max,scope=${{ inputs.dockerfile }}-${{ env.PLATFORM_PAIR }}-${{ inputs.target }} - name: Export digest (${{ inputs.target }}) From 29db757cfbf5c09406e0c3379d26bf850f1e8f15 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Wed, 21 Jan 2026 23:09:47 +0100 Subject: [PATCH 2/3] Revert "Temp debug statements" This reverts commit 3b5f9f66608c692642c689d15b19e363a9139e4f. --- create-manifest-for-target/action.yml | 6 ------ create-manifest/action.yml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/create-manifest-for-target/action.yml b/create-manifest-for-target/action.yml index 7006400..7f4edfb 100644 --- a/create-manifest-for-target/action.yml +++ b/create-manifest-for-target/action.yml @@ -64,9 +64,6 @@ 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 != "") | @@ -74,9 +71,6 @@ 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 647d8b4..074ff1d 100644 --- a/create-manifest/action.yml +++ b/create-manifest/action.yml @@ -54,9 +54,6 @@ 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 != "") | @@ -64,9 +61,6 @@ 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 bc86d04b490b3333ab6a1e45057fdb1104b9dfa3 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Wed, 21 Jan 2026 23:10:33 +0100 Subject: [PATCH 3/3] Version bump --- .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 d78b374..4ff8e0a 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 + uses: Ilyes512/github-actions/build-target@1.0.11 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 + uses: Ilyes512/github-actions/build-target@1.0.11 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 + uses: Ilyes512/github-actions/build-target@1.0.11 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b178dc..7056d78 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 + uses: Ilyes512/github-actions/build-image@1.0.11 with: dockerfile: ${{ inputs.dockerfile }} platform: ${{ inputs.platform }} diff --git a/.github/workflows/merge-php.yml b/.github/workflows/merge-php.yml index fff93a8..08f6aeb 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 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.11 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 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.11 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 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.11 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: builder_nodejs diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index e3612be..7b20bf2 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 + uses: Ilyes512/github-actions/create-manifest@1.0.11 with: image-name: ${{ steps.image_name.outputs.lowercase }} title: ${{ inputs.title }}