.dockerignore

@@ -1,12 +1,2 @@
 /coverage
-
+/node_modules
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*

.gitattributes

@@ -1,4 +1,2 @@
-/.yarn/releases/** binary
-/.yarn/plugins/** binary
 /dist/** linguist-generated=true
 /lib/** linguist-generated=true

.github/CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-# Code of conduct
-
-- [Moby community guidelines](https://github.com/moby/moby/blob/master/CONTRIBUTING.md#moby-community-guidelines)

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,101 +0,0 @@
-# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
-name: Bug Report
-description: Report a bug
-labels:
-  - status/triage
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for taking the time to report a bug!
-        If this is a security issue please report it to the [Docker Security team](mailto:security@docker.com).
-
-  - type: checkboxes
-    attributes:
-      label: Contributing guidelines
-      description: >
-        Make sure you've read the contributing guidelines before proceeding.
-      options:
-        - label: I've read the [contributing guidelines](https://github.com/docker/setup-buildx-action/blob/master/.github/CONTRIBUTING.md) and wholeheartedly agree
-          required: true
-
-  - type: checkboxes
-    attributes:
-      label: "I've found a bug, and:"
-      description: |
-        Make sure that your request fulfills all of the following requirements.
-        If one requirement cannot be satisfied, explain in detail why.
-      options:
-        - label: The documentation does not mention anything about my problem
-        - label: There are no open or closed issues that are related to my problem
-
-  - type: textarea
-    attributes:
-      label: Description
-      description: >
-        Provide a brief description of the bug in 1-2 sentences.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Expected behaviour
-      description: >
-        Describe precisely what you'd expect to happen.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Actual behaviour
-      description: >
-        Describe precisely what is actually happening.
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Repository URL
-      description: >
-        Enter the URL of the repository where you are experiencing the
-        issue. If your repository is private, provide a link to a minimal
-        repository that reproduces the issue.
-
-  - type: input
-    attributes:
-      label: Workflow run URL
-      description: >
-        Enter the URL of the GitHub Action workflow run if public (e.g.
-        `https://github.com/<user>/<repo>/actions/runs/<id>`)
-
-  - type: textarea
-    attributes:
-      label: YAML workflow
-      description: |
-        Provide the YAML of the workflow that's causing the issue.
-        Make sure to remove any sensitive information.
-      render: yaml
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Workflow logs
-      description: >
-        [Attach](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files)
-        the [log file of your workflow run](https://docs.github.com/en/actions/managing-workflow-runs/using-workflow-run-logs#downloading-logs)
-        and make sure to remove any sensitive information.
-
-  - type: textarea
-    attributes:
-      label: BuildKit logs
-      description: >
-        If applicable, provide the [BuildKit container logs](https://docs.docker.com/build/ci/github-actions/configure-builder/#buildkit-container-logs)
-      render: text
-
-  - type: textarea
-    attributes:
-      label: Additional info
-      description: |
-        Provide any additional information that could be useful.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+### Behaviour
+
+#### Steps to reproduce this issue
+
+1.
+2.
+3.
+
+#### Expected behaviour
+
+> Tell us what should happen
+
+#### Actual behaviour
+
+> Tell us what happens instead
+
+### Configuration
+
+* Repository URL (if public): 
+* Build URL (if public): 
+
+```yml
+# paste your YAML workflow file here and remove sensitive data
+```
+
+### Logs
+
+> Download the [log file of your build](https://docs.github.com/en/actions/managing-workflow-runs/using-workflow-run-logs#downloading-logs)
+> and [attach it](https://docs.github.com/en/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests) to this issue.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +0,0 @@
-# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
-blank_issues_enabled: true
-contact_links:
-  - name: Questions and Discussions
-    url: https://github.com/docker/setup-buildx-action/discussions/new
-    about: Use Github Discussions to ask questions and/or open discussion topics.
-  - name: Documentation
-    url: https://docs.docker.com/build/ci/github-actions/
-    about: Read the documentation.

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,15 +0,0 @@
-# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
-name: Feature request
-description: Missing functionality? Come tell us about it!
-labels:
-  - kind/enhancement
-  - status/triage
-
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: What is the feature you want to see?
-    validations:
-      required: true

.github/SECURITY.md

@@ -1,12 +0,0 @@
-# Reporting security issues
-
-The project maintainers take security seriously. If you discover a security
-issue, please bring it to their attention right away!
-
-**Please _DO NOT_ file a public issue**, instead send your report privately to
-[security@docker.com](mailto:security@docker.com).
-
-Security reports are greatly appreciated, and we will publicly thank you for it.
-We also like to send gifts—if you'd like Docker swag, make sure to let
-us know. We currently do not offer a paid security bounty program, but are not
-ruling it out in the future.

.github/SUPPORT.md

@@ -0,0 +1,31 @@
+# Support [![](https://isitmaintained.com/badge/resolution/docker/setup-buildx-action.svg)](https://isitmaintained.com/project/docker/setup-buildx-action)
+
+First, [be a good guy](https://github.com/kossnocorp/etiquette/blob/master/README.md).
+
+## Reporting an issue
+
+Please do a search in [open issues](https://github.com/docker/setup-buildx-action/issues?utf8=%E2%9C%93&q=) to see if the issue or feature request has already been filed.
+
+If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment.
+
+:+1: - upvote
+
+:-1: - downvote
+
+If you cannot find an existing issue that describes your bug or feature, submit an issue using the guidelines below.
+
+## Writing good bug reports and feature requests
+
+File a single issue per problem and feature request.
+
+* Do not enumerate multiple bugs or feature requests in the same issue.
+* Do not add your issue as a comment to an existing issue unless it's for the identical input. Many issues look similar, but have different causes.
+
+The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix.
+
+You are now ready to [create a new issue](https://github.com/docker/setup-buildx-action/issues/new/choose)!
+
+## Closure policy
+
+* Issues that don't have the information requested above (when applicable) will be closed immediately and the poster directed to the support guidelines.
+* Issues that go a week without a response from original poster are subject to closure at our discretion.

.github/workflows/ci.yml

@@ -5,7 +5,6 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  workflow_dispatch:
   schedule:
     - cron: '0 10 * * *'
   push:
@@ -26,9 +25,8 @@ jobs:
           - ""
           - "latest"
           - "v0.4.1"
-          - "cloud:latest"
-          - "cloud:v0.11.2-desktop.2"
           - "lab:latest"
+          - "lab:v0.11.2-desktop.2"
     steps:
       -
         name: Checkout
@@ -102,7 +100,7 @@ jobs:
           EOL
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
       -
         name: Set up Docker Buildx
         uses: ./
@@ -110,7 +108,7 @@ jobs:
           buildkitd-flags: --debug
       -
         name: Build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v4
         with:
           context: .
           platforms: linux/amd64,linux/arm64,linux/ppc64le
@@ -253,10 +251,10 @@ jobs:
         uses: ./
         with:
           buildkitd-flags: --debug
-          buildkitd-config: /tmp/buildkitd.toml
+          config: /tmp/buildkitd.toml
       -
         name: Build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v4
         with:
           context: .
 
@@ -277,13 +275,13 @@ jobs:
         uses: ./
         with:
           buildkitd-flags: --debug
-          buildkitd-config-inline: |
+          config-inline: |
             debug = true
             [registry."docker.io"]
               mirrors = ["mirror.gcr.io"]
       -
         name: Build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v4
         with:
           context: .
 
@@ -304,7 +302,7 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: ${{ matrix.qemu-platforms }}
       -
@@ -474,7 +472,7 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
       -
         name: Set up Docker Buildx
         uses: ./
@@ -517,12 +515,11 @@ jobs:
           cleanup: ${{ matrix.cleanup }}
 
   k3s:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         version:
-          - latest
           - v0.11.0
           - v0.10.5
     steps:
@@ -531,7 +528,9 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Install k3s
-        uses: crazy-max/.github/.github/actions/install-k3s@a94383ec9e125b23907fb6fcebf7ff87964595e5
+        uses: crazy-max/.github/.github/actions/install-k3s@605d30d5ae97f6680578ace4b56645af79343e60
+        with:
+          version: "v1.21.2-k3s1"
       -
         name: Set up Docker Buildx
         id: buildx
@@ -564,85 +563,3 @@ jobs:
         uses: docker/build-push-action@master
         with:
           context: .
-
-  cache-binary:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        cache:
-          - true
-          - false
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Set up Docker Buildx
-        uses: ./
-        with:
-          version: v0.11.2
-          cache-binary: ${{ matrix.cache }}
-
-  windows-error:
-    runs-on: windows-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Set up Docker Buildx
-        id: buildx
-        continue-on-error: true
-        uses: ./
-      -
-        name: Check
-        run: |
-          echo "${{ toJson(steps.buildx) }}"
-          if [ "${{ steps.buildx.outcome }}" != "failure" ] || [ "${{ steps.buildx.conclusion }}" != "success" ]; then
-            echo "::error::Should have failed"
-            exit 1
-          fi
-        shell: bash
-
-  keep-state:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Set up Docker Buildx
-        uses: ./
-        with:
-          name: foo
-          keep-state: true
-      -
-        name: Set up Docker Buildx
-        uses: ./
-        with:
-          name: foo
-          keep-state: true
-
-  keep-state-error:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Set up Docker Buildx
-        id: buildx
-        continue-on-error: true
-        uses: ./
-        with:
-          driver: docker
-          keep-state: true
-      -
-        name: Check
-        run: |
-          echo "${{ toJson(steps.buildx) }}"
-          if [ "${{ steps.buildx.outcome }}" != "failure" ] || [ "${{ steps.buildx.conclusion }}" != "success" ]; then
-            echo "::error::Should have failed"
-            exit 1
-          fi

.github/workflows/pr-assign-author.yml

@@ -1,17 +0,0 @@
-name: pr-assign-author
-
-permissions:
-  contents: read
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - reopened
-
-jobs:
-  run:
-    uses: crazy-max/.github/.github/workflows/pr-assign-author.yml@1b673f36fad86812f538c1df9794904038a23cbf
-    permissions:
-      contents: read
-      pull-requests: write

.github/workflows/publish.yml

@@ -1,21 +0,0 @@
-name: publish
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-      packages: write
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Publish
-        uses: actions/publish-immutable-action@v0.0.4

.github/workflows/test.yml

@@ -23,12 +23,11 @@ jobs:
         uses: ./
       -
         name: Test
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v3
         with:
           targets: test
       -
         name: Upload coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v3
         with:
-          files: ./coverage/clover.xml
+          file: ./coverage/clover.xml
-          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/validate.yml

@@ -15,17 +15,16 @@ jobs:
   prepare:
     runs-on: ubuntu-latest
     outputs:
-      targets: ${{ steps.generate.outputs.targets }}
+      targets: ${{ steps.targets.outputs.matrix }}
     steps:
       -
         name: Checkout
         uses: actions/checkout@v4
       -
-        name: List targets
+        name: Targets matrix
-        id: generate
+        id: targets
-        uses: docker/bake-action/subaction/list-targets@v6
+        run: |
-        with:
+          echo "matrix=$(docker buildx bake validate --print | jq -cr '.group.validate.targets')" >> $GITHUB_OUTPUT
-          target: validate
 
   validate:
     runs-on: ubuntu-latest
@@ -36,8 +35,11 @@ jobs:
       matrix:
         target: ${{ fromJson(needs.prepare.outputs.targets) }}
     steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
       -
         name: Validate
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v3
         with:
           targets: ${{ matrix.target }}

.gitignore

@@ -1,5 +1,12 @@
-# https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore
+/.dev
+node_modules
+lib
 
+# Jetbrains
+/.idea
+/*.iml
+
+# Rest of the file pulled from https://github.com/github/gitignore/blob/master/Node.gitignore
 # Logs
 logs
 *.log
@@ -7,7 +14,6 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
-.pnpm-debug.log*
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
@@ -18,14 +24,34 @@ pids
 *.seed
 *.pid.lock
 
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
 # Coverage directory used by tools like istanbul
 coverage
 *.lcov
 
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
 # Dependency directories
-node_modules/
 jspm_packages/
 
+# TypeScript v1 declaration files
+typings/
+
 # TypeScript cache
 *.tsbuildinfo
 
@@ -35,19 +61,36 @@ jspm_packages/
 # Optional eslint cache
 .eslintcache
 
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
 # Yarn Integrity file
 .yarn-integrity
 
-# dotenv environment variable files
+# dotenv environment variables file
 .env
-.env.development.local
+.env.test
-.env.test.local
-.env.production.local
-.env.local
 
-# yarn v2
+# parcel-bundler cache (https://parceljs.org/)
-.yarn/cache
+.cache
-.yarn/unplugged
+
-.yarn/build-state.yml
+# next.js build output
-.yarn/install-state.gz
+.next
-.pnp.*
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/

.prettierignore

@@ -1,6 +0,0 @@
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# yarn v2
-.yarn/

.yarnrc.yml

@@ -1,17 +0,0 @@
-# https://yarnpkg.com/configuration/yarnrc
-
-compressionLevel: mixed
-enableGlobalCache: false
-enableHardenedMode: true
-
-logFilters:
-  - code: YN0013
-    level: discard
-  - code: YN0019
-    level: discard
-  - code: YN0076
-    level: discard
-  - code: YN0086
-    level: discard
-
-nodeLinker: node-modules

README.md

@@ -42,15 +42,15 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       -
         # Add support for more platforms with QEMU (optional)
         # https://github.com/docker/setup-qemu-action
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
 ```
 
 ## Configuring your builder
@@ -71,7 +71,7 @@ jobs:
 
 ### inputs
 
-The following inputs can be used as `step.with` keys:
+Following inputs can be used as `step.with` keys:
 
 > `List` type is a newline-delimited string
 > ```yaml
@@ -85,42 +85,33 @@ The following inputs can be used as `step.with` keys:
 > platforms: linux/amd64,linux/arm64
 > ```
 
-| Name                         | Type     | Default            | Description                                                                                                                                                                 |
+| Name              | Type     | Default            | Description                                                                                                                                                                  |
-|------------------------------|----------|--------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|-------------------|----------|--------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `version`                    | String   |                    | [Buildx](https://github.com/docker/buildx) version. (eg. `v0.3.0`, `latest`, `https://github.com/docker/buildx.git#master`)                                                 |
+| `version`         | String   |                    | [Buildx](https://github.com/docker/buildx) version. (eg. `v0.3.0`, `latest`, `https://github.com/docker/buildx.git#master`)                                                  |
-| `name`                       | String   |                    | Name of the builder. If not specified, one will be generated or if it already exists, it will be used instead of creating a new one                                         |
+| `driver`          | String   | `docker-container` | Sets the [builder driver](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver) to be used                                                             |
-| `driver`                     | String   | `docker-container` | Sets the [builder driver](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver) to be used                                                            |
+| `driver-opts`     | List     |                    | List of additional [driver-specific options](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver-opt) (eg. `image=moby/buildkit:master`)              |
-| `driver-opts`                | List     |                    | List of additional [driver-specific options](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver-opt) (eg. `image=moby/buildkit:master`)             |
+| `buildkitd-flags` | String   |                    | [Flags for buildkitd](https://docs.docker.com/engine/reference/commandline/buildx_create/#buildkitd-flags) daemon                                                            |
-| `buildkitd-flags`            | String   |                    | [BuildKit daemon flags](https://docs.docker.com/engine/reference/commandline/buildx_create/#buildkitd-flags)                                                                |
+| `install`         | Bool     | `false`            | Sets up `docker build` command as an alias to `docker buildx`                                                                                                                |
-| `buildkitd-config` \*        | String   |                    | [BuildKit daemon config file](https://docs.docker.com/engine/reference/commandline/buildx_create/#config)                                                                   |
+| `use`             | Bool     | `true`             | Switch to this builder instance                                                                                                                                              |
-| `buildkitd-config-inline` \* | String   |                    | Same as `buildkitd-config` but inline                                                                                                                                       |
+| `endpoint`        | String   |                    | [Optional address for docker socket](https://docs.docker.com/engine/reference/commandline/buildx_create/#description) or context from `docker context ls`                    |
-| `install`                    | Bool     | `false`            | Sets up `docker build` command as an alias to `docker buildx`                                                                                                               |
+| `platforms`       | List/CSV |                    | Fixed [platforms](https://docs.docker.com/engine/reference/commandline/buildx_create/#platform) for current node. If not empty, values take priority over the detected ones. |
-| `use`                        | Bool     | `true`             | Switch to this builder instance                                                                                                                                             |
+| `config`¹         | String   |                    | [BuildKit config file](https://docs.docker.com/engine/reference/commandline/buildx_create/#config)                                                                           |
-| `endpoint`                   | String   |                    | [Optional address for docker socket](https://docs.docker.com/engine/reference/commandline/buildx_create/#description) or context from `docker context ls`                   |
+| `config-inline`¹  | String   |                    | Same as `config` but inline                                                                                                                                                  |
-| `platforms`                  | List/CSV |                    | Fixed [platforms](https://docs.docker.com/engine/reference/commandline/buildx_create/#platform) for current node. If not empty, values take priority over the detected ones |
+| `append`          | YAML     |                    | [Append additional nodes](docs/advanced/append-nodes.md) to the builder                                                                                                      |
-| `append`                     | YAML     |                    | [Append additional nodes](https://docs.docker.com/build/ci/github-actions/configure-builder/#append-additional-nodes-to-the-builder) to the builder                         |
+| `cleanup`         | Bool     | `true`             | Cleanup temp files and remove builder at the end of a job                                                                                                                    |
-| `keep-state`                 | Bool     | `false`            | Keep BuildKit state on `cleanup`. This is only useful on persistent self-hosted runners                                                                                     |
-| `cache-binary`               | Bool     | `true`             | Cache buildx binary to GitHub Actions cache backend                                                                                                                         |
-| `cleanup`                    | Bool     | `true`             | Cleanup temp files and remove builder at the end of a job                                                                                                                   |
 
-> [!IMPORTANT]
+> * ¹ `config` and `config-inline` are mutually exclusive
-> If you set the `buildkitd-flags` input, the default flags (`--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host`)
-> will be reset. If you want to retain the default behavior, make sure to
-> include these flags in your custom `buildkitd-flags` value.
-
-> [!NOTE]
-> `buildkitd-config` and `buildkitd-config-inline` are mutually exclusive.
 
 ### outputs
 
-The following outputs are available:
+Following outputs are available
 
-| Name        | Type   | Description                                         |
+| Name        | Type   | Description                                     |
-|-------------|--------|-----------------------------------------------------|
+|-------------|--------|-------------------------------------------------|
-| `name`      | String | Builder name                                        |
+| `name`      | String | Builder name                                    |
-| `driver`    | String | Builder driver                                      |
+| `driver`    | String | Builder driver                                  |
-| `platforms` | String | Builder node platforms (preferred and/or available) |
+| `platforms` | String | Builder node platforms (preferred or available) |
-| `nodes`     | JSON   | Builder [nodes metadata](#nodes-output)             |
+| `nodes`     | JSON   | Builder [nodes metadata](#nodes-output)         |
 
 ### environment variables
 

__tests__/context.test.ts

@@ -1,36 +1,14 @@
 import {beforeEach, describe, expect, jest, test} from '@jest/globals';
-import * as fs from 'fs';
+import * as uuid from 'uuid';
-import * as path from 'path';
 import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx';
-import {Context} from '@docker/actions-toolkit/lib/context';
 import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
 import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
-import {Node} from '@docker/actions-toolkit/lib/types/buildx/builder';
+import {Node} from '@docker/actions-toolkit/lib/types/builder';
 
 import * as context from '../src/context';
 
-const fixturesDir = path.join(__dirname, 'fixtures');
+jest.mock('uuid');
-// prettier-ignore
+jest.spyOn(uuid, 'v4').mockReturnValue('9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d');
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'setup-buildx-jest');
-const tmpName = path.join(tmpDir, '.tmpname-jest');
-
-jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
-  if (!fs.existsSync(tmpDir)) {
-    fs.mkdirSync(tmpDir, {recursive: true});
-  }
-  return tmpDir;
-});
-
-jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
-  return tmpName;
-});
-
-jest.mock('crypto', () => {
-  return {
-    ...(jest.requireActual('crypto') as object),
-    randomUUID: jest.fn(() => '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d')
-  };
-});
 
 jest.spyOn(Docker, 'context').mockImplementation((): Promise<string> => {
   return Promise.resolve('default');
@@ -54,9 +32,7 @@ describe('getCreateArgs', () => {
       new Map<string, string>([
         ['install', 'false'],
         ['use', 'true'],
-        ['cache-binary', 'true'],
         ['cleanup', 'true'],
-        ['keep-state', 'false']
       ]),
       [
         'create',
@@ -73,9 +49,7 @@ describe('getCreateArgs', () => {
         ['driver', 'docker'],
         ['install', 'false'],
         ['use', 'true'],
-        ['cache-binary', 'true'],
         ['cleanup', 'true'],
-        ['keep-state', 'false']
       ]),
       [
         'create',
@@ -92,9 +66,7 @@ describe('getCreateArgs', () => {
         ['install', 'false'],
         ['use', 'false'],
         ['driver-opts', 'image=moby/buildkit:master\nnetwork=host'],
-        ['cache-binary', 'true'],
         ['cleanup', 'true'],
-        ['keep-state', 'false']
       ]),
       [
         'create',
@@ -113,9 +85,7 @@ describe('getCreateArgs', () => {
         ['endpoint', 'tls://foo:1234'],
         ['install', 'false'],
         ['use', 'true'],
-        ['cache-binary', 'true'],
         ['cleanup', 'true'],
-        ['keep-state', 'false']
       ]),
       [
         'create',
@@ -134,9 +104,7 @@ describe('getCreateArgs', () => {
         ['endpoint', 'tls://foo:1234'],
         ['install', 'false'],
         ['use', 'true'],
-        ['cache-binary', 'true'],
         ['cleanup', 'true'],
-        ['keep-state', 'false']
       ]),
       [
         'create',
@@ -154,9 +122,7 @@ describe('getCreateArgs', () => {
         ['install', 'false'],
         ['use', 'false'],
         ['driver-opts', `"env.no_proxy=localhost,127.0.0.1,.mydomain"`],
-        ['cache-binary', 'true'],
         ['cleanup', 'true'],
-        ['keep-state', 'false'],
       ]),
       [
         'create',
@@ -173,9 +139,7 @@ describe('getCreateArgs', () => {
         ['install', 'false'],
         ['use', 'false'],
         ['platforms', 'linux/amd64\n"linux/arm64,linux/arm/v7"'],
-        ['cache-binary', 'true'],
         ['cleanup', 'true'],
-        ['keep-state', 'false'],
       ]),
       [
         'create',
@@ -192,111 +156,14 @@ describe('getCreateArgs', () => {
         ['install', 'false'],
         ['use', 'false'],
         ['driver', 'unknown'],
-        ['cache-binary', 'true'],
         ['cleanup', 'true'],
-        ['keep-state', 'false'],
       ]),
       [
         'create',
         '--name', 'builder-9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d',
         '--driver', 'unknown',
       ]
-    ],
+    ]
-    [
-      8,
-      'v0.10.3',
-      new Map<string, string>([
-        ['install', 'false'],
-        ['use', 'false'],
-        ['buildkitd-config', path.join(fixturesDir, 'buildkitd.toml')],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false'],
-      ]),
-      [
-        'create',
-        '--name', 'builder-9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d',
-        '--driver', 'docker-container',
-        '--buildkitd-flags', '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
-        '--config', tmpName,
-      ]
-    ],
-    [
-      9,
-      'v0.10.3',
-      new Map<string, string>([
-        ['install', 'false'],
-        ['use', 'false'],
-        ['buildkitd-config-inline', 'debug = true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false'],
-      ]),
-      [
-        'create',
-        '--name', 'builder-9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d',
-        '--driver', 'docker-container',
-        '--buildkitd-flags', '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
-        '--config', tmpName,
-      ]
-    ],
-    [
-      10,
-      'v0.10.3',
-      new Map<string, string>([
-        ['install', 'false'],
-        ['use', 'false'],
-        ['driver', 'cloud'],
-        ['buildkitd-flags', '--allow-insecure-entitlement network.host'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false'],
-      ]),
-      [
-        'create',
-        '--name', 'builder-9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d',
-        '--driver', 'cloud',
-        '--buildkitd-flags', '--allow-insecure-entitlement network.host',
-      ]
-    ],
-    [
-      11,
-      'v0.10.3',
-      new Map<string, string>([
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cleanup', 'true'],
-        ['cache-binary', 'true'],
-        ['keep-state', 'false'],
-        ['name', 'test-builder-name'],
-      ]),
-      [
-        'create',
-        '--name', 'test-builder-name',
-        '--driver', 'docker-container',
-        '--buildkitd-flags', '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
-        '--use'
-      ]
-    ],
-    [
-      12,
-      'v0.10.3',
-      new Map<string, string>([
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cleanup', 'true'],
-        ['cache-binary', 'true'],
-        ['keep-state', 'true'],
-        ['name', 'test-builder-name'],
-      ]),
-      [
-        'create',
-        '--name', 'test-builder-name',
-        '--driver', 'docker-container',
-        '--buildkitd-flags', '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
-        '--use',
-      ]
-    ],
   ])(
     '[%d] given buildx %s and %p as inputs, returns %p',
     async (num: number, buildxVersion: string, inputs: Map<string, string>, expected: Array<string>) => {
@@ -332,9 +199,7 @@ describe('getAppendArgs', () => {
       new Map<string, string>([
         ['install', 'false'],
         ['use', 'true'],
-        ['cache-binary', 'true'],
         ['cleanup', 'true'],
-        ['keep-state', 'false']
       ]),
       {
         "name": "aws_graviton2",
@@ -373,149 +238,6 @@ describe('getAppendArgs', () => {
   );
 });
 
-describe('getVersion', () => {
-  beforeEach(() => {
-    process.env = Object.keys(process.env).reduce((object, key) => {
-      if (!key.startsWith('INPUT_')) {
-        object[key] = process.env[key];
-      }
-      return object;
-    }, {});
-  });
-
-  // prettier-ignore
-  test.each([
-    [
-      0,
-      new Map<string, string>([
-        // defaults
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false']
-      ]),
-      ''
-    ],
-    [
-      1,
-      new Map<string, string>([
-        ['version', 'latest'],
-        // defaults
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false']
-      ]),
-      'latest'
-    ],
-    [
-      2,
-      new Map<string, string>([
-        ['version', 'edge'],
-        // defaults
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false']
-      ]),
-      'edge'
-    ],
-    [
-      3,
-      new Map<string, string>([
-        ['version', 'v0.19.2'],
-        // defaults
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false']
-      ]),
-      'v0.19.2'
-    ],
-    [
-      4,
-      new Map<string, string>([
-        ['version', 'latest'],
-        ['driver', 'cloud'],
-        // defaults
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false']
-      ]),
-      'cloud:latest'
-    ],
-    [
-      5,
-      new Map<string, string>([
-        ['version', 'edge'],
-        ['driver', 'cloud'],
-        // defaults
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false']
-      ]),
-      'cloud:edge'
-    ],
-    [
-      6,
-      new Map<string, string>([
-        ['driver', 'cloud'],
-        // defaults
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false']
-      ]),
-      'cloud:latest'
-    ],
-    [
-      7,
-      new Map<string, string>([
-        ['version', 'cloud:v0.11.2-desktop.2'],
-        ['driver', 'cloud'],
-        // defaults
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false']
-      ]),
-      'cloud:v0.11.2-desktop.2'
-    ],
-    [
-      8,
-      new Map<string, string>([
-        ['version', 'cloud:v0.11.2-desktop.2'],
-        // defaults
-        ['install', 'false'],
-        ['use', 'true'],
-        ['cache-binary', 'true'],
-        ['cleanup', 'true'],
-        ['keep-state', 'false']
-      ]),
-      'cloud:v0.11.2-desktop.2'
-    ],
-  ])(
-    '[%d] given %p as inputs, returns version %p',
-    async (num: number, inputs: Map<string, string>, expected: string) => {
-      inputs.forEach((value: string, name: string) => {
-        setInput(name, value);
-      });
-      const inp = await context.getInputs();
-      expect(context.getVersion(inp)).toEqual(expected);
-    }
-  );
-});
-
 // See: https://github.com/actions/toolkit/blob/master/packages/core/src/core.ts#L67
 function getInputName(name: string): string {
   return `INPUT_${name.replace(/ /g, '_').toUpperCase()}`;

__tests__/fixtures/buildkitd.toml

@@ -1 +0,0 @@
-debug = true

action.yml

@@ -18,13 +18,8 @@ inputs:
     description: 'List of additional driver-specific options. (eg. image=moby/buildkit:master)'
     required: false
   buildkitd-flags:
-    description: 'BuildKit daemon flags'
+    description: 'Flags for buildkitd daemon'
-    required: false
+    default: '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'
-  buildkitd-config:
-    description: 'BuildKit daemon config file'
-    required: false
-  buildkitd-config-inline:
-    description: 'Inline BuildKit daemon config'
     required: false
   install:
     description: 'Sets up docker build command as an alias to docker buildx build'
@@ -34,39 +29,25 @@ inputs:
     description: 'Switch to this builder instance'
     default: 'true'
     required: false
-  name:
-    description: 'Name of the builder. If not specified, one will be generated or if it already exists, it will be used instead of creating a new one.'
-    required: false
   endpoint:
     description: 'Optional address for docker socket or context from `docker context ls`'
     required: false
   platforms:
     description: 'Fixed platforms for current node. If not empty, values take priority over the detected ones'
     required: false
+  config:
+    description: 'BuildKit config file'
+    required: false
+  config-inline:
+    description: 'Inline BuildKit config'
+    required: false
   append:
     description: 'Append additional nodes to the builder'
     required: false
-  keep-state:
-    description: 'Keep BuildKit state on cleanup. This is only useful on persistent self-hosted runners.'
-    default: 'false'
-    required: false
-  cache-binary:
-    description: 'Cache buildx binary to GitHub Actions cache backend'
-    default: 'true'
-    required: false
   cleanup:
     description: 'Cleanup temp files and remove builder at the end of a job'
     default: 'true'
     required: false
-  # TODO: remove deprecated config and config-inline inputs
-  config:
-    description: 'BuildKit daemon config file'
-    deprecationMessage: 'Use buildkitd-config instead'
-    required: false
-  config-inline:
-    description: 'Inline BuildKit daemon config'
-    deprecationMessage: 'Use buildkitd-config-inline instead'
-    required: false
 
 outputs:
   name:

dev.Dockerfile

@@ -5,16 +5,9 @@ ARG NODE_VERSION=20
 FROM node:${NODE_VERSION}-alpine AS base
 RUN apk add --no-cache cpio findutils git
 WORKDIR /src
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache <<EOT
-  corepack enable
-  yarn --version
-  yarn config set --home enableTelemetry 0
-EOT
 
 FROM base AS deps
 RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn install && mkdir /vendor && cp yarn.lock /vendor
 
@@ -23,19 +16,18 @@ COPY --from=deps /vendor /
 
 FROM deps AS vendor-validate
 RUN --mount=type=bind,target=.,rw <<EOT
-  set -e
+set -e
-  git add -A
+git add -A
-  cp -rf /vendor/* .
+cp -rf /vendor/* .
-  if [ -n "$(git status --porcelain -- yarn.lock)" ]; then
+if [ -n "$(git status --porcelain -- yarn.lock)" ]; then
-    echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor"'
+  echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor-update"'
-    git status --porcelain -- yarn.lock
+  git status --porcelain -- yarn.lock
-    exit 1
+  exit 1
-  fi
+fi
 EOT
 
 FROM deps AS build
 RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn run build && mkdir /out && cp -Rf dist /out/
 
@@ -44,35 +36,34 @@ COPY --from=build /out /
 
 FROM build AS build-validate
 RUN --mount=type=bind,target=.,rw <<EOT
-  set -e
+set -e
-  git add -A
+git add -A
-  cp -rf /out/* .
+cp -rf /out/* .
-  if [ -n "$(git status --porcelain -- dist)" ]; then
+if [ -n "$(git status --porcelain -- dist)" ]; then
-    echo >&2 'ERROR: Build result differs. Please build first with "docker buildx bake build"'
+  echo >&2 'ERROR: Build result differs. Please build first with "docker buildx bake build"'
-    git status --porcelain -- dist
+  git status --porcelain -- dist
-    exit 1
+  exit 1
-  fi
+fi
 EOT
 
 FROM deps AS format
 RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn run format \
-  && mkdir /out && find . -name '*.ts' -not -path './node_modules/*' -not -path './.yarn/*' | cpio -pdm /out
+  && mkdir /out && find . -name '*.ts' -not -path './node_modules/*' | cpio -pdm /out
 
 FROM scratch AS format-update
 COPY --from=format /out /
 
 FROM deps AS lint
 RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn run lint
 
 FROM deps AS test
+ENV RUNNER_TEMP=/tmp/github_runner
+ENV RUNNER_TOOL_CACHE=/tmp/github_tool_cache
 RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn run test --coverage --coverageDirectory=/tmp/coverage
 

docker-bake.hcl

@@ -1,15 +1,9 @@
-target "_common" {
-  args = {
-    BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1
-  }
-}
-
 group "default" {
   targets = ["build"]
 }
 
 group "pre-checkin" {
-  targets = ["vendor", "format", "build"]
+  targets = ["vendor-update", "format", "build"]
 }
 
 group "validate" {
@@ -17,49 +11,42 @@ group "validate" {
 }
 
 target "build" {
-  inherits = ["_common"]
   dockerfile = "dev.Dockerfile"
   target = "build-update"
   output = ["."]
 }
 
 target "build-validate" {
-  inherits = ["_common"]
   dockerfile = "dev.Dockerfile"
   target = "build-validate"
   output = ["type=cacheonly"]
 }
 
 target "format" {
-  inherits = ["_common"]
   dockerfile = "dev.Dockerfile"
   target = "format-update"
   output = ["."]
 }
 
 target "lint" {
-  inherits = ["_common"]
   dockerfile = "dev.Dockerfile"
   target = "lint"
   output = ["type=cacheonly"]
 }
 
-target "vendor" {
+target "vendor-update" {
-  inherits = ["_common"]
   dockerfile = "dev.Dockerfile"
   target = "vendor-update"
   output = ["."]
 }
 
 target "vendor-validate" {
-  inherits = ["_common"]
   dockerfile = "dev.Dockerfile"
   target = "vendor-validate"
   output = ["type=cacheonly"]
 }
 
 target "test" {
-  inherits = ["_common"]
   dockerfile = "dev.Dockerfile"
   target = "test-coverage"
   output = ["./coverage"]

docs/advanced/append-nodes.md

@@ -0,0 +1,3 @@
+# Append additional nodes to the builder
+
+This page has moved to [Docker Docs website](https://docs.docker.com/build/ci/github-actions/configure-builder/#append-additional-nodes-to-the-builder)

docs/advanced/auth.md

@@ -0,0 +1,3 @@
+# Authentication support
+
+This page has moved to [Docker Docs website](https://docs.docker.com/build/ci/github-actions/configure-builder/#authentication-for-remote-builders)

docs/advanced/buildkit-config.md

@@ -0,0 +1,3 @@
+# BuildKit daemon configuration
+
+This page has moved to [Docker Docs website](https://docs.docker.com/build/ci/github-actions/configure-builder/#buildkit-daemon-configuration)

docs/advanced/standalone.md

@@ -0,0 +1,3 @@
+# Standalone mode
+
+This page has moved to [Docker Docs website](https://docs.docker.com/build/ci/github-actions/configure-builder/#standalone-mode)

package.json

@@ -1,16 +1,17 @@
 {
   "name": "docker-setup-buildx",
   "description": "Set up Docker Buildx",
-  "main": "src/main.ts",
+  "main": "lib/main.js",
   "scripts": {
-    "build": "ncc build --source-map --minify --license licenses.txt",
+    "build": "ncc build src/main.ts --source-map --minify --license licenses.txt",
     "lint": "yarn run prettier && yarn run eslint",
     "format": "yarn run prettier:fix && yarn run eslint:fix",
     "eslint": "eslint --max-warnings=0 .",
     "eslint:fix": "eslint --fix .",
     "prettier": "prettier --check \"./**/*.ts\"",
     "prettier:fix": "prettier --write \"./**/*.ts\"",
