Merge branch 'main' into renovate/docker-build-push-action-6.x

Author: korenyoni

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 |

action.yml

@@ -21,6 +21,11 @@ inputs:
   driver-opts:
     description: 'List of additional driver-specific options. (eg. image=moby/buildkit:master)'
     required: false
+    default: image=public.ecr.aws/vend/moby/buildkit:buildx-stable-1
+  binfmt-image:
+    description: 'Binfmt image'
+    required: false
+    default: public.ecr.aws/eks-distro-build-tooling/binfmt-misc:qemu-v7.0.0
   workdir:
     description: 'Working directory'
     required: false
@@ -179,13 +184,15 @@ runs:
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
+      with:
+        image: ${{ inputs.binfmt-image }}
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
       with:
         endpoint: buildx-context
         buildkitd-flags: "${{ inputs.debug == 'true' && '--debug' || '' }} ${{ inputs.buildkitd-flags }}" 
-        driver-opts: ${{ inputs.driver-opts }}
+        driver-opts: "${{ inputs.driver-opts }}"
 
     - name: Login
       uses: docker/login-action@v3