Merge branch 'main' into renovate/dcarbone-install-jq-action-3.x

Author: korenyoni

.github/workflows/test-docker-build-complex.yml

@@ -34,6 +34,8 @@ jobs:
           build-args: |
             TEST_ARG=test_value
             SECOND_ARG=two
+          tags: |
+            type=sha,format=long,suffix=-complex,priority=1002
 
       - uses: nick-fields/assert-action@v2
         with:
@@ -42,7 +44,7 @@ jobs:
 
       - uses: nick-fields/assert-action@v2
         with:
-          expected: sha-${{ github.sha }}
+          expected: sha-${{ github.sha }}-complex
           actual: ${{ steps.current.outputs.tag }}
 
   teardown:

.github/workflows/test-docker-build-multi-platform.yml

@@ -32,6 +32,8 @@ jobs:
           login: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           platforms: linux/amd64,linux/arm64
+          tags: |
+            type=sha,format=long,suffix=-multi-platform,priority=1002
 
       - name: Inspect Image
         id: inspect
@@ -48,7 +50,7 @@ jobs:
 
       - uses: nick-fields/assert-action@v2
         with:
-          expected: sha-${{ github.sha }}
+          expected: sha-${{ github.sha }}-multi-platform
           actual: ${{ steps.current.outputs.tag }}
 
       - uses: nick-fields/assert-action@v2

.github/workflows/test-docker-build.yml

@@ -30,6 +30,8 @@ jobs:
           registry: registry.hub.docker.com
           login: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          tags: |
+            type=sha,format=long,suffix=-single-platform,priority=1002
 
       - uses: nick-fields/assert-action@v2
         with:
@@ -38,7 +40,7 @@ jobs:
 
       - uses: nick-fields/assert-action@v2
         with:
-          expected: sha-${{ github.sha }}
+          expected: sha-${{ github.sha }}-single-platform
           actual: ${{ steps.current.outputs.tag }}
 
 

README.md

@@ -97,14 +97,15 @@ Build Docker image and push it.
 | Name | Description | Default | Required |
 |------|-------------|---------|----------|
 | allow | List of extra privileged entitlement (e.g., network.host,security.insecure) | N/A | false |
+| binfmt-image | Binfmt image | public.ecr.aws/eks-distro-build-tooling/binfmt-misc:qemu-v7.0.0 | false |
 | build-args | List of build-time variables | N/A | false |
 | build-contexts | List of additional build contexts (e.g., name=path) | N/A | false |
 | buildkitd-flags | BuildKit daemon flags | --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host | false |
 | cache-from | List of external cache sources for buildx (e.g., user/app:cache, type=local,src=path/to/dir) | type=gha | false |
 | cache-to | List of cache export destinations for buildx (e.g., user/app:cache, type=local,dest=path/to/dir) | type=gha,mode=max | false |
 | debug | Enable debug mode | false | false |
 | docker-metadata-pr-head-sha | Set to `true` to tag images with the PR HEAD SHA instead of the merge commit SHA within pull requests. | false | false |
-| driver-opts | List of additional driver-specific options. (eg. image=moby/buildkit:master) | N/A | false |
+| driver-opts | List of additional driver-specific options. (eg. image=moby/buildkit:master) | image=public.ecr.aws/vend/moby/buildkit:buildx-stable-1 | false |
 | file | Dockerfile name | Dockerfile | false |
 | image\_name | Image name (excluding registry). Defaults to {{$organization/$repository}}. |  | false |
 | login | Docker login |  | false |