-    "test": "jest"
+    "test": "jest",
+    "all": "yarn run build && yarn run format && yarn test"
   },
   "repository": {
     "type": "git",
@@ -23,27 +24,26 @@
   ],
   "author": "Docker Inc.",
   "license": "Apache-2.0",
-  "packageManager": "yarn@4.9.2",
   "dependencies": {
-    "@actions/core": "^1.11.1",
+    "@actions/core": "^1.10.1",
-    "@docker/actions-toolkit": "^0.63.0",
+    "@actions/exec": "^1.1.1",
-    "js-yaml": "^4.1.0"
+    "@docker/actions-toolkit": "^0.12.0",
+    "js-yaml": "^4.1.0",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^20.5.9",
-    "@types/node": "^20.19.9",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@types/uuid": "^10.0.0",
+    "@typescript-eslint/parser": "^6.6.0",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@vercel/ncc": "^0.38.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "eslint": "^8.48.0",
-    "@vercel/ncc": "^0.38.3",
+    "eslint-config-prettier": "^9.0.0",
-    "eslint": "^8.57.1",
+    "eslint-plugin-jest": "^27.2.3",
-    "eslint-config-prettier": "^9.1.2",
+    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-jest": "^28.14.0",
+    "jest": "^29.6.4",
-    "eslint-plugin-prettier": "^5.5.4",
+    "prettier": "^3.0.3",
-    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
-    "prettier": "^3.6.2",
+    "ts-node": "^10.9.1",
-    "ts-jest": "^29.4.1",
+    "typescript": "^5.2.2"
-    "ts-node": "^10.9.2",
-    "typescript": "^5.9.2"
   }
 }

src/context.ts

@@ -1,14 +1,11 @@
-import * as crypto from 'crypto';
+import * as uuid from 'uuid';
 import * as core from '@actions/core';
-
 import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
 import {Util} from '@docker/actions-toolkit/lib/util';
 import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
-
+import {Node} from '@docker/actions-toolkit/lib/types/builder';
-import {Node} from '@docker/actions-toolkit/lib/types/buildx/builder';
 
 export const builderNodeEnvPrefix = 'BUILDER_NODE';
-const defaultBuildkitdFlags = '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host';
 
 export interface Inputs {
   version: string;
@@ -16,52 +13,46 @@ export interface Inputs {
   driver: string;
   driverOpts: string[];
   buildkitdFlags: string;
-  buildkitdConfig: string;
-  buildkitdConfigInline: string;
   platforms: string[];
   install: boolean;
   use: boolean;
   endpoint: string;
+  config: string;
+  configInline: string;
   append: string;
-  cacheBinary: boolean;
   cleanup: boolean;
-  keepState: boolean;
 }
 
 export async function getInputs(): Promise<Inputs> {
   return {
     version: core.getInput('version'),
-    name: await getBuilderName(core.getInput('name'), core.getInput('driver') || 'docker-container'),
+    name: await getBuilderName(core.getInput('driver') || 'docker-container'),
     driver: core.getInput('driver') || 'docker-container',
     driverOpts: Util.getInputList('driver-opts', {ignoreComma: true, quote: false}),
-    buildkitdFlags: core.getInput('buildkitd-flags'),
+    buildkitdFlags: core.getInput('buildkitd-flags') || '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
     platforms: Util.getInputList('platforms'),
     install: core.getBooleanInput('install'),
     use: core.getBooleanInput('use'),
     endpoint: core.getInput('endpoint'),
-    buildkitdConfig: core.getInput('buildkitd-config') || core.getInput('config'),
+    config: core.getInput('config'),
-    buildkitdConfigInline: core.getInput('buildkitd-config-inline') || core.getInput('config-inline'),
+    configInline: core.getInput('config-inline'),
     append: core.getInput('append'),
-    keepState: core.getBooleanInput('keep-state'),
-    cacheBinary: core.getBooleanInput('cache-binary'),
     cleanup: core.getBooleanInput('cleanup')
   };
 }
 
-export async function getBuilderName(name: string, driver: string): Promise<string> {
+export async function getBuilderName(driver: string): Promise<string> {
-  return driver == 'docker' ? await Docker.context() : name || `builder-${crypto.randomUUID()}`;
+  return driver == 'docker' ? await Docker.context() : `builder-${uuid.v4()}`;
 }
 
 export async function getCreateArgs(inputs: Inputs, toolkit: Toolkit): Promise<Array<string>> {
   const args: Array<string> = ['create', '--name', inputs.name, '--driver', inputs.driver];
   if (await toolkit.buildx.versionSatisfies('>=0.3.0')) {
-    await Util.asyncForEach(inputs.driverOpts, async (driverOpt: string) => {
+    await Util.asyncForEach(inputs.driverOpts, async driverOpt => {
       args.push('--driver-opt', driverOpt);
     });
-    if (inputs.buildkitdFlags) {
+    if (driverSupportsFlags(inputs.driver) && inputs.buildkitdFlags) {
       args.push('--buildkitd-flags', inputs.buildkitdFlags);
-    } else if (driverSupportsBuildkitdFlags(inputs.driver)) {
-      args.push('--buildkitd-flags', defaultBuildkitdFlags);
     }
   }
   if (inputs.platforms.length > 0) {
@@ -70,10 +61,12 @@ export async function getCreateArgs(inputs: Inputs, toolkit: Toolkit): Promise<A
   if (inputs.use) {
     args.push('--use');
   }
-  if (inputs.buildkitdConfig) {
+  if (driverSupportsFlags(inputs.driver)) {
-    args.push('--config', toolkit.buildkit.config.resolveFromFile(inputs.buildkitdConfig));
+    if (inputs.config) {
-  } else if (inputs.buildkitdConfigInline) {
+      args.push('--config', toolkit.buildkit.config.resolveFromFile(inputs.config));
-    args.push('--config', toolkit.buildkit.config.resolveFromString(inputs.buildkitdConfigInline));
+    } else if (inputs.configInline) {
+      args.push('--config', toolkit.buildkit.config.resolveFromString(inputs.configInline));
+    }
   }
   if (inputs.endpoint) {
     args.push(inputs.endpoint);
@@ -86,16 +79,14 @@ export async function getAppendArgs(inputs: Inputs, node: Node, toolkit: Toolkit
   if (node.name) {
     args.push('--node', node.name);
   } else if (inputs.driver == 'kubernetes' && (await toolkit.buildx.versionSatisfies('<0.11.0'))) {
-    args.push('--node', `node-${crypto.randomUUID()}`);
+    args.push('--node', `node-${uuid.v4()}`);
   }
   if (node['driver-opts'] && (await toolkit.buildx.versionSatisfies('>=0.3.0'))) {
-    await Util.asyncForEach(node['driver-opts'], async (driverOpt: string) => {
+    await Util.asyncForEach(node['driver-opts'], async driverOpt => {
       args.push('--driver-opt', driverOpt);
     });
-    if (node['buildkitd-flags']) {
+    if (driverSupportsFlags(inputs.driver) && node['buildkitd-flags']) {
       args.push('--buildkitd-flags', node['buildkitd-flags']);
-    } else if (driverSupportsBuildkitdFlags(inputs.driver)) {
-      args.push('--buildkitd-flags', defaultBuildkitdFlags);
     }
   }
   if (node.platforms) {
@@ -115,20 +106,6 @@ export async function getInspectArgs(inputs: Inputs, toolkit: Toolkit): Promise<
   return args;
 }
 
-function driverSupportsBuildkitdFlags(driver: string): boolean {
+function driverSupportsFlags(driver: string): boolean {
   return driver == '' || driver == 'docker-container' || driver == 'docker' || driver == 'kubernetes';
 }
-
-export function getVersion(inputs: Inputs): string {
-  const version = inputs.version;
-  if (inputs.driver === 'cloud') {
-    if (!version || version === 'latest') {
-      return 'cloud:latest';
-    }
-    if (version.startsWith('cloud:') || version.startsWith('lab:')) {
-      return version;
-    }
-    return `cloud:${version}`;
-  }
-  return version;
-}

src/main.ts

@@ -1,18 +1,14 @@
-import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as yaml from 'js-yaml';
 import * as core from '@actions/core';
+import * as exec from '@actions/exec';
 import * as actionsToolkit from '@docker/actions-toolkit';
-
 import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx';
 import {Builder} from '@docker/actions-toolkit/lib/buildx/builder';
 import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
-import {Exec} from '@docker/actions-toolkit/lib/exec';
 import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
 import {Util} from '@docker/actions-toolkit/lib/util';
-
+import {Node} from '@docker/actions-toolkit/lib/types/builder';
-import {Node} from '@docker/actions-toolkit/lib/types/buildx/builder';
-import {ContextInfo} from '@docker/actions-toolkit/lib/types/docker/docker';
 
 import * as context from './context';
 import * as stateHelper from './state-helper';
@@ -22,18 +18,11 @@ actionsToolkit.run(
   async () => {
     const inputs: context.Inputs = await context.getInputs();
     stateHelper.setCleanup(inputs.cleanup);
-    const version = context.getVersion(inputs);
 
     const toolkit = new Toolkit();
     const standalone = await toolkit.buildx.isStandalone();
     stateHelper.setStandalone(standalone);
 
-    if (inputs.keepState && inputs.driver !== 'docker-container') {
-      // https://docs.docker.com/reference/cli/docker/buildx/rm/#keep-state
-      throw new Error(`Cannot use keep-state with ${inputs.driver} driver`);
-    }
-    stateHelper.setKeepState(inputs.keepState);
-
     await core.group(`Docker info`, async () => {
       try {
         await Docker.printVersion();
@@ -44,16 +33,16 @@ actionsToolkit.run(
     });
 
     let toolPath;
-    if (Util.isValidRef(version)) {
+    if (Util.isValidRef(inputs.version)) {
       if (standalone) {
         throw new Error(`Cannot build from source without the Docker CLI`);
       }
       await core.group(`Build buildx from source`, async () => {
-        toolPath = await toolkit.buildxInstall.build(version, !inputs.cacheBinary);
+        toolPath = await toolkit.buildxInstall.build(inputs.version);
       });
-    } else if (!(await toolkit.buildx.isAvailable()) || version) {
+    } else if (!(await toolkit.buildx.isAvailable()) || inputs.version) {
       await core.group(`Download buildx from GitHub Releases`, async () => {
-        toolPath = await toolkit.buildxInstall.download(version || 'latest', !inputs.cacheBinary);
+        toolPath = await toolkit.buildxInstall.download(inputs.version || 'latest');
       });
     }
     if (toolPath) {
@@ -77,73 +66,18 @@ actionsToolkit.run(
     fs.mkdirSync(Buildx.certsDir, {recursive: true});
     stateHelper.setCertsDir(Buildx.certsDir);
 
-    // if the default context has TLS data loaded and endpoint is not set, then
-    // we create a temporary docker context only if driver is docker-container
-    // https://github.com/docker/buildx/blob/b96ad59f64d40873e4959336d294b648bb3937fe/builder/builder.go#L489
-    // https://github.com/docker/setup-buildx-action/issues/105
-    if (!standalone && inputs.driver == 'docker-container' && (await Docker.context()) == 'default' && inputs.endpoint.length == 0) {
-      let defaultContextWithTLS: boolean = false;
-      await core.group(`Inspecting default docker context`, async () => {
-        await Docker.getExecOutput(['context', 'inspect', '--format=json', 'default'], {
-          ignoreReturnCode: true,
-          silent: true
-        }).then(res => {
-          if (res.stderr.length > 0 && res.exitCode != 0) {
-            core.info(`Cannot inspect default docker context: ${res.stderr.trim()}`);
-          } else {
-            try {
-              const contextInfo = (<Array<ContextInfo>>JSON.parse(res.stdout.trim()))[0];
-              core.info(JSON.stringify(JSON.parse(res.stdout.trim()), undefined, 2));
-              const hasTLSData = Object.keys(contextInfo.Endpoints).length > 0 && Object.values(contextInfo.Endpoints)[0].TLSData !== undefined;
-              const hasTLSMaterial = Object.keys(contextInfo.TLSMaterial).length > 0 && Object.values(contextInfo.TLSMaterial)[0].length > 0;
-              defaultContextWithTLS = hasTLSData || hasTLSMaterial;
-            } catch (e) {
-              core.info(`Unable to parse default docker context info: ${e}`);
-              core.info(res.stdout.trim());
-            }
-          }
-        });
-      });
-      if (defaultContextWithTLS) {
-        const tmpDockerContext = `buildx-${crypto.randomUUID()}`;
-        await core.group(`Creating temp docker context (TLS data loaded in default one)`, async () => {
-          await Docker.getExecOutput(['context', 'create', tmpDockerContext], {
-            ignoreReturnCode: true
-          }).then(res => {
-            if (res.stderr.length > 0 && res.exitCode != 0) {
-              core.warning(`Cannot create docker context ${tmpDockerContext}: ${res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'}`);
-            } else {
-              core.info(`Setting builder endpoint to ${tmpDockerContext} context`);
-              inputs.endpoint = tmpDockerContext;
-              stateHelper.setTmpDockerContext(tmpDockerContext);
-            }
-          });
-        });
-      }
-    }
-
     if (inputs.driver !== 'docker') {
       await core.group(`Creating a new builder instance`, async () => {
-        if (await toolkit.builder.exists(inputs.name)) {
+        const certsDriverOpts = Buildx.resolveCertsDriverOpts(inputs.driver, inputs.endpoint, {
-          core.info(`Builder ${inputs.name} already exists, skipping creation`);
+          cacert: process.env[`${context.builderNodeEnvPrefix}_0_AUTH_TLS_CACERT`],
-        } else {
+          cert: process.env[`${context.builderNodeEnvPrefix}_0_AUTH_TLS_CERT`],
-          const certsDriverOpts = Buildx.resolveCertsDriverOpts(inputs.driver, inputs.endpoint, {
+          key: process.env[`${context.builderNodeEnvPrefix}_0_AUTH_TLS_KEY`]
-            cacert: process.env[`${context.builderNodeEnvPrefix}_0_AUTH_TLS_CACERT`],
+        });
-            cert: process.env[`${context.builderNodeEnvPrefix}_0_AUTH_TLS_CERT`],
+        if (certsDriverOpts.length > 0) {
-            key: process.env[`${context.builderNodeEnvPrefix}_0_AUTH_TLS_KEY`]
+          inputs.driverOpts = [...inputs.driverOpts, ...certsDriverOpts];
-          });
-          if (certsDriverOpts.length > 0) {
-            inputs.driverOpts = [...inputs.driverOpts, ...certsDriverOpts];
-          }
-          const createCmd = await toolkit.buildx.getCommand(await context.getCreateArgs(inputs, toolkit));
-          await Exec.getExecOutput(createCmd.command, createCmd.args, {
-            ignoreReturnCode: true
-          }).then(res => {
-            if (res.stderr.length > 0 && res.exitCode != 0) {
-              throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
-            }
-          });
         }
+        const createCmd = await toolkit.buildx.getCommand(await context.getCreateArgs(inputs, toolkit));
+        await exec.exec(createCmd.command, createCmd.args);
       });
     }
 
@@ -161,13 +95,7 @@ actionsToolkit.run(
             node['driver-opts'] = [...(node['driver-opts'] || []), ...certsDriverOpts];
           }
           const appendCmd = await toolkit.buildx.getCommand(await context.getAppendArgs(inputs, node, toolkit));
-          await Exec.getExecOutput(appendCmd.command, appendCmd.args, {
+          await exec.exec(appendCmd.command, appendCmd.args);
-            ignoreReturnCode: true
-          }).then(res => {
-            if (res.stderr.length > 0 && res.exitCode != 0) {
-              throw new Error(`Failed to append node ${node.name}: ${res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'}`);
-            }
-          });
           nodeIndex++;
         }
       });
@@ -175,13 +103,7 @@ actionsToolkit.run(
 
     await core.group(`Booting builder`, async () => {
       const inspectCmd = await toolkit.buildx.getCommand(await context.getInspectArgs(inputs, toolkit));
-      await Exec.getExecOutput(inspectCmd.command, inspectCmd.args, {
+      await exec.exec(inspectCmd.command, inspectCmd.args);
-        ignoreReturnCode: true
-      }).then(res => {
-        if (res.stderr.length > 0 && res.exitCode != 0) {
-          throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
-        }
-      });
     });
 
     if (inputs.install) {
@@ -189,15 +111,8 @@ actionsToolkit.run(
         throw new Error(`Cannot set buildx as default builder without the Docker CLI`);
       }
       await core.group(`Setting buildx as default builder`, async () => {
-        stateHelper.setBuildxIsDefaultBuilder(true);
         const installCmd = await toolkit.buildx.getCommand(['install']);
-        await Exec.getExecOutput(installCmd.command, installCmd.args, {
+        await exec.exec(installCmd.command, installCmd.args);
-          ignoreReturnCode: true
-        }).then(res => {
-          if (res.stderr.length > 0 && res.exitCode != 0) {
-            throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
-          }
-        });
       });
     }
 
@@ -240,13 +155,15 @@ actionsToolkit.run(
   async () => {
     if (stateHelper.IsDebug && stateHelper.containerName.length > 0) {
       await core.group(`BuildKit container logs`, async () => {
-        await Docker.getExecOutput(['logs', `${stateHelper.containerName}`], {
+        await exec
-          ignoreReturnCode: true
+          .getExecOutput('docker', ['logs', `${stateHelper.containerName}`], {
-        }).then(res => {
+            ignoreReturnCode: true
-          if (res.stderr.length > 0 && res.exitCode != 0) {
+          })
-            core.warning(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
+          .then(res => {
-          }
+            if (res.stderr.length > 0 && res.exitCode != 0) {
-        });
+              core.warning(res.stderr.trim());
+            }
+          });
       });
     }
 
@@ -259,48 +176,26 @@ actionsToolkit.run(
         const buildx = new Buildx({standalone: stateHelper.standalone});
         const builder = new Builder({buildx: buildx});
         if (await builder.exists(stateHelper.builderName)) {
-          const rmCmd = await buildx.getCommand(['rm', stateHelper.builderName, ...(stateHelper.keepState ? ['--keep-state'] : [])]);
+          const rmCmd = await buildx.getCommand(['rm', stateHelper.builderName]);
-          await Exec.getExecOutput(rmCmd.command, rmCmd.args, {
+          await exec
-            ignoreReturnCode: true
+            .getExecOutput(rmCmd.command, rmCmd.args, {
-          }).then(res => {
+              ignoreReturnCode: true
-            if (res.stderr.length > 0 && res.exitCode != 0) {
+            })
-              core.warning(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
+            .then(res => {
-            }
+              if (res.stderr.length > 0 && res.exitCode != 0) {
-          });
+                core.warning(res.stderr.trim());
+              }
+            });
         } else {
           core.info(`${stateHelper.builderName} does not exist`);
         }
       });
     }
 
-    if (stateHelper.tmpDockerContext) {
-      await core.group(`Removing temp docker context`, async () => {
-        await Exec.getExecOutput('docker', ['context', 'rm', '-f', stateHelper.tmpDockerContext], {
-          ignoreReturnCode: true
-        }).then(res => {
-          if (res.stderr.length > 0 && res.exitCode != 0) {
-            core.warning(`${res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'}`);
-          }
-        });
-      });
-    }
-
     if (stateHelper.certsDir.length > 0 && fs.existsSync(stateHelper.certsDir)) {
       await core.group(`Cleaning up certificates`, async () => {
         fs.rmSync(stateHelper.certsDir, {recursive: true});
       });
     }
-
-    if (stateHelper.buildxIsDefaultBuilder) {
-      await core.group(`Restoring default builder`, async () => {
-        await Exec.getExecOutput('docker', ['buildx', 'uninstall'], {
-          ignoreReturnCode: true
-        }).then(res => {
-          if (res.stderr.length > 0 && res.exitCode != 0) {
-            core.warning(`${res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'}`);
-          }
-        });
-      });
-    }
   }
 );

src/state-helper.ts

@@ -6,10 +6,7 @@ export const builderName = process.env['STATE_builderName'] || '';
 export const builderDriver = process.env['STATE_builderDriver'] || '';
 export const containerName = process.env['STATE_containerName'] || '';
 export const certsDir = process.env['STATE_certsDir'] || '';
-export const tmpDockerContext = process.env['STATE_tmpDockerContext'] || '';
 export const cleanup = /true/i.test(process.env['STATE_cleanup'] || '');
-export const buildxIsDefaultBuilder = /true/i.test(process.env['STATE_buildxIsDefaultBuilder'] || '');
-export const keepState = /true/i.test(process.env['STATE_keepState'] || '');
 
 export function setDebug(debug: string) {
   core.saveState('isDebug', debug);
@@ -35,18 +32,6 @@ export function setCertsDir(certsDir: string) {
   core.saveState('certsDir', certsDir);
 }
 
-export function setTmpDockerContext(tmpDockerContext: string) {
-  core.saveState('tmpDockerContext', tmpDockerContext);
-}
-
 export function setCleanup(cleanup: boolean) {
   core.saveState('cleanup', cleanup);
 }
-
-export function setBuildxIsDefaultBuilder(buildxIsDefaultBuilder: boolean) {
-  core.saveState('buildxIsDefaultBuilder', buildxIsDefaultBuilder);
-}
-
-export function setKeepState(keepState: boolean) {
-  core.saveState('keepState', keepState);
-}