Merge pull request #1569 from tonistiigi/v0.10.2-picks

[v0.10] cherry-picks for v0.10.2
build: better message output for git provenance
2025-08-15 08:15:55 +08:00 · 2023-01-30 11:57:04 -08:00 · 2023-01-30 11:46:51 -08:00 · 2023-01-30 11:46:42 -08:00 · 2023-01-30 11:46:12 -08:00 · 2023-01-30 11:45:50 -08:00
3186 changed files with 94704 additions and 309845 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -116,60 +116,6 @@ commit automatically with `git commit -s`.

 ### Run the unit- and integration-tests

-Running tests:
-
-```bash
-make test
-```
-
-This runs all unit and integration tests, in a containerized environment.
-Locally, every package can be tested separately with standard Go tools, but
-integration tests are skipped if local user doesn't have enough permissions or
-worker binaries are not installed.
-
-```bash
-# run unit tests only
-make test-unit
-
-# run integration tests only
-make test-integration
-
-# test a specific package
-TESTPKGS=./bake make test
-
-# run all integration tests with a specific worker
-TESTFLAGS="--run=//worker=remote -v" make test-integration
-
-# run a specific integration test
-TESTFLAGS="--run /TestBuild/worker=remote/ -v" make test-integration
-
-# run a selection of integration tests using a regexp
-TESTFLAGS="--run /TestBuild.*/worker=remote/ -v" make test-integration
-```
-
-> **Note**
->
-> Set `TEST_KEEP_CACHE=1` for the test framework to keep external dependant
-> images in a docker volume if you are repeatedly calling `make test`. This
-> helps to avoid rate limiting on the remote registry side.
-
-> **Note**
->
-> Set `TEST_DOCKERD=1` for the test framework to enable the docker workers,
-> specifically the `docker` and `docker-container` drivers.
->
-> The docker tests cannot be run in parallel, so require passing `--parallel=1`
-> in `TESTFLAGS`.
-
-> **Note**
->
-> If you are working behind a proxy, you can set some of or all
-> `HTTP_PROXY=http://ip:port`, `HTTPS_PROXY=http://ip:port`, `NO_PROXY=http://ip:port`
-> for the test framework to specify the proxy build args.
-
-
-### Run the helper commands
-
 To enter a demo container environment and experiment, you may run:

 ```
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,124 +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: |
-        Please read the contributing guidelines before proceeding.
-      options:
-        - label: I've read the [contributing guidelines](https://github.com/docker/buildx/blob/master/.github/CONTRIBUTING.md) and wholeheartedly agree
-          required: true
-
-  - type: checkboxes
-    attributes:
-      label: I've found a bug and checked that ...
-      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: |
-        Please provide a brief description of the bug in 1-2 sentences.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Expected behaviour
-      description: |
-        Please describe precisely what you'd expect to happen.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Actual behaviour
-      description: |
-        Please describe precisely what is actually happening.
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Buildx version
-      description: |
-        Output of `docker buildx version` command.
-        Example: `github.com/docker/buildx v0.8.1 5fac64c2c49dae1320f2b51f1a899ca451935554`
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Docker info
-      description: |
-        Output of `docker info` command.
-      render: text
-
-  - type: textarea
-    attributes:
-      label: Builders list
-      description: |
-        Output of `docker buildx ls` command.
-      render: text
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Configuration
-      description: >
-        Please provide a minimal Dockerfile, bake definition (if applicable) and
-        invoked commands to help reproducing your issue.
-      placeholder: |
-        ```dockerfile
-        FROM alpine
-        echo hello
-        ```
-        
-        ```hcl
-        group "default" {
-          targets = ["app"]
-        }
-        target "app" {
-          dockerfile = "Dockerfile"
-          target = "build"
-        }
-        ```
-        
-        ```console
-        $ docker buildx build .
-        $ docker buildx bake
-        ```
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Build logs
-      description: |
-        Please provide logs output (and/or BuildKit logs if applicable).
-      render: text
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Additional info
-      description: |
-        Please provide any additional information that could be useful.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,12 +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/buildx/discussions/new
-    about: Use Github Discussions to ask questions and/or open discussion topics.
-  - name: Command line reference
-    url: https://docs.docker.com/engine/reference/commandline/buildx/
-    about: Read the command line reference.
-  - name: Documentation
-    url: https://docs.docker.com/build/
-    about: Read the documentation.
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.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
--- a/.github/SECURITY.md
+++ b/.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&mdash;if you're into schwag, 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.
--- a/.github/releases.json
+++ b/.github/releases.json
@@ -1,735 +0,0 @@
-{
-  "latest": {
-    "id": 90741208,
-    "tag_name": "v0.10.2",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.10.2",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/checksums.txt"
-    ]
-  },
-  "v0.10.2": {
-    "id": 90741208,
-    "tag_name": "v0.10.2",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.10.2",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.2/checksums.txt"
-    ]
-  },
-  "v0.10.1": {
-    "id": 90346950,
-    "tag_name": "v0.10.1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.10.1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.1/checksums.txt"
-    ]
-  },
-  "v0.10.0": {
-    "id": 88388110,
-    "tag_name": "v0.10.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.10.0",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0/checksums.txt"
-    ]
-  },
-  "v0.10.0-rc3": {
-    "id": 88191592,
-    "tag_name": "v0.10.0-rc3",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.10.0-rc3",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v6.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v6.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v7.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v7.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-ppc64le.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-ppc64le.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-riscv64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-riscv64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-s390x.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-s390x.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc3/checksums.txt"
-    ]
-  },
-  "v0.10.0-rc2": {
-    "id": 86248476,
-    "tag_name": "v0.10.0-rc2",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.10.0-rc2",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v6.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v6.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v7.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v7.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-ppc64le.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-ppc64le.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-riscv64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-riscv64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-s390x.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-s390x.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc2/checksums.txt"
-    ]
-  },
-  "v0.10.0-rc1": {
-    "id": 85963900,
-    "tag_name": "v0.10.0-rc1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.10.0-rc1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.10.0-rc1/checksums.txt"
-    ]
-  },
-  "v0.9.1": {
-    "id": 74760068,
-    "tag_name": "v0.9.1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.9.1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.9.1/checksums.txt"
-    ]
-  },
-  "v0.9.0": {
-    "id": 74546589,
-    "tag_name": "v0.9.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.9.0",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.9.0/checksums.txt"
-    ]
-  },
-  "v0.9.0-rc2": {
-    "id": 74052235,
-    "tag_name": "v0.9.0-rc2",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.9.0-rc2",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc2/checksums.txt"
-    ]
-  },
-  "v0.9.0-rc1": {
-    "id": 73389692,
-    "tag_name": "v0.9.0-rc1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.9.0-rc1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.9.0-rc1/checksums.txt"
-    ]
-  },
-  "v0.8.2": {
-    "id": 63479740,
-    "tag_name": "v0.8.2",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.8.2",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.8.2/checksums.txt"
-    ]
-  },
-  "v0.8.1": {
-    "id": 62289050,
-    "tag_name": "v0.8.1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.8.1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.8.1/checksums.txt"
-    ]
-  },
-  "v0.8.0": {
-    "id": 61423774,
-    "tag_name": "v0.8.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.8.0",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.8.0/checksums.txt"
-    ]
-  },
-  "v0.8.0-rc1": {
-    "id": 60513568,
-    "tag_name": "v0.8.0-rc1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.8.0-rc1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.8.0-rc1/checksums.txt"
-    ]
-  },
-  "v0.7.1": {
-    "id": 54098347,
-    "tag_name": "v0.7.1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.7.1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.7.1/checksums.txt"
-    ]
-  },
-  "v0.7.0": {
-    "id": 53109422,
-    "tag_name": "v0.7.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.7.0",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.7.0/checksums.txt"
-    ]
-  },
-  "v0.7.0-rc1": {
-    "id": 52726324,
-    "tag_name": "v0.7.0-rc1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.7.0-rc1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.7.0-rc1/checksums.txt"
-    ]
-  },
-  "v0.6.3": {
-    "id": 48691641,
-    "tag_name": "v0.6.3",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.6.3",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.windows-arm64.exe"
-    ]
-  },
-  "v0.6.2": {
-    "id": 48207405,
-    "tag_name": "v0.6.2",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.6.2",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.windows-arm64.exe"
-    ]
-  },
-  "v0.6.1": {
-    "id": 47064772,
-    "tag_name": "v0.6.1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.6.1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.windows-arm64.exe"
-    ]
-  },
-  "v0.6.0": {
-    "id": 46343260,
-    "tag_name": "v0.6.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.6.0",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.windows-arm64.exe"
-    ]
-  },
-  "v0.6.0-rc1": {
-    "id": 46230351,
-    "tag_name": "v0.6.0-rc1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.6.0-rc1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.windows-arm64.exe"
-    ]
-  },
-  "v0.5.1": {
-    "id": 35276550,
-    "tag_name": "v0.5.1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.5.1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.darwin-universal",
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.windows-amd64.exe"
-    ]
-  },
-  "v0.5.0": {
-    "id": 35268960,
-    "tag_name": "v0.5.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.5.0",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.darwin-universal",
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.windows-amd64.exe"
-    ]
-  },
-  "v0.5.0-rc1": {
-    "id": 35015334,
-    "tag_name": "v0.5.0-rc1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.5.0-rc1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.windows-amd64.exe"
-    ]
-  },
-  "v0.4.2": {
-    "id": 30007794,
-    "tag_name": "v0.4.2",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.4.2",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.windows-amd64.exe"
-    ]
-  },
-  "v0.4.1": {
-    "id": 26067509,
-    "tag_name": "v0.4.1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.4.1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.windows-amd64.exe"
-    ]
-  },
-  "v0.4.0": {
-    "id": 26028174,
-    "tag_name": "v0.4.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.4.0",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.windows-amd64.exe"
-    ]
-  },
-  "v0.3.1": {
-    "id": 20316235,
-    "tag_name": "v0.3.1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.3.1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.windows-amd64.exe"
-    ]
-  },
-  "v0.3.0": {
-    "id": 19029664,
-    "tag_name": "v0.3.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.3.0",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.windows-amd64.exe"
-    ]
-  },
-  "v0.2.2": {
-    "id": 17671545,
-    "tag_name": "v0.2.2",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.2.2",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.windows-amd64.exe"
-    ]
-  },
-  "v0.2.1": {
-    "id": 17582885,
-    "tag_name": "v0.2.1",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.2.1",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.windows-amd64.exe"
-    ]
-  },
-  "v0.2.0": {
-    "id": 16965310,
-    "tag_name": "v0.2.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.2.0",
-    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.windows-amd64.exe"
-    ]
-  }
-}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,129 +13,55 @@ on:
    tags:
      - 'v*'
  pull_request:
+    branches:
+      - 'master'
+      - 'v[0-9]*'
    paths-ignore:
-      - '.github/releases.json'
      - 'README.md'
      - 'docs/**'

 env:
-  BUILDX_VERSION: "latest"
-  BUILDKIT_IMAGE: "moby/buildkit:latest"
+  BUILDX_VERSION: "v0.10.0"
+  BUILDKIT_IMAGE: "moby/buildkit:v0.11.1"
  REPO_SLUG: "docker/buildx-bin"
  DESTDIR: "./bin"
-  TEST_CACHE_SCOPE: "test"

 jobs:
-  prepare-test:
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: ${{ env.BUILDX_VERSION }}
-          driver-opts: image=${{ env.BUILDKIT_IMAGE }}
-          buildkitd-flags: --debug
-      -
-        name: Build
-        uses: docker/bake-action@v4
-        with:
-          targets: integration-test-base
-          set: |
-            *.cache-from=type=gha,scope=${{ env.TEST_CACHE_SCOPE }}
-            *.cache-to=type=gha,scope=${{ env.TEST_CACHE_SCOPE }}
-
  test:
    runs-on: ubuntu-22.04
-    needs:
-      - prepare-test
-    env:
-      TESTFLAGS: "-v --parallel=6 --timeout=30m"
-      TESTFLAGS_DOCKER: "-v --parallel=1 --timeout=30m"
-      GOTESTSUM_FORMAT: "standard-verbose"
-      TEST_IMAGE_BUILD: "0"
-      TEST_IMAGE_ID: "buildx-tests"
-    strategy:
-      fail-fast: false
-      matrix:
-        worker:
-          - docker
-          - docker\+containerd  # same as docker, but with containerd snapshotter
-          - docker-container
-          - remote
-        pkg:
-          - ./tests
-        include:
-          - pkg: ./...
-            skip-integration-tests: 1
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: actions/checkout@v3
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver-opts: image=${{ env.BUILDKIT_IMAGE }}
          buildkitd-flags: --debug
-      -
-        name: Build test image
-        uses: docker/bake-action@v4
-        with:
-          targets: integration-test
-          set: |
-            *.cache-from=type=gha,scope=${{ env.TEST_CACHE_SCOPE }}
-            *.output=type=docker,name=${{ env.TEST_IMAGE_ID }}
      -
        name: Test
-        run: |
-          export TEST_REPORT_SUFFIX=-${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.worker }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')
-          ./hack/test
-        env:
-          TEST_DOCKERD: "${{ startsWith(matrix.worker, 'docker') && '1' || '0' }}"
-          TESTFLAGS: "${{ (matrix.worker == 'docker' || matrix.worker == 'docker\\+containerd') && env.TESTFLAGS_DOCKER || env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"
-          TESTPKGS: "${{ matrix.pkg }}"
-          SKIP_INTEGRATION_TESTS: "${{ matrix.skip-integration-tests }}"
+        uses: docker/bake-action@v2
+        with:
+          targets: test
+          set: |
+            *.cache-from=type=gha,scope=test
+            *.cache-to=type=gha,scope=test
      -
-        name: Send to Codecov
-        if: always()
+        name: Upload coverage
        uses: codecov/codecov-action@v3
        with:
-          directory: ./bin/testreports
-      -
-        name: Generate annotations
-        if: always()
-        uses: crazy-max/.github/.github/actions/gotest-annotations@1a64ea6d01db9a48aa61954cb20e265782c167d9
-        with:
-          directory: ./bin/testreports
-      -
-        name: Upload test reports
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: test-reports
-          path: ./bin/testreports
+          directory: ${{ env.DESTDIR }}/coverage

-  prepare-binaries:
+  prepare:
    runs-on: ubuntu-22.04
    outputs:
      matrix: ${{ steps.platforms.outputs.matrix }}
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        name: Create matrix
        id: platforms
@@ -149,11 +75,11 @@ jobs:
  binaries:
    runs-on: ubuntu-22.04
    needs:
-      - prepare-binaries
+      - prepare
    strategy:
      fail-fast: false
      matrix:
-        platform: ${{ fromJson(needs.prepare-binaries.outputs.matrix) }}
+        platform: ${{ fromJson(needs.prepare.outputs.matrix) }}
    steps:
      -
        name: Prepare
@@ -162,13 +88,13 @@ jobs:
          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
      -
        name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        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
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver-opts: image=${{ env.BUILDKIT_IMAGE }}
@@ -191,19 +117,17 @@ jobs:

  bin-image:
    runs-on: ubuntu-22.04
-    needs:
-      - test
-    if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/buildx' }}
+    if: ${{ github.event_name != 'pull_request' }}
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        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
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver-opts: image=${{ env.BUILDKIT_IMAGE }}
@@ -211,7 +135,7 @@ jobs:
      -
        name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
        with:
          images: |
            ${{ env.REPO_SLUG }}
@@ -223,33 +147,33 @@ jobs:
      -
        name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      -
        name: Build and push image
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v2
        with:
          files: |
            ./docker-bake.hcl
            ${{ steps.meta.outputs.bake-file }}
          targets: image-cross
          push: ${{ github.event_name != 'pull_request' }}
-          sbom: true
          set: |
            *.cache-from=type=gha,scope=bin-image
            *.cache-to=type=gha,scope=bin-image,mode=max
+            *.attest=type=sbom
+            *.attest=type=provenance,mode=max,builder-id=https://github.com/${{ env.GITHUB_REPOSITORY }}/actions/runs/${{ env.GITHUB_RUN_ID }}

  release:
    runs-on: ubuntu-22.04
    needs:
-      - test
      - binaries
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        name: Download binaries
        uses: actions/download-artifact@v3
@@ -283,13 +207,13 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        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
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver-opts: image=moby/buildkit:master
@@ -297,6 +221,6 @@ jobs:
      -
        # Just run a bake target to check eveything runs fine
        name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v2
        with:
          targets: binaries
--- a/.github/workflows/docs-release.yml
+++ b/.github/workflows/docs-release.yml
@@ -8,11 +8,11 @@ on:
 jobs:
  open-pr:
    runs-on: ubuntu-22.04
-    if: ${{ github.event.release.prerelease != true && github.repository == 'docker/buildx' }}
+    if: "!github.event.release.prerelease"
    steps:
      -
        name: Checkout docs repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          token: ${{ secrets.GHPAT_DOCS_DISPATCH }}
          repository: docker/docs
@@ -23,10 +23,10 @@ jobs:
          rm -rf ./_data/buildx/*
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
      -
        name: Build docs
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v2
        with:
          source: ${{ github.server_url }}/${{ github.repository }}.git#${{ github.event.release.name }}
          targets: update-docs
@@ -44,7 +44,7 @@ jobs:
          git add -A .
      -
        name: Create PR on docs repo
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
+        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
        with:
          token: ${{ secrets.GHPAT_DOCS_DISPATCH }}
          push-to-fork: docker-tools-robot/docker.github.io
--- a/.github/workflows/docs-upstream.yml
+++ b/.github/workflows/docs-upstream.yml
@@ -26,15 +26,15 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
        with:
          version: latest
      -
        name: Build reference YAML docs
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v2
        with:
          targets: update-docs
          set: |
@@ -56,7 +56,6 @@ jobs:
    needs:
      - docs-yaml
    with:
-      module-name: docker/buildx
+      repo: https://github.com/${{ github.repository }}
      data-files-id: docs-yaml
      data-files-folder: buildx
-      data-files-placeholder-folder: engine/reference/commandline
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -11,8 +11,10 @@ on:
      - 'master'
      - 'v[0-9]*'
  pull_request:
+    branches:
+      - 'master'
+      - 'v[0-9]*'
    paths-ignore:
-      - '.github/releases.json'
      - 'README.md'
      - 'docs/**'

@@ -25,15 +27,15 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
        with:
          version: latest
      -
        name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v2
        with:
          targets: binaries
          set: |
@@ -96,10 +98,10 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
        if: matrix.driver == 'docker' || matrix.driver == 'docker-container'
      -
        name: Install buildx
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -13,8 +13,9 @@ on:
    tags:
      - 'v*'
  pull_request:
-    paths-ignore:
-      - '.github/releases.json'
+    branches:
+      - 'master'
+      - 'v[0-9]*'

 jobs:
  validate:
@@ -26,14 +27,13 @@ jobs:
          - lint
          - validate-vendor
          - validate-docs
-          - validate-generated-files
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
        with:
          version: latest
      -
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -11,59 +11,30 @@ linters:
  enable:
    - gofmt
    - govet
+    - deadcode
    - depguard
    - goimports
    - ineffassign
    - misspell
    - unused
+    - varcheck
    - revive
    - staticcheck
    - typecheck
    - nolintlint
-    - gosec
-    - forbidigo
  disable-all: true

 linters-settings:
  depguard:
-    rules:
-      main:
-        deny:
-          # The io/ioutil package has been deprecated.
-          # https://go.dev/doc/go1.16#ioutil
-          - pkg: "io/ioutil"
-            desc: The io/ioutil package has been deprecated.
-  forbidigo:
-    forbid:
-      - '^fmt\.Errorf(# use errors\.Errorf instead)?$'
-  gosec:
-    excludes:
-      - G204  # Audit use of command execution
-      - G402  # TLS MinVersion too low
-    config:
-      G306: "0644"
+    list-type: blacklist
+    include-go-root: true
+    packages:
+      # The io/ioutil package has been deprecated.
+      # https://go.dev/doc/go1.16#ioutil
+      - io/ioutil

 issues:
  exclude-rules:
    - linters:
        - revive
      text: "stutters"
-    - linters:
-        - revive
-      text: "empty-block"
-    - linters:
-        - revive
-      text: "superfluous-else"
-    - linters:
-        - revive
-      text: "unused-parameter"
-    - linters:
-        - revive
-      text: "redefines-builtin-id"
-    - linters:
-        - revive
-      text: "if-return"
-
-# show all
-max-issues-per-linter: 0
-max-same-issues: 0
--- a/64
+++ b/64
@@ -1,12 +1,10 @@
-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile-upstream:1.5.0

-ARG GO_VERSION=1.21.3
-ARG XX_VERSION=1.2.1
+ARG GO_VERSION=1.19
+ARG XX_VERSION=1.1.2
+ARG DOCKERD_VERSION=20.10.14

-ARG DOCKER_VERSION=24.0.6
-ARG GOTESTSUM_VERSION=v1.9.0
-ARG REGISTRY_VERSION=2.8.0
-ARG BUILDKIT_VERSION=v0.11.6
+FROM docker:$DOCKERD_VERSION AS dockerd-release

 # xx is a helper for cross-compilation
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
@@ -20,33 +18,6 @@ ENV GOFLAGS=-mod=vendor
 ENV CGO_ENABLED=0
 WORKDIR /src

-FROM registry:$REGISTRY_VERSION AS registry
-
-FROM moby/buildkit:$BUILDKIT_VERSION AS buildkit
-
-FROM gobase AS docker
-ARG TARGETPLATFORM
-ARG DOCKER_VERSION
-WORKDIR /opt/docker
-RUN DOCKER_ARCH=$(case ${TARGETPLATFORM:-linux/amd64} in \
-    "linux/amd64")   echo "x86_64"  ;; \
-    "linux/arm/v6")  echo "armel"   ;; \
-    "linux/arm/v7")  echo "armhf"   ;; \
-    "linux/arm64")   echo "aarch64" ;; \
-    "linux/ppc64le") echo "ppc64le" ;; \
-    "linux/s390x")   echo "s390x"   ;; \
-    *)               echo ""        ;; esac) \
-  && echo "DOCKER_ARCH=$DOCKER_ARCH" \
-  && wget -qO- "https://download.docker.com/linux/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz" | tar xvz --strip 1
-RUN ./dockerd --version && ./containerd --version && ./ctr --version && ./runc --version
-
-FROM gobase AS gotestsum
-ARG GOTESTSUM_VERSION
-ENV GOFLAGS=
-RUN --mount=target=/root/.cache,type=cache \
-  GOBIN=/out/ go install "gotest.tools/gotestsum@${GOTESTSUM_VERSION}" && \
-  /out/gotestsum --version
-
 FROM gobase AS buildx-version
 RUN --mount=type=bind,target=. <<EOT
  set -e
@@ -68,7 +39,6 @@ RUN --mount=type=bind,target=. \
 EOT

 FROM gobase AS test
-ENV SKIP_INTEGRATION_TESTS=1
 RUN --mount=type=bind,target=. \
  --mount=type=cache,target=/root/.cache \
  --mount=type=cache,target=/go/pkg/mod \
@@ -91,28 +61,6 @@ FROM binaries-$TARGETOS AS binaries
 # enable scanning for this stage
 ARG BUILDKIT_SBOM_SCAN_STAGE=true

-FROM gobase AS integration-test-base
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-RUN apk add --no-cache \
-      btrfs-progs \
-      e2fsprogs \
-      e2fsprogs-extra \
-      ip6tables \
-      iptables \
-      openssl \
-      shadow-uidmap \
-      xfsprogs \
-      xz
-COPY --link --from=gotestsum /out/gotestsum /usr/bin/
-COPY --link --from=registry /bin/registry /usr/bin/
-COPY --link --from=docker /opt/docker/* /usr/bin/
-COPY --link --from=buildkit /usr/bin/buildkitd /usr/bin/
-COPY --link --from=buildkit /usr/bin/buildctl /usr/bin/
-COPY --link --from=binaries /buildx /usr/bin/
-
-FROM integration-test-base AS integration-test
-COPY . .
-
 # Release
 FROM --platform=$BUILDPLATFORM alpine AS releaser
 WORKDIR /work
@@ -128,7 +76,7 @@ FROM scratch AS release
 COPY --from=releaser /out/ /

 # Shell
-FROM docker:$DOCKER_VERSION AS dockerd-release
+FROM docker:$DOCKERD_VERSION AS dockerd-release
 FROM alpine AS shell
 RUN apk add --no-cache iptables tmux git vim less openssh
 RUN mkdir -p /usr/local/lib/docker/cli-plugins && ln -s /usr/local/bin/buildx /usr/local/lib/docker/cli-plugins/docker-buildx
--- a/20
+++ b/20
@@ -37,7 +37,7 @@ release:
 	./hack/release

 .PHONY: validate-all
-validate-all: lint test validate-vendor validate-docs validate-generated-files
+validate-all: lint test validate-vendor validate-docs

 .PHONY: lint
 lint:
@@ -45,15 +45,7 @@ lint:

 .PHONY: test
 test:
-	./hack/test
-
-.PHONY: test-unit
-test-unit:
-	TESTPKGS=./... SKIP_INTEGRATION_TESTS=1 ./hack/test
-
-.PHONY: test
-test-integration:
-	TESTPKGS=./tests ./hack/test
+	$(BUILDX_CMD) bake test

 .PHONY: validate-vendor
 validate-vendor:
@@ -67,10 +59,6 @@ validate-docs:
 validate-authors:
 	$(BUILDX_CMD) bake validate-authors

-.PHONY: validate-generated-files
-validate-generated-files:
-	$(BUILDX_CMD) bake validate-generated-files
-
 .PHONY: test-driver
 test-driver:
 	./hack/test-driver
@@ -90,7 +78,3 @@ authors:
 .PHONY: mod-outdated
 mod-outdated:
 	$(BUILDX_CMD) bake mod-outdated
-
-.PHONY: generated-files
-generated-files:
-	$(BUILDX_CMD) bake update-generated-files
--- a/README.md
+++ b/README.md
@@ -32,6 +32,19 @@ Key features:
  - [Building with buildx](#building-with-buildx)
  - [Working with builder instances](#working-with-builder-instances)
  - [Building multi-platform images](#building-multi-platform-images)
+- [Manuals](docs/manuals)
+  - [High-level build options with Bake](docs/manuals/bake/index.md)
+  - [Drivers](docs/manuals/drivers/index.md)
+  - [Exporters](docs/manuals/exporters/index.md)
+  - [Cache backends](docs/manuals/cache/backends/index.md)
+- [Guides](docs/guides)
+  - [CI/CD](docs/guides/cicd.md)
+  - [CNI networking](docs/guides/cni-networking.md)
+  - [Using a custom network](docs/guides/custom-network.md)
+  - [Using a custom registry configuration](docs/guides/custom-registry-config.md)
+  - [OpenTelemetry support](docs/guides/opentelemetry.md)
+  - [Registry mirror](docs/guides/registry-mirror.md)
+  - [Resource limiting](docs/guides/resource-limiting.md)
 - [Reference](docs/reference/buildx.md)
  - [`buildx bake`](docs/reference/buildx_bake.md)
  - [`buildx build`](docs/reference/buildx_build.md)
@@ -41,26 +54,21 @@ Key features:
    - [`buildx imagetools create`](docs/reference/buildx_imagetools_create.md)
    - [`buildx imagetools inspect`](docs/reference/buildx_imagetools_inspect.md)
  - [`buildx inspect`](docs/reference/buildx_inspect.md)
+  - [`buildx install`](docs/reference/buildx_install.md)
  - [`buildx ls`](docs/reference/buildx_ls.md)
  - [`buildx prune`](docs/reference/buildx_prune.md)
  - [`buildx rm`](docs/reference/buildx_rm.md)
  - [`buildx stop`](docs/reference/buildx_stop.md)
+  - [`buildx uninstall`](docs/reference/buildx_uninstall.md)
  - [`buildx use`](docs/reference/buildx_use.md)
  - [`buildx version`](docs/reference/buildx_version.md)
 - [Contributing](#contributing)

-For more information on how to use Buildx, see
-[Docker Build docs](https://docs.docker.com/build/).
-
 # Installing

-Using `buildx` with Docker requires Docker engine 19.03 or newer.
-
-> **Warning**
->
-> Using an incompatible version of Docker may result in unexpected behavior,
-> and will likely cause issues, especially when using Buildx builders with more
-> recent versions of BuildKit.
+Using `buildx` as a docker CLI plugin requires using Docker 19.03 or newer.
+A limited set of functionality works with older versions of Docker when
+invoking the binary directly.

 ## Windows and macOS

@@ -69,9 +77,8 @@ for Windows and macOS.

 ## Linux packages

-Docker Engine package repositories contain Docker Buildx packages when installed according to the
-[Docker Engine install documentation](https://docs.docker.com/engine/install/). Install the
-`docker-buildx-plugin` package to install the Buildx plugin.
+Docker Linux packages also include Docker Buildx when installed using the
+[DEB or RPM packages](https://docs.docker.com/engine/install/).

 ## Manual download

@@ -147,7 +154,7 @@ $ DOCKER_BUILDKIT=1 docker build --platform=local -o . "https://github.com/docke
 $ mkdir -p ~/.docker/cli-plugins
 $ mv buildx ~/.docker/cli-plugins/docker-buildx

-# Local
+# Local 
 $ git clone https://github.com/docker/buildx.git && cd buildx
 $ make install
 ```
@@ -239,7 +246,7 @@ When you invoke a build, you can set the `--platform` flag to specify the target
 platform for the build output, (for example, `linux/amd64`, `linux/arm64`, or
 `darwin/amd64`).

-When the current builder instance is backed by the `docker-container` or
+When the current builder instance is backed by the `docker-container` or 
 `kubernetes` driver, you can specify multiple platforms together. In this case,
 it builds a manifest list which contains images for all specified architectures.
 When you use this image in [`docker run`](https://docs.docker.com/engine/reference/commandline/run/)
@@ -309,7 +316,7 @@ cross-compilation helpers for more advanced use-cases.

 ## High-level build options

-See [High-level builds with Bake](https://docs.docker.com/build/bake/) for more details.
+See [`docs/manuals/bake/index.md`](docs/manuals/bake/index.md) for more details.

 # Contributing

--- a/bake/bake.go
+++ b/bake/bake.go
@@ -3,6 +3,7 @@ package bake
 import (
 	"context"
 	"encoding/csv"
+	"fmt"
 	"io"
 	"os"
 	"path"
@@ -11,26 +12,23 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"time"

-	composecli "github.com/compose-spec/compose-go/cli"
 	"github.com/docker/buildx/bake/hclparser"
 	"github.com/docker/buildx/build"
-	controllerapi "github.com/docker/buildx/controller/pb"
 	"github.com/docker/buildx/util/buildflags"
 	"github.com/docker/buildx/util/platformutil"
-	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/config"
+	"github.com/docker/docker/builder/remotecontext/urlutil"
 	hcl "github.com/hashicorp/hcl/v2"
-	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/client/llb"
 	"github.com/moby/buildkit/session/auth/authprovider"
 	"github.com/pkg/errors"
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/convert"
 )

 var (
+	httpPrefix                   = regexp.MustCompile(`^https?://`)
+	gitURLPathWithFragmentSuffix = regexp.MustCompile(`\.git(?:#.+)?$`)
+
 	validTargetNameChars = `[a-zA-Z0-9_-]+`
 	targetNamePattern    = regexp.MustCompile(`^` + validTargetNameChars + `$`)
 )
@@ -46,18 +44,17 @@ type Override struct {
 }

 func defaultFilenames() []string {
-	names := []string{}
-	names = append(names, composecli.DefaultFileNames...)
-	names = append(names, []string{
+	return []string{
+		"docker-compose.yml",  // support app
+		"docker-compose.yaml", // support app
 		"docker-bake.json",
 		"docker-bake.override.json",
 		"docker-bake.hcl",
 		"docker-bake.override.hcl",
-	}...)
-	return names
+	}
 }

-func ReadLocalFiles(names []string, stdin io.Reader, l progress.SubLogger) ([]File, error) {
+func ReadLocalFiles(names []string) ([]File, error) {
 	isDefault := false
 	if len(names) == 0 {
 		isDefault = true
@@ -65,26 +62,20 @@ func ReadLocalFiles(names []string, stdin io.Reader, l progress.SubLogger) ([]Fi
 	}
 	out := make([]File, 0, len(names))

-	setStatus := func(st *client.VertexStatus) {
-		if l != nil {
-			l.SetStatus(st)
-		}
-	}
-
 	for _, n := range names {
 		var dt []byte
 		var err error
 		if n == "-" {
-			dt, err = readWithProgress(stdin, setStatus)
+			dt, err = io.ReadAll(os.Stdin)
 			if err != nil {
 				return nil, err
 			}
 		} else {
-			dt, err = readFileWithProgress(n, isDefault, setStatus)
-			if dt == nil && err == nil {
-				continue
-			}
+			dt, err = os.ReadFile(n)
 			if err != nil {
+				if isDefault && errors.Is(err, os.ErrNotExist) {
+					continue
+				}
 				return nil, err
 			}
 		}
@@ -93,103 +84,6 @@ func ReadLocalFiles(names []string, stdin io.Reader, l progress.SubLogger) ([]Fi
 	return out, nil
 }

-func readFileWithProgress(fname string, isDefault bool, setStatus func(st *client.VertexStatus)) (dt []byte, err error) {
-	st := &client.VertexStatus{
-		ID: "reading " + fname,
-	}
-
-	defer func() {
-		now := time.Now()
-		st.Completed = &now
-		if dt != nil || err != nil {
-			setStatus(st)
-		}
-	}()
-
-	now := time.Now()
-	st.Started = &now
-
-	f, err := os.Open(fname)
-	if err != nil {
-		if isDefault && errors.Is(err, os.ErrNotExist) {
-			return nil, nil
-		}
-		return nil, err
-	}
-	defer f.Close()
-	setStatus(st)
-
-	info, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	st.Total = info.Size()
-	setStatus(st)
-
-	buf := make([]byte, 1024)
-	for {
-		n, err := f.Read(buf)
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return nil, err
-		}
-		dt = append(dt, buf[:n]...)
-		st.Current += int64(n)
-		setStatus(st)
-	}
-
-	return dt, nil
-}
-
-func readWithProgress(r io.Reader, setStatus func(st *client.VertexStatus)) (dt []byte, err error) {
-	st := &client.VertexStatus{
-		ID: "reading from stdin",
-	}
-
-	defer func() {
-		now := time.Now()
-		st.Completed = &now
-		setStatus(st)
-	}()
-
-	now := time.Now()
-	st.Started = &now
-	setStatus(st)
-
-	buf := make([]byte, 1024)
-	for {
-		n, err := r.Read(buf)
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return nil, err
-		}
-		dt = append(dt, buf[:n]...)
-		st.Current += int64(n)
-		setStatus(st)
-	}
-
-	return dt, nil
-}
-
-func ListTargets(files []File) ([]string, error) {
-	c, err := ParseFiles(files, nil)
-	if err != nil {
-		return nil, err
-	}
-	var targets []string
-	for _, g := range c.Groups {
-		targets = append(targets, g.Name)
-	}
-	for _, t := range c.Targets {
-		targets = append(targets, t.Name)
-	}
-	return dedupSlice(targets), nil
-}
-
 func ReadTargets(ctx context.Context, files []File, targets, overrides []string, defaults map[string]string) (map[string]*Target, map[string]*Group, error) {
 	c, err := ParseFiles(files, defaults)
 	if err != nil {
@@ -246,6 +140,19 @@ func ReadTargets(ctx context.Context, files []File, targets, overrides []string,
 		}
 	}

+	// Propagate SOURCE_DATE_EPOCH from the client env.
+	// The logic is purposely duplicated from `build/build`.go for keeping this visible in `bake --print`.
+	if v := os.Getenv("SOURCE_DATE_EPOCH"); v != "" {
+		for _, f := range m {
+			if f.Args == nil {
+				f.Args = make(map[string]*string)
+			}
+			if _, ok := f.Args["SOURCE_DATE_EPOCH"]; !ok {
+				f.Args["SOURCE_DATE_EPOCH"] = &v
+			}
+		}
+	}
+
 	return m, n, nil
 }

@@ -321,7 +228,7 @@ func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error)
 				}
 				hclFiles = append(hclFiles, hf)
 			} else if composeErr != nil {
-				return nil, errors.Wrapf(err, "failed to parse %s: parsing yaml: %v, parsing hcl", f.Name, composeErr)
+				return nil, fmt.Errorf("failed to parse %s: parsing yaml: %v, parsing hcl: %w", f.Name, composeErr, err)
 			} else {
 				return nil, err
 			}
@@ -338,28 +245,13 @@ func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error)
 	}

 	if len(hclFiles) > 0 {
-		renamed, err := hclparser.Parse(hclparser.MergeFiles(hclFiles), hclparser.Opt{
+		if err := hclparser.Parse(hcl.MergeFiles(hclFiles), hclparser.Opt{
 			LookupVar:     os.LookupEnv,
 			Vars:          defaults,
 			ValidateLabel: validateTargetName,
-		}, &c)
-		if err.HasErrors() {
+		}, &c); err.HasErrors() {
 			return nil, err
 		}
-
-		for _, renamed := range renamed {
-			for oldName, newNames := range renamed {
-				newNames = dedupSlice(newNames)
-				if len(newNames) == 1 && oldName == newNames[0] {
-					continue
-				}
-				c.Groups = append(c.Groups, &Group{
-					Name:    oldName,
-					Targets: newNames,
-				})
-			}
-		}
-		c = dedupeConfig(c)
 	}

 	return &c, nil
@@ -677,10 +569,9 @@ type Target struct {
 	Name string `json:"-" hcl:"name,label" cty:"name"`

 	// Inherits is the only field that cannot be overridden with --set
+	Attest   []string `json:"attest,omitempty" hcl:"attest,optional" cty:"attest"`
 	Inherits []string `json:"inherits,omitempty" hcl:"inherits,optional" cty:"inherits"`

-	Annotations      []string           `json:"annotations,omitempty" hcl:"annotations,optional" cty:"annotations"`
-	Attest           []string           `json:"attest,omitempty" hcl:"attest,optional" cty:"attest"`
 	Context          *string            `json:"context,omitempty" hcl:"context,optional" cty:"context"`
 	Contexts         map[string]string  `json:"contexts,omitempty" hcl:"contexts,optional" cty:"contexts"`
 	Dockerfile       *string            `json:"dockerfile,omitempty" hcl:"dockerfile,optional" cty:"dockerfile"`
@@ -699,20 +590,14 @@ type Target struct {
 	NoCache          *bool              `json:"no-cache,omitempty" hcl:"no-cache,optional" cty:"no-cache"`
 	NetworkMode      *string            `json:"-" hcl:"-" cty:"-"`
 	NoCacheFilter    []string           `json:"no-cache-filter,omitempty" hcl:"no-cache-filter,optional" cty:"no-cache-filter"`
-	// IMPORTANT: if you add more fields here, do not forget to update newOverrides and docs/bake-reference.md.
+	// IMPORTANT: if you add more fields here, do not forget to update newOverrides and docs/manuals/bake/file-definition.md.

 	// linked is a private field to mark a target used as a linked one
 	linked bool
 }

-var _ hclparser.WithEvalContexts = &Target{}
-var _ hclparser.WithGetName = &Target{}
-var _ hclparser.WithEvalContexts = &Group{}
-var _ hclparser.WithGetName = &Group{}
-
 func (t *Target) normalize() {
-	t.Annotations = removeDupes(t.Annotations)
-	t.Attest = removeAttestDupes(t.Attest)
+	t.Attest = removeDupes(t.Attest)
 	t.Tags = removeDupes(t.Tags)
 	t.Secrets = removeDupes(t.Secrets)
 	t.SSH = removeDupes(t.SSH)
@@ -772,12 +657,8 @@ func (t *Target) Merge(t2 *Target) {
 	if t2.Target != nil {
 		t.Target = t2.Target
 	}
-	if t2.Annotations != nil { // merge
-		t.Annotations = append(t.Annotations, t2.Annotations...)
-	}
 	if t2.Attest != nil { // merge
 		t.Attest = append(t.Attest, t2.Attest...)
-		t.Attest = removeAttestDupes(t.Attest)
 	}
 	if t2.Secrets != nil { // merge
 		t.Secrets = append(t.Secrets, t2.Secrets...)
@@ -861,8 +742,6 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
 			t.Platforms = o.ArrValue
 		case "output":
 			t.Outputs = o.ArrValue
-		case "annotations":
-			t.Annotations = append(t.Annotations, o.ArrValue...)
 		case "attest":
 			t.Attest = append(t.Attest, o.ArrValue...)
 		case "no-cache":
@@ -900,114 +779,6 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
 	return nil
 }

-func (g *Group) GetEvalContexts(ectx *hcl.EvalContext, block *hcl.Block, loadDeps func(hcl.Expression) hcl.Diagnostics) ([]*hcl.EvalContext, error) {
-	content, _, err := block.Body.PartialContent(&hcl.BodySchema{
-		Attributes: []hcl.AttributeSchema{{Name: "matrix"}},
-	})
-	if err != nil {
-		return nil, err
-	}
-	if _, ok := content.Attributes["matrix"]; ok {
-		return nil, errors.Errorf("matrix is not supported for groups")
-	}
-	return []*hcl.EvalContext{ectx}, nil
-}
-
-func (t *Target) GetEvalContexts(ectx *hcl.EvalContext, block *hcl.Block, loadDeps func(hcl.Expression) hcl.Diagnostics) ([]*hcl.EvalContext, error) {
-	content, _, err := block.Body.PartialContent(&hcl.BodySchema{
-		Attributes: []hcl.AttributeSchema{{Name: "matrix"}},
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	attr, ok := content.Attributes["matrix"]
-	if !ok {
-		return []*hcl.EvalContext{ectx}, nil
-	}
-	if diags := loadDeps(attr.Expr); diags.HasErrors() {
-		return nil, diags
-	}
-	value, err := attr.Expr.Value(ectx)
-	if err != nil {
-		return nil, err
-	}
-
-	if !value.Type().IsMapType() && !value.Type().IsObjectType() {
-		return nil, errors.Errorf("matrix must be a map")
-	}
-	matrix := value.AsValueMap()
-
-	ectxs := []*hcl.EvalContext{ectx}
-	for k, expr := range matrix {
-		if !expr.CanIterateElements() {
-			return nil, errors.Errorf("matrix values must be a list")
-		}
-
-		ectxs2 := []*hcl.EvalContext{}
-		for _, v := range expr.AsValueSlice() {
-			for _, e := range ectxs {
-				e2 := ectx.NewChild()
-				e2.Variables = make(map[string]cty.Value)
-				for k, v := range e.Variables {
-					e2.Variables[k] = v
-				}
-				e2.Variables[k] = v
-				ectxs2 = append(ectxs2, e2)
-			}
-		}
-		ectxs = ectxs2
-	}
-	return ectxs, nil
-}
-
-func (g *Group) GetName(ectx *hcl.EvalContext, block *hcl.Block, loadDeps func(hcl.Expression) hcl.Diagnostics) (string, error) {
-	content, _, diags := block.Body.PartialContent(&hcl.BodySchema{
-		Attributes: []hcl.AttributeSchema{{Name: "name"}, {Name: "matrix"}},
-	})
-	if diags != nil {
-		return "", diags
-	}
-
-	if _, ok := content.Attributes["name"]; ok {
-		return "", errors.Errorf("name is not supported for groups")
-	}
-	if _, ok := content.Attributes["matrix"]; ok {
-		return "", errors.Errorf("matrix is not supported for groups")
-	}
-	return block.Labels[0], nil
-}
-
-func (t *Target) GetName(ectx *hcl.EvalContext, block *hcl.Block, loadDeps func(hcl.Expression) hcl.Diagnostics) (string, error) {
-	content, _, diags := block.Body.PartialContent(&hcl.BodySchema{
-		Attributes: []hcl.AttributeSchema{{Name: "name"}, {Name: "matrix"}},
-	})
-	if diags != nil {
-		return "", diags
-	}
-
-	attr, ok := content.Attributes["name"]
-	if !ok {
-		return block.Labels[0], nil
-	}
-	if _, ok := content.Attributes["matrix"]; !ok {
-		return "", errors.Errorf("name requires matrix")
-	}
-	if diags := loadDeps(attr.Expr); diags.HasErrors() {
-		return "", diags
-	}
-	value, diags := attr.Expr.Value(ectx)
-	if diags != nil {
-		return "", diags
-	}
-
-	value, err := convert.Convert(value, cty.String)
-	if err != nil {
-		return "", err
-	}
-	return value.AsString(), nil
-}
-
 func TargetsToBuildOpt(m map[string]*Target, inp *Input) (map[string]build.Options, error) {
 	m2 := make(map[string]build.Options, len(m))
 	for k, v := range m {
@@ -1032,7 +803,7 @@ func updateContext(t *build.Inputs, inp *Input) {
 		if strings.HasPrefix(v.Path, "cwd://") || strings.HasPrefix(v.Path, "target:") || strings.HasPrefix(v.Path, "docker-image:") {
 			continue
 		}
-		if build.IsRemoteURL(v.Path) {
+		if IsRemoteURL(v.Path) {
 			continue
 		}
 		st := llb.Scratch().File(llb.Copy(*inp.State, v.Path, "/"), llb.WithCustomNamef("set context %s to %s", k, v.Path))
@@ -1046,15 +817,10 @@ func updateContext(t *build.Inputs, inp *Input) {
 	if strings.HasPrefix(t.ContextPath, "cwd://") {
 		return
 	}
-	if build.IsRemoteURL(t.ContextPath) {
+	if IsRemoteURL(t.ContextPath) {
 		return
 	}
-	st := llb.Scratch().File(
-		llb.Copy(*inp.State, t.ContextPath, "/", &llb.CopyInfo{
-			CopyDirContentsOnly: true,
-		}),
-		llb.WithCustomNamef("set context to %s", t.ContextPath),
-	)
+	st := llb.Scratch().File(llb.Copy(*inp.State, t.ContextPath, "/"), llb.WithCustomNamef("set context to %s", t.ContextPath))
 	t.ContextState = &st
 }

@@ -1087,7 +853,7 @@ func validateContextsEntitlements(t build.Inputs, inp *Input) error {
 }

 func checkPath(p string) error {
-	if build.IsRemoteURL(p) || strings.HasPrefix(p, "target:") || strings.HasPrefix(p, "docker-image:") {
+	if IsRemoteURL(p) || strings.HasPrefix(p, "target:") || strings.HasPrefix(p, "docker-image:") {
 		return nil
 	}
 	p, err := filepath.EvalSymlinks(p)
@@ -1097,10 +863,6 @@ func checkPath(p string) error {
 		}
 		return err
 	}
-	p, err = filepath.Abs(p)
-	if err != nil {
-		return err
-	}
 	wd, err := os.Getwd()
 	if err != nil {
 		return err
@@ -1109,8 +871,7 @@ func checkPath(p string) error {
 	if err != nil {
 		return err
 	}
-	parts := strings.Split(rel, string(os.PathSeparator))
-	if parts[0] == ".." {
+	if strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
 		return errors.Errorf("path %s is outside of the working directory, please set BAKE_ALLOW_REMOTE_FS_ACCESS=1", p)
 	}
 	return nil
@@ -1128,75 +889,17 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 	if t.Context != nil {
 		contextPath = *t.Context
 	}
-	if !strings.HasPrefix(contextPath, "cwd://") && !build.IsRemoteURL(contextPath) {
+	if !strings.HasPrefix(contextPath, "cwd://") && !IsRemoteURL(contextPath) {
 		contextPath = path.Clean(contextPath)
 	}
 	dockerfilePath := "Dockerfile"
 	if t.Dockerfile != nil {
 		dockerfilePath = *t.Dockerfile
 	}
-	if !strings.HasPrefix(dockerfilePath, "cwd://") {
-		dockerfilePath = path.Clean(dockerfilePath)
-	}

-	bi := build.Inputs{
-		ContextPath:    contextPath,
-		DockerfilePath: dockerfilePath,
-		NamedContexts:  toNamedContexts(t.Contexts),
+	if !isRemoteResource(contextPath) && !path.IsAbs(dockerfilePath) {
+		dockerfilePath = path.Join(contextPath, dockerfilePath)
 	}
-	if t.DockerfileInline != nil {
-		bi.DockerfileInline = *t.DockerfileInline
-	}
-	updateContext(&bi, inp)
-	if strings.HasPrefix(bi.DockerfilePath, "cwd://") {
-		// If Dockerfile is local for a remote invocation, we first check if
-		// it's not outside the working directory and then resolve it to an
-		// absolute path.
-		bi.DockerfilePath = path.Clean(strings.TrimPrefix(bi.DockerfilePath, "cwd://"))
-		if err := checkPath(bi.DockerfilePath); err != nil {
-			return nil, err
-		}
-		var err error
-		bi.DockerfilePath, err = filepath.Abs(bi.DockerfilePath)
-		if err != nil {
-			return nil, err
-		}
-	} else if !build.IsRemoteURL(bi.DockerfilePath) && strings.HasPrefix(bi.ContextPath, "cwd://") && (inp != nil && build.IsRemoteURL(inp.URL)) {
-		// We don't currently support reading a remote Dockerfile with a local
-		// context when doing a remote invocation because we automatically
-		// derive the dockerfile from the context atm:
-		//
-		// target "default" {
-		//  context = BAKE_CMD_CONTEXT
-		//  dockerfile = "Dockerfile.app"
-		// }
-		//
-		// > docker buildx bake https://github.com/foo/bar.git
-		// failed to solve: failed to read dockerfile: open /var/lib/docker/tmp/buildkit-mount3004544897/Dockerfile.app: no such file or directory
-		//
-		// To avoid mistakenly reading a local Dockerfile, we check if the
-		// Dockerfile exists locally and if so, we error out.
-		if _, err := os.Stat(filepath.Join(path.Clean(strings.TrimPrefix(bi.ContextPath, "cwd://")), bi.DockerfilePath)); err == nil {
-			return nil, errors.Errorf("reading a dockerfile for a remote build invocation is currently not supported")
-		}
-	}
-	if strings.HasPrefix(bi.ContextPath, "cwd://") {
-		bi.ContextPath = path.Clean(strings.TrimPrefix(bi.ContextPath, "cwd://"))
-	}
-	if !build.IsRemoteURL(bi.ContextPath) && bi.ContextState == nil && !path.IsAbs(bi.DockerfilePath) {
-		bi.DockerfilePath = path.Join(bi.ContextPath, bi.DockerfilePath)
-	}
-	for k, v := range bi.NamedContexts {
-		if strings.HasPrefix(v.Path, "cwd://") {
-			bi.NamedContexts[k] = build.NamedContext{Path: path.Clean(strings.TrimPrefix(v.Path, "cwd://"))}
-		}
-	}
-
-	if err := validateContextsEntitlements(bi, inp); err != nil {
-		return nil, err
-	}
-
-	t.Context = &bi.ContextPath

 	args := map[string]string{}
 	for k, v := range t.Args {
@@ -1227,6 +930,30 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 		networkMode = *t.NetworkMode
 	}

+	bi := build.Inputs{
+		ContextPath:    contextPath,
+		DockerfilePath: dockerfilePath,
+		NamedContexts:  toNamedContexts(t.Contexts),
+	}
+	if t.DockerfileInline != nil {
+		bi.DockerfileInline = *t.DockerfileInline
+	}
+	updateContext(&bi, inp)
+	if strings.HasPrefix(bi.ContextPath, "cwd://") {
+		bi.ContextPath = path.Clean(strings.TrimPrefix(bi.ContextPath, "cwd://"))
+	}
+	for k, v := range bi.NamedContexts {
+		if strings.HasPrefix(v.Path, "cwd://") {
+			bi.NamedContexts[k] = build.NamedContext{Path: path.Clean(strings.TrimPrefix(v.Path, "cwd://"))}
+		}
+	}
+
+	if err := validateContextsEntitlements(bi, inp); err != nil {
+		return nil, err
+	}
+
+	t.Context = &bi.ContextPath
+
 	bo := &build.Options{
 		Inputs:        bi,
 		Tags:          t.Tags,
@@ -1246,30 +973,23 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 	bo.Platforms = platforms

 	dockerConfig := config.LoadDefaultConfigFile(os.Stderr)
-	bo.Session = append(bo.Session, authprovider.NewDockerAuthProvider(dockerConfig, nil))
+	bo.Session = append(bo.Session, authprovider.NewDockerAuthProvider(dockerConfig))

 	secrets, err := buildflags.ParseSecretSpecs(t.Secrets)
 	if err != nil {
 		return nil, err
 	}
-	secretAttachment, err := controllerapi.CreateSecrets(secrets)
-	if err != nil {
-		return nil, err
-	}
-	bo.Session = append(bo.Session, secretAttachment)
+	bo.Session = append(bo.Session, secrets)

-	sshSpecs, err := buildflags.ParseSSHSpecs(t.SSH)
+	sshSpecs := t.SSH
+	if len(sshSpecs) == 0 && buildflags.IsGitSSH(contextPath) {
+		sshSpecs = []string{"default"}
+	}
+	ssh, err := buildflags.ParseSSHSpecs(sshSpecs)
 	if err != nil {
 		return nil, err
 	}
-	if len(sshSpecs) == 0 && (buildflags.IsGitSSH(bi.ContextPath) || (inp != nil && buildflags.IsGitSSH(inp.URL))) {
-		sshSpecs = append(sshSpecs, &controllerapi.SSH{ID: "default"})
-	}
-	sshAttachment, err := controllerapi.CreateSSH(sshSpecs)
-	if err != nil {
-		return nil, err
-	}
-	bo.Session = append(bo.Session, sshAttachment)
+	bo.Session = append(bo.Session, ssh)

 	if t.Target != nil {
 		bo.Target = *t.Target
@@ -1279,43 +999,25 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 	if err != nil {
 		return nil, err
 	}
-	bo.CacheFrom = controllerapi.CreateCaches(cacheImports)
+	bo.CacheFrom = cacheImports

 	cacheExports, err := buildflags.ParseCacheEntry(t.CacheTo)
 	if err != nil {
 		return nil, err
 	}
-	bo.CacheTo = controllerapi.CreateCaches(cacheExports)
+	bo.CacheTo = cacheExports

-	outputs, err := buildflags.ParseExports(t.Outputs)
+	outputs, err := buildflags.ParseOutputs(t.Outputs)
 	if err != nil {
 		return nil, err
 	}
-	bo.Exports, err = controllerapi.CreateExports(outputs)
-	if err != nil {
-		return nil, err
-	}
-
-	annotations, err := buildflags.ParseAnnotations(t.Annotations)
-	if err != nil {
-		return nil, err
-	}
-	for _, e := range bo.Exports {
-		for k, v := range annotations {
-			e.Attrs[k.String()] = v
-		}
-	}
+	bo.Exports = outputs

 	attests, err := buildflags.ParseAttests(t.Attest)
 	if err != nil {
 		return nil, err
 	}
-	bo.Attests = controllerapi.CreateAttestations(attests)
-
-	bo.SourcePolicy, err = build.ReadSourcePolicy()
-	if err != nil {
-		return nil, err
-	}
+	bo.Attests = attests

 	return bo, nil
 }
@@ -1341,24 +1043,8 @@ func removeDupes(s []string) []string {
 	return s[:i]
 }

-func removeAttestDupes(s []string) []string {
-	res := []string{}
-	m := map[string]int{}
-	for _, v := range s {
-		att, err := buildflags.ParseAttest(v)
-		if err != nil {
-			res = append(res, v)
-			continue
-		}
-
-		if i, ok := m[att.Type]; ok {
-			res[i] = v
-		} else {
-			m[att.Type] = len(res)
-			res = append(res, v)
-		}
-	}
-	return res
+func isRemoteResource(str string) bool {
+	return urlutil.IsGitURL(str) || urlutil.IsURL(str)
 }

 func parseOutputType(str string) string {
--- a/bake/bake_test.go
+++ b/bake/bake_test.go
@@ -2,17 +2,16 @@ package bake

 import (
 	"context"
-	"os"
-	"path/filepath"
 	"sort"
 	"strings"
 	"testing"

-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

 func TestReadTargets(t *testing.T) {
+	t.Parallel()
+
 	fp := File{
 		Name: "config.hcl",
 		Data: []byte(`
@@ -36,7 +35,6 @@ target "webapp" {
 	ctx := context.TODO()

 	t.Run("NoOverrides", func(t *testing.T) {
-		t.Parallel()
 		m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, nil, nil)
 		require.NoError(t, err)
 		require.Equal(t, 1, len(m))
@@ -52,7 +50,6 @@ target "webapp" {
 	})

 	t.Run("InvalidTargetOverrides", func(t *testing.T) {
-		t.Parallel()
 		_, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"nosuchtarget.context=foo"}, nil)
 		require.NotNil(t, err)
 		require.Equal(t, err.Error(), "could not find any target matching 'nosuchtarget'")
@@ -94,7 +91,6 @@ target "webapp" {

 		// building leaf but overriding parent fields
 		t.Run("parent", func(t *testing.T) {
-			t.Parallel()
 			m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{
 				"webDEP.args.VAR_INHERITED=override",
 				"webDEP.args.VAR_BOTH=override",
@@ -109,7 +105,6 @@ target "webapp" {
 	})

 	t.Run("ContextOverride", func(t *testing.T) {
-		t.Parallel()
 		_, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.context"}, nil)
 		require.NotNil(t, err)

@@ -121,7 +116,6 @@ target "webapp" {
 	})

 	t.Run("NoCacheOverride", func(t *testing.T) {
-		t.Parallel()
 		m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.no-cache=false"}, nil)
 		require.NoError(t, err)
 		require.Equal(t, false, *m["webapp"].NoCache)
@@ -130,7 +124,6 @@ target "webapp" {
 	})

 	t.Run("PullOverride", func(t *testing.T) {
-		t.Parallel()
 		m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.pull=false"}, nil)
 		require.NoError(t, err)
 		require.Equal(t, false, *m["webapp"].Pull)
@@ -139,7 +132,6 @@ target "webapp" {
 	})

 	t.Run("PatternOverride", func(t *testing.T) {
-		t.Parallel()
 		// same check for two cases
 		multiTargetCheck := func(t *testing.T, m map[string]*Target, g map[string]*Group, err error) {
 			require.NoError(t, err)
@@ -297,9 +289,6 @@ services:

 	ctx := context.TODO()

-	cwd, err := os.Getwd()
-	require.NoError(t, err)
-
 	m, g, err := ReadTargets(ctx, []File{fp, fp2, fp3}, []string{"default"}, nil, nil)
 	require.NoError(t, err)

@@ -308,7 +297,7 @@ services:

 	require.True(t, ok)
 	require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile)
-	require.Equal(t, cwd, *m["webapp"].Context)
+	require.Equal(t, ".", *m["webapp"].Context)
 	require.Equal(t, ptrstr("1"), m["webapp"].Args["buildno"])
 	require.Equal(t, ptrstr("12"), m["webapp"].Args["buildno2"])

@@ -347,9 +336,6 @@ services:

 	ctx := context.TODO()

-	cwd, err := os.Getwd()
-	require.NoError(t, err)
-
 	m, _, err := ReadTargets(ctx, []File{fp}, []string{"web.app"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(m))
@@ -372,7 +358,7 @@ services:
 	_, ok = m["web_app"]
 	require.True(t, ok)
 	require.Equal(t, "Dockerfile.webapp", *m["web_app"].Dockerfile)
-	require.Equal(t, cwd, *m["web_app"].Context)
+	require.Equal(t, ".", *m["web_app"].Context)
 	require.Equal(t, ptrstr("1"), m["web_app"].Args["buildno"])
 	require.Equal(t, ptrstr("12"), m["web_app"].Args["buildno2"])

@@ -381,7 +367,7 @@ services:
 	require.Equal(t, []string{"web_app"}, g["default"].Targets)
 }

-func TestHCLContextCwdPrefix(t *testing.T) {
+func TestHCLCwdPrefix(t *testing.T) {
 	fp := File{
 		Name: "docker-bake.hcl",
 		Data: []byte(
@@ -394,49 +380,18 @@ func TestHCLContextCwdPrefix(t *testing.T) {
 	m, g, err := ReadTargets(ctx, []File{fp}, []string{"app"}, nil, nil)
 	require.NoError(t, err)

-	bo, err := TargetsToBuildOpt(m, &Input{})
+	require.Equal(t, 1, len(m))
+	_, ok := m["app"]
+	require.True(t, ok)
+
+	_, err = TargetsToBuildOpt(m, &Input{})
 	require.NoError(t, err)

+	require.Equal(t, "test", *m["app"].Dockerfile)
+	require.Equal(t, "foo", *m["app"].Context)
+
 	require.Equal(t, 1, len(g))
 	require.Equal(t, []string{"app"}, g["default"].Targets)
-
-	require.Equal(t, 1, len(m))
-	require.Contains(t, m, "app")
-	assert.Equal(t, "test", *m["app"].Dockerfile)
-	assert.Equal(t, "foo", *m["app"].Context)
-	assert.Equal(t, "foo/test", bo["app"].Inputs.DockerfilePath)
-	assert.Equal(t, "foo", bo["app"].Inputs.ContextPath)
-}
-
-func TestHCLDockerfileCwdPrefix(t *testing.T) {
-	fp := File{
-		Name: "docker-bake.hcl",
-		Data: []byte(
-			`target "app" {
-				context = "."
-				dockerfile = "cwd://Dockerfile.app"
-			}`),
-	}
-	ctx := context.TODO()
-
-	cwd, err := os.Getwd()
-	require.NoError(t, err)
-
-	m, g, err := ReadTargets(ctx, []File{fp}, []string{"app"}, nil, nil)
-	require.NoError(t, err)
-
-	bo, err := TargetsToBuildOpt(m, &Input{})
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(g))
-	require.Equal(t, []string{"app"}, g["default"].Targets)
-
-	require.Equal(t, 1, len(m))
-	require.Contains(t, m, "app")
-	assert.Equal(t, "cwd://Dockerfile.app", *m["app"].Dockerfile)
-	assert.Equal(t, ".", *m["app"].Context)
-	assert.Equal(t, filepath.Join(cwd, "Dockerfile.app"), bo["app"].Inputs.DockerfilePath)
-	assert.Equal(t, ".", bo["app"].Inputs.ContextPath)
 }

 func TestOverrideMerge(t *testing.T) {
@@ -581,9 +536,6 @@ services:

 	ctx := context.TODO()

-	cwd, err := os.Getwd()
-	require.NoError(t, err)
-
 	m, _, err := ReadTargets(ctx, []File{fp, fp2}, []string{"app1", "app2"}, nil, nil)
 	require.NoError(t, err)

@@ -596,7 +548,7 @@ services:
 	require.Equal(t, "Dockerfile", *m["app1"].Dockerfile)
 	require.Equal(t, ".", *m["app1"].Context)
 	require.Equal(t, "Dockerfile", *m["app2"].Dockerfile)
-	require.Equal(t, cwd, *m["app2"].Context)
+	require.Equal(t, ".", *m["app2"].Context)
 }

 func TestReadContextFromTargetChain(t *testing.T) {
@@ -1406,117 +1358,3 @@ func TestJSONNullVars(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, m["default"].Args)
 }
-
-func TestReadLocalFilesDefault(t *testing.T) {
-	tests := []struct {
-		filenames []string
-		expected  []string
-	}{
-		{
-			filenames: []string{"abc.yml", "docker-compose.yml"},
-			expected:  []string{"docker-compose.yml"},
-		},
-		{
-			filenames: []string{"test.foo", "compose.yml", "docker-bake.hcl"},
-			expected:  []string{"compose.yml", "docker-bake.hcl"},
-		},
-		{
-			filenames: []string{"compose.yaml", "docker-compose.yml", "docker-bake.hcl"},
-			expected:  []string{"compose.yaml", "docker-compose.yml", "docker-bake.hcl"},
-		},
-		{
-			filenames: []string{"test.txt", "compsoe.yaml"}, // intentional misspell
-			expected:  []string{},
-		},
-	}
-	pwd, err := os.Getwd()
-	require.NoError(t, err)
-
-	for _, tt := range tests {
-		t.Run(strings.Join(tt.filenames, "-"), func(t *testing.T) {
-			dir := t.TempDir()
-			t.Cleanup(func() { _ = os.Chdir(pwd) })
-			require.NoError(t, os.Chdir(dir))
-			for _, tf := range tt.filenames {
-				require.NoError(t, os.WriteFile(tf, []byte(tf), 0644))
-			}
-			files, err := ReadLocalFiles(nil, nil, nil)
-			require.NoError(t, err)
-			if len(files) == 0 {
-				require.Equal(t, len(tt.expected), len(files))
-			} else {
-				found := false
-				for _, exp := range tt.expected {
-					for _, f := range files {
-						if f.Name == exp {
-							found = true
-							break
-						}
-					}
-					require.True(t, found, exp)
-				}
-			}
-		})
-	}
-}
-
-func TestAttestDuplicates(t *testing.T) {
-	fp := File{
-		Name: "docker-bake.hcl",
-		Data: []byte(
-			`target "default" {
-                attest = ["type=sbom", "type=sbom,generator=custom", "type=sbom,foo=bar", "type=provenance,mode=max"]
-            }`),
-	}
-	ctx := context.TODO()
-
-	m, _, err := ReadTargets(ctx, []File{fp}, []string{"default"}, nil, nil)
-	require.Equal(t, []string{"type=sbom,foo=bar", "type=provenance,mode=max"}, m["default"].Attest)
-	require.NoError(t, err)
-
-	opts, err := TargetsToBuildOpt(m, &Input{})
-	require.NoError(t, err)
-	require.Equal(t, map[string]*string{
-		"sbom":       ptrstr("type=sbom,foo=bar"),
-		"provenance": ptrstr("type=provenance,mode=max"),
-	}, opts["default"].Attests)
-
-	m, _, err = ReadTargets(ctx, []File{fp}, []string{"default"}, []string{"*.attest=type=sbom,disabled=true"}, nil)
-	require.Equal(t, []string{"type=sbom,disabled=true", "type=provenance,mode=max"}, m["default"].Attest)
-	require.NoError(t, err)
-
-	opts, err = TargetsToBuildOpt(m, &Input{})
-	require.NoError(t, err)
-	require.Equal(t, map[string]*string{
-		"sbom":       nil,
-		"provenance": ptrstr("type=provenance,mode=max"),
-	}, opts["default"].Attests)
-}
-
-func TestAnnotations(t *testing.T) {
-	fp := File{
-		Name: "docker-bake.hcl",
-		Data: []byte(
-			`target "app" {
-				output = ["type=image,name=foo"]
-				annotations = ["manifest[linux/amd64]:foo=bar"]
-			}`),
-	}
-	ctx := context.TODO()
-	m, g, err := ReadTargets(ctx, []File{fp}, []string{"app"}, nil, nil)
-	require.NoError(t, err)
-
-	bo, err := TargetsToBuildOpt(m, &Input{})
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(g))
-	require.Equal(t, []string{"app"}, g["default"].Targets)
-
-	require.Equal(t, 1, len(m))
-	require.Contains(t, m, "app")
-	require.Equal(t, "type=image,name=foo", m["app"].Outputs[0])
-	require.Equal(t, "manifest[linux/amd64]:foo=bar", m["app"].Annotations[0])
-
-	require.Len(t, bo["app"].Exports, 1)
-	require.Equal(t, "bar", bo["app"].Exports[0].Attrs["annotation-manifest[linux/amd64].foo"])
-}
--- a/bake/compose.go
+++ b/bake/compose.go
@@ -1,7 +1,6 @@
 package bake

 import (
-	"context"
 	"os"
 	"path/filepath"
 	"strings"
@@ -29,16 +28,11 @@ func ParseComposeFiles(fs []File) (*Config, error) {
 }

 func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, error) {
-	if envs == nil {
-		envs = make(map[string]string)
-	}
-	cfg, err := loader.LoadWithContext(context.Background(), compose.ConfigDetails{
+	cfg, err := loader.Load(compose.ConfigDetails{
 		ConfigFiles: cfgs,
 		Environment: envs,
 	}, func(options *loader.Options) {
-		options.SetProjectName("bake", false)
 		options.SkipNormalization = true
-		options.Profiles = []string{"*"}
 	})
 	if err != nil {
 		return nil, err
@@ -52,7 +46,6 @@ func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, e
 		g := &Group{Name: "default"}

 		for _, s := range cfg.Services {
-			s := s
 			if s.Build == nil {
 				continue
 			}
@@ -72,19 +65,6 @@ func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, e
 				dockerfilePath := s.Build.Dockerfile
 				dockerfilePathP = &dockerfilePath
 			}
-			var dockerfileInlineP *string
-			if s.Build.DockerfileInline != "" {
-				dockerfileInline := s.Build.DockerfileInline
-				dockerfileInlineP = &dockerfileInline
-			}
-
-			var additionalContexts map[string]string
-			if s.Build.AdditionalContexts != nil {
-				additionalContexts = map[string]string{}
-				for k, v := range s.Build.AdditionalContexts {
-					additionalContexts[k] = v
-				}
-			}

 			var secrets []string
 			for _, bs := range s.Build.Secrets {
@@ -98,19 +78,16 @@ func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, e
 			// compose does not support nil values for labels
 			labels := map[string]*string{}
 			for k, v := range s.Build.Labels {
-				v := v
 				labels[k] = &v
 			}

 			g.Targets = append(g.Targets, targetName)
 			t := &Target{
-				Name:             targetName,
-				Context:          contextPathP,
-				Contexts:         additionalContexts,
-				Dockerfile:       dockerfilePathP,
-				DockerfileInline: dockerfileInlineP,
-				Tags:             s.Build.Tags,
-				Labels:           labels,
+				Name:       targetName,
+				Context:    contextPathP,
+				Dockerfile: dockerfilePathP,
+				Tags:       s.Build.Tags,
+				Labels:     labels,
 				Args: flatten(s.Build.Args.Resolve(func(val string) (string, bool) {
 					if val, ok := s.Environment[val]; ok && val != nil {
 						return *val, true
@@ -167,7 +144,6 @@ func validateCompose(dt []byte, envs map[string]string) error {
 		},
 		Environment: envs,
 	}, func(options *loader.Options) {
-		options.SetProjectName("bake", false)
 		options.SkipNormalization = true
 		// consistency is checked later in ParseCompose to ensure multiple
 		// compose files can be merged together
@@ -208,7 +184,7 @@ func loadDotEnv(curenv map[string]string, workingDir string) (map[string]string,
 		return nil, err
 	}

-	envs, err := dotenv.UnmarshalBytesWithLookup(dt, nil)
+	envs, err := dotenv.UnmarshalBytes(dt)
 	if err != nil {
 		return nil, err
 	}
--- a/bake/compose_test.go
+++ b/bake/compose_test.go
@@ -21,8 +21,6 @@ services:
  webapp:
    build:
      context: ./dir
-      additional_contexts:
-        foo: ./bar
      dockerfile: Dockerfile-alternate
      network:
        none
@@ -35,13 +33,6 @@ services:
      secrets:
        - token
        - aws
-  webapp2:
-    profiles:
-      - test
-    build:
-      context: ./dir
-      dockerfile_inline: |
-        FROM alpine
 secrets:
  token:
    environment: ENV_TOKEN
@@ -49,28 +40,24 @@ secrets:
    file: /root/.aws/credentials
 `)

-	cwd, err := os.Getwd()
-	require.NoError(t, err)
-
 	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)

 	require.Equal(t, 1, len(c.Groups))
 	require.Equal(t, "default", c.Groups[0].Name)
 	sort.Strings(c.Groups[0].Targets)
-	require.Equal(t, []string{"db", "webapp", "webapp2"}, c.Groups[0].Targets)
+	require.Equal(t, []string{"db", "webapp"}, c.Groups[0].Targets)

-	require.Equal(t, 3, len(c.Targets))
+	require.Equal(t, 2, len(c.Targets))
 	sort.Slice(c.Targets, func(i, j int) bool {
 		return c.Targets[i].Name < c.Targets[j].Name
 	})
 	require.Equal(t, "db", c.Targets[0].Name)
-	require.Equal(t, filepath.Join(cwd, "db"), *c.Targets[0].Context)
+	require.Equal(t, "./db", *c.Targets[0].Context)
 	require.Equal(t, []string{"docker.io/tonistiigi/db"}, c.Targets[0].Tags)

 	require.Equal(t, "webapp", c.Targets[1].Name)
-	require.Equal(t, filepath.Join(cwd, "dir"), *c.Targets[1].Context)
-	require.Equal(t, map[string]string{"foo": filepath.Join(cwd, "bar")}, c.Targets[1].Contexts)
+	require.Equal(t, "./dir", *c.Targets[1].Context)
 	require.Equal(t, "Dockerfile-alternate", *c.Targets[1].Dockerfile)
 	require.Equal(t, 1, len(c.Targets[1].Args))
 	require.Equal(t, ptrstr("123"), c.Targets[1].Args["buildno"])
@@ -81,10 +68,6 @@ secrets:
 		"id=token,env=ENV_TOKEN",
 		"id=aws,src=/root/.aws/credentials",
 	}, c.Targets[1].Secrets)
-
-	require.Equal(t, "webapp2", c.Targets[2].Name)
-	require.Equal(t, filepath.Join(cwd, "dir"), *c.Targets[2].Context)
-	require.Equal(t, "FROM alpine\n", *c.Targets[2].DockerfileInline)
 }

 func TestNoBuildOutOfTreeService(t *testing.T) {
@@ -659,85 +642,6 @@ services:
 	require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, c.Targets[0].Args)
 }

-func TestDependsOn(t *testing.T) {
-	var dt = []byte(`
-services:
-  foo:
-    build:
-     context: .
-    ports:
-      - 3306:3306
-    depends_on:
-      - bar
-  bar:
-    build:
-     context: .
-`)
-	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
-	require.NoError(t, err)
-}
-
-func TestInclude(t *testing.T) {
-	tmpdir := t.TempDir()
-
-	err := os.WriteFile(filepath.Join(tmpdir, "compose-foo.yml"), []byte(`
-services:
-  foo:
-    build:
-     context: .
-     target: buildfoo
-    ports:
-      - 3306:3306
-`), 0644)
-	require.NoError(t, err)
-
-	var dt = []byte(`
-include:
-  - compose-foo.yml
-
-services:
-  bar:
-    build:
-     context: .
-     target: buildbar
-`)
-
-	chdir(t, tmpdir)
-	c, err := ParseComposeFiles([]File{{
-		Name: "compose.yml",
-		Data: dt,
-	}})
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(c.Targets))
-	sort.Slice(c.Targets, func(i, j int) bool {
-		return c.Targets[i].Name < c.Targets[j].Name
-	})
-	require.Equal(t, "bar", c.Targets[0].Name)
-	require.Equal(t, "buildbar", *c.Targets[0].Target)
-	require.Equal(t, "foo", c.Targets[1].Name)
-	require.Equal(t, "buildfoo", *c.Targets[1].Target)
-}
-
-func TestDevelop(t *testing.T) {
-	var dt = []byte(`
-services:
-  scratch:
-    build:
-     context: ./webapp
-    develop:
-      watch: 
-        - path: ./webapp/html
-          action: sync
-          target: /var/www
-          ignore:
-            - node_modules/
-`)
-
-	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
-	require.NoError(t, err)
-}
-
 // chdir changes the current working directory to the named directory,
 // and then restore the original working directory at the end of the test.
 func chdir(t *testing.T, dir string) {
--- a/bake/hcl_test.go
+++ b/bake/hcl_test.go
@@ -634,485 +634,6 @@ func TestHCLMultiFileAttrs(t *testing.T) {
 	require.Equal(t, ptrstr("pre-ghi"), c.Targets[0].Args["v1"])
 }

-func TestHCLMultiFileGlobalAttrs(t *testing.T) {
-	dt := []byte(`
-		FOO = "abc"
-		target "app" {
-			args = {
-				v1 = "pre-${FOO}"
-			}
-		}
-		`)
-	dt2 := []byte(`
-		FOO = "def"
-		`)
-
-	c, err := ParseFiles([]File{
-		{Data: dt, Name: "c1.hcl"},
-		{Data: dt2, Name: "c2.hcl"},
-	}, nil)
-	require.NoError(t, err)
-	require.Equal(t, 1, len(c.Targets))
-	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, "pre-def", *c.Targets[0].Args["v1"])
-}
-
-func TestHCLDuplicateTarget(t *testing.T) {
-	dt := []byte(`
-		target "app" {
-			dockerfile = "x"
-		}
-		target "app" {
-			dockerfile = "y"
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(c.Targets))
-	require.Equal(t, "app", c.Targets[0].Name)
-	require.Equal(t, "y", *c.Targets[0].Dockerfile)
-}
-
-func TestHCLRenameTarget(t *testing.T) {
-	dt := []byte(`
-		target "abc" {
-			name = "xyz"
-			dockerfile = "foo"
-		}
-		`)
-
-	_, err := ParseFile(dt, "docker-bake.hcl")
-	require.ErrorContains(t, err, "requires matrix")
-}
-
-func TestHCLRenameGroup(t *testing.T) {
-	dt := []byte(`
-		group "foo" {
-			name = "bar"
-			targets = ["x", "y"]
-		}
-		`)
-
-	_, err := ParseFile(dt, "docker-bake.hcl")
-	require.ErrorContains(t, err, "not supported")
-
-	dt = []byte(`
-		group "foo" {
-			matrix = {
-				name = ["x", "y"]
-			}
-		}
-		`)
-
-	_, err = ParseFile(dt, "docker-bake.hcl")
-	require.ErrorContains(t, err, "not supported")
-}
-
-func TestHCLRenameTargetAttrs(t *testing.T) {
-	dt := []byte(`
-		target "abc" {
-			name = "xyz"
-			matrix = {}
-			dockerfile = "foo"
-		}
-
-		target "def" {
-			dockerfile = target.xyz.dockerfile
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-	require.Equal(t, 2, len(c.Targets))
-	require.Equal(t, "xyz", c.Targets[0].Name)
-	require.Equal(t, "foo", *c.Targets[0].Dockerfile)
-	require.Equal(t, "def", c.Targets[1].Name)
-	require.Equal(t, "foo", *c.Targets[1].Dockerfile)
-
-	dt = []byte(`
-		target "def" {
-			dockerfile = target.xyz.dockerfile
-		}
-
-		target "abc" {
-			name = "xyz"
-			matrix = {}
-			dockerfile = "foo"
-		}
-		`)
-
-	c, err = ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-	require.Equal(t, 2, len(c.Targets))
-	require.Equal(t, "def", c.Targets[0].Name)
-	require.Equal(t, "foo", *c.Targets[0].Dockerfile)
-	require.Equal(t, "xyz", c.Targets[1].Name)
-	require.Equal(t, "foo", *c.Targets[1].Dockerfile)
-
-	dt = []byte(`
-		target "abc" {
-			name = "xyz"
-			matrix  = {}
-			dockerfile = "foo"
-		}
-
-		target "def" {
-			dockerfile = target.abc.dockerfile
-		}
-		`)
-
-	_, err = ParseFile(dt, "docker-bake.hcl")
-	require.ErrorContains(t, err, "abc")
-
-	dt = []byte(`
-		target "def" {
-			dockerfile = target.abc.dockerfile
-		}
-
-		target "abc" {
-			name = "xyz"
-			matrix = {}
-			dockerfile = "foo"
-		}
-		`)
-
-	_, err = ParseFile(dt, "docker-bake.hcl")
-	require.ErrorContains(t, err, "abc")
-}
-
-func TestHCLRenameSplit(t *testing.T) {
-	dt := []byte(`
-		target "x" {
-			name = "y"
-			matrix = {}
-			dockerfile = "foo"
-		}
-
-		target "x" {
-			name = "z"
-			matrix = {}
-			dockerfile = "bar"
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(c.Targets))
-	require.Equal(t, "y", c.Targets[0].Name)
-	require.Equal(t, "foo", *c.Targets[0].Dockerfile)
-	require.Equal(t, "z", c.Targets[1].Name)
-	require.Equal(t, "bar", *c.Targets[1].Dockerfile)
-
-	require.Equal(t, 1, len(c.Groups))
-	require.Equal(t, "x", c.Groups[0].Name)
-	require.Equal(t, []string{"y", "z"}, c.Groups[0].Targets)
-}
-
-func TestHCLRenameMultiFile(t *testing.T) {
-	dt := []byte(`
-		target "foo" {
-			name = "bar"
-			matrix = {}
-			dockerfile = "x"
-		}
-		`)
-	dt2 := []byte(`
-		target "foo" {
-			context = "y"
-		}
-		`)
-	dt3 := []byte(`
-		target "bar" {
-			target = "z"
-		}
-		`)
-
-	c, err := ParseFiles([]File{
-		{Data: dt, Name: "c1.hcl"},
-		{Data: dt2, Name: "c2.hcl"},
-		{Data: dt3, Name: "c3.hcl"},
-	}, nil)
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(c.Targets))
-
-	require.Equal(t, c.Targets[0].Name, "bar")
-	require.Equal(t, *c.Targets[0].Dockerfile, "x")
-	require.Equal(t, *c.Targets[0].Target, "z")
-
-	require.Equal(t, c.Targets[1].Name, "foo")
-	require.Equal(t, *c.Targets[1].Context, "y")
-}
-
-func TestHCLMatrixBasic(t *testing.T) {
-	dt := []byte(`
-		target "default" {
-			matrix = {
-				foo = ["x", "y"]
-			}
-			name = foo
-			dockerfile = "${foo}.Dockerfile"
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(c.Targets))
-	require.Equal(t, c.Targets[0].Name, "x")
-	require.Equal(t, c.Targets[1].Name, "y")
-	require.Equal(t, *c.Targets[0].Dockerfile, "x.Dockerfile")
-	require.Equal(t, *c.Targets[1].Dockerfile, "y.Dockerfile")
-
-	require.Equal(t, 1, len(c.Groups))
-	require.Equal(t, "default", c.Groups[0].Name)
-	require.Equal(t, []string{"x", "y"}, c.Groups[0].Targets)
-}
-
-func TestHCLMatrixMultipleKeys(t *testing.T) {
-	dt := []byte(`
-		target "default" {
-			matrix = {
-				foo = ["a"]
-				bar = ["b", "c"]
-				baz = ["d", "e", "f"]
-			}
-			name = "${foo}-${bar}-${baz}"
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 6, len(c.Targets))
-	names := make([]string, len(c.Targets))
-	for i, t := range c.Targets {
-		names[i] = t.Name
-	}
-	require.ElementsMatch(t, []string{"a-b-d", "a-b-e", "a-b-f", "a-c-d", "a-c-e", "a-c-f"}, names)
-
-	require.Equal(t, 1, len(c.Groups))
-	require.Equal(t, "default", c.Groups[0].Name)
-	require.ElementsMatch(t, []string{"a-b-d", "a-b-e", "a-b-f", "a-c-d", "a-c-e", "a-c-f"}, c.Groups[0].Targets)
-}
-
-func TestHCLMatrixLists(t *testing.T) {
-	dt := []byte(`
-	target "foo" {
-		matrix = {
-			aa = [["aa", "bb"], ["cc", "dd"]]
-		}
-		name = aa[0]
-		args = {
-			target = "val${aa[1]}"
-		}
-	}
-	`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(c.Targets))
-	require.Equal(t, "aa", c.Targets[0].Name)
-	require.Equal(t, ptrstr("valbb"), c.Targets[0].Args["target"])
-	require.Equal(t, "cc", c.Targets[1].Name)
-	require.Equal(t, ptrstr("valdd"), c.Targets[1].Args["target"])
-}
-
-func TestHCLMatrixMaps(t *testing.T) {
-	dt := []byte(`
-	target "foo" {
-		matrix = {
-			aa = [
-				{
-					foo = "aa"
-					bar = "bb"
-				},
-				{
-					foo = "cc"
-					bar = "dd"
-				}
-			]
-		}
-		name = aa.foo
-		args = {
-			target = "val${aa.bar}"
-		}
-	}
-	`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(c.Targets))
-	require.Equal(t, c.Targets[0].Name, "aa")
-	require.Equal(t, c.Targets[0].Args["target"], ptrstr("valbb"))
-	require.Equal(t, c.Targets[1].Name, "cc")
-	require.Equal(t, c.Targets[1].Args["target"], ptrstr("valdd"))
-}
-
-func TestHCLMatrixMultipleTargets(t *testing.T) {
-	dt := []byte(`
-		target "x" {
-			matrix = {
-				foo = ["a", "b"]
-			}
-			name = foo
-		}
-		target "y" {
-			matrix = {
-				bar = ["c", "d"]
-			}
-			name = bar
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 4, len(c.Targets))
-	names := make([]string, len(c.Targets))
-	for i, t := range c.Targets {
-		names[i] = t.Name
-	}
-	require.ElementsMatch(t, []string{"a", "b", "c", "d"}, names)
-
-	require.Equal(t, 2, len(c.Groups))
-	names = make([]string, len(c.Groups))
-	for i, c := range c.Groups {
-		names[i] = c.Name
-	}
-	require.ElementsMatch(t, []string{"x", "y"}, names)
-
-	for _, g := range c.Groups {
-		switch g.Name {
-		case "x":
-			require.Equal(t, []string{"a", "b"}, g.Targets)
-		case "y":
-			require.Equal(t, []string{"c", "d"}, g.Targets)
-		}
-	}
-}
-
-func TestHCLMatrixDuplicateNames(t *testing.T) {
-	dt := []byte(`
-		target "default" {
-			matrix = {
-				foo = ["a", "b"]
-			}
-			name = "c"
-		}
-		`)
-
-	_, err := ParseFile(dt, "docker-bake.hcl")
-	require.Error(t, err)
-}
-
-func TestHCLMatrixArgs(t *testing.T) {
-	dt := []byte(`
-		a = 1
-		variable "b" {
-			default = 2
-		}
-		target "default" {
-			matrix = {
-				foo = [a, b]
-			}
-			name = foo
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(c.Targets))
-	require.Equal(t, "1", c.Targets[0].Name)
-	require.Equal(t, "2", c.Targets[1].Name)
-}
-
-func TestHCLMatrixArgsOverride(t *testing.T) {
-	dt := []byte(`
-	variable "ABC" {
-		default = "def"
-	}
-
-	target "bar" {
-		matrix = {
-			aa = split(",", ABC)
-		}
-		name = "bar-${aa}"
-		args = {
-			foo = aa
-		}
-	}
-	`)
-
-	c, err := ParseFiles([]File{
-		{Data: dt, Name: "docker-bake.hcl"},
-	}, map[string]string{"ABC": "11,22,33"})
-	require.NoError(t, err)
-
-	require.Equal(t, 3, len(c.Targets))
-	require.Equal(t, "bar-11", c.Targets[0].Name)
-	require.Equal(t, "bar-22", c.Targets[1].Name)
-	require.Equal(t, "bar-33", c.Targets[2].Name)
-
-	require.Equal(t, ptrstr("11"), c.Targets[0].Args["foo"])
-	require.Equal(t, ptrstr("22"), c.Targets[1].Args["foo"])
-	require.Equal(t, ptrstr("33"), c.Targets[2].Args["foo"])
-}
-
-func TestHCLMatrixBadTypes(t *testing.T) {
-	dt := []byte(`
-		target "default" {
-			matrix = "test"
-		}
-		`)
-	_, err := ParseFile(dt, "docker-bake.hcl")
-	require.Error(t, err)
-
-	dt = []byte(`
-		target "default" {
-			matrix = ["test"]
-		}
-		`)
-	_, err = ParseFile(dt, "docker-bake.hcl")
-	require.Error(t, err)
-
-	dt = []byte(`
-		target "default" {
-			matrix = {
-				["a"] = ["b"]
-			}
-		}
-		`)
-	_, err = ParseFile(dt, "docker-bake.hcl")
-	require.Error(t, err)
-
-	dt = []byte(`
-		target "default" {
-			matrix = {
-				1 = 2
-			}
-		}
-		`)
-	_, err = ParseFile(dt, "docker-bake.hcl")
-	require.Error(t, err)
-
-	dt = []byte(`
-		target "default" {
-			matrix = {
-				a = "b"
-			}
-		}
-		`)
-	_, err = ParseFile(dt, "docker-bake.hcl")
-	require.Error(t, err)
-}
-
 func TestJSONAttributes(t *testing.T) {
 	dt := []byte(`{"FOO": "abc", "variable": {"BAR": {"default": "def"}}, "target": { "app": { "args": {"v1": "pre-${FOO}-${BAR}"}} } }`)

@@ -1149,24 +670,6 @@ func TestJSONFunctions(t *testing.T) {
 	require.Equal(t, ptrstr("pre-<FOO-abc>"), c.Targets[0].Args["v1"])
 }

-func TestJSONInvalidFunctions(t *testing.T) {
-	dt := []byte(`{
-	"target": {
-		"app": {
-			"args": {
-				"v1": "myfunc(\"foo\")"
-			}
-		}
-	}}`)
-
-	c, err := ParseFile(dt, "docker-bake.json")
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(c.Targets))
-	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr(`myfunc("foo")`), c.Targets[0].Args["v1"])
-}
-
 func TestHCLFunctionInAttr(t *testing.T) {
 	dt := []byte(`
 	function "brace" {
@@ -1425,7 +928,7 @@ func TestVarUnsupportedType(t *testing.T) {
 }

 func ptrstr(s interface{}) *string {
-	var n *string
+	var n *string = nil
 	if reflect.ValueOf(s).Kind() == reflect.String {
 		ss := s.(string)
 		n = &ss
--- a/bake/hclparser/expr.go
+++ b/bake/hclparser/expr.go
@@ -14,7 +14,15 @@ func funcCalls(exp hcl.Expression) ([]string, hcl.Diagnostics) {
 	if !ok {
 		fns, err := jsonFuncCallsRecursive(exp)
 		if err != nil {
-			return nil, wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
+			return nil, hcl.Diagnostics{
+				&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid expression",
+					Detail:   err.Error(),
+					Subject:  exp.Range().Ptr(),
+					Context:  exp.Range().Ptr(),
+				},
+			}
 		}
 		return fns, nil
 	}
--- a/bake/hclparser/hclparser.go
+++ b/bake/hclparser/hclparser.go
@@ -1,9 +1,7 @@
 package hclparser

 import (
-	"encoding/binary"
 	"fmt"
-	"hash/fnv"
 	"math"
 	"math/big"
 	"reflect"
@@ -51,42 +49,36 @@ type parser struct {
 	attrs map[string]*hcl.Attribute
 	funcs map[string]*functionDef

-	blocks       map[string]map[string][]*hcl.Block
-	blockValues  map[*hcl.Block][]reflect.Value
-	blockEvalCtx map[*hcl.Block][]*hcl.EvalContext
-	blockNames   map[*hcl.Block][]string
-	blockTypes   map[string]reflect.Type
+	blocks      map[string]map[string][]*hcl.Block
+	blockValues map[*hcl.Block]reflect.Value
+	blockTypes  map[string]reflect.Type

 	ectx *hcl.EvalContext

-	progressV map[uint64]struct{}
-	progressF map[uint64]struct{}
-	progressB map[uint64]map[string]struct{}
-	doneB     map[uint64]map[string]struct{}
+	progress  map[string]struct{}
+	progressF map[string]struct{}
+	progressB map[*hcl.Block]map[string]struct{}
+	doneF     map[string]struct{}
+	doneB     map[*hcl.Block]map[string]struct{}
 }

-type WithEvalContexts interface {
-	GetEvalContexts(base *hcl.EvalContext, block *hcl.Block, loadDeps func(hcl.Expression) hcl.Diagnostics) ([]*hcl.EvalContext, error)
-}
-
-type WithGetName interface {
-	GetName(ectx *hcl.EvalContext, block *hcl.Block, loadDeps func(hcl.Expression) hcl.Diagnostics) (string, error)
-}
-
-var errUndefined = errors.New("undefined")
-
-func (p *parser) loadDeps(ectx *hcl.EvalContext, exp hcl.Expression, exclude map[string]struct{}, allowMissing bool) hcl.Diagnostics {
+func (p *parser) loadDeps(exp hcl.Expression, exclude map[string]struct{}) hcl.Diagnostics {
 	fns, hcldiags := funcCalls(exp)
 	if hcldiags.HasErrors() {
 		return hcldiags
 	}

 	for _, fn := range fns {
-		if err := p.resolveFunction(ectx, fn); err != nil {
-			if allowMissing && errors.Is(err, errUndefined) {
-				continue
+		if err := p.resolveFunction(fn); err != nil {
+			return hcl.Diagnostics{
+				&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid expression",
+					Detail:   err.Error(),
+					Subject:  exp.Range().Ptr(),
+					Context:  exp.Range().Ptr(),
+				},
 			}
-			return wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
 		}
 	}

@@ -135,20 +127,28 @@ func (p *parser) loadDeps(ectx *hcl.EvalContext, exp hcl.Expression, exclude map
 					}
 				}
 			}
-			for _, block := range blocks {
-				if err := p.resolveBlock(block, target); err != nil {
-					if allowMissing && errors.Is(err, errUndefined) {
-						continue
-					}
-					return wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
+			if err := p.resolveBlock(blocks[0], target); err != nil {
+				return hcl.Diagnostics{
+					&hcl.Diagnostic{
+						Severity: hcl.DiagError,
+						Summary:  "Invalid expression",
+						Detail:   err.Error(),
+						Subject:  v.SourceRange().Ptr(),
+						Context:  v.SourceRange().Ptr(),
+					},
 				}
 			}
 		} else {
-			if err := p.resolveValue(ectx, v.RootName()); err != nil {
-				if allowMissing && errors.Is(err, errUndefined) {
-					continue
+			if err := p.resolveValue(v.RootName()); err != nil {
+				return hcl.Diagnostics{
+					&hcl.Diagnostic{
+						Severity: hcl.DiagError,
+						Summary:  "Invalid expression",
+						Detail:   err.Error(),
+						Subject:  v.SourceRange().Ptr(),
+						Context:  v.SourceRange().Ptr(),
+					},
 				}
-				return wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
 			}
 		}
 	}
@@ -158,21 +158,21 @@ func (p *parser) loadDeps(ectx *hcl.EvalContext, exp hcl.Expression, exclude map

 // resolveFunction forces evaluation of a function, storing the result into the
 // parser.
-func (p *parser) resolveFunction(ectx *hcl.EvalContext, name string) error {
-	if _, ok := p.ectx.Functions[name]; ok {
-		return nil
-	}
-	if _, ok := ectx.Functions[name]; ok {
+func (p *parser) resolveFunction(name string) error {
+	if _, ok := p.doneF[name]; ok {
 		return nil
 	}
 	f, ok := p.funcs[name]
 	if !ok {
-		return errors.Wrapf(errUndefined, "function %q does not exist", name)
+		if _, ok := p.ectx.Functions[name]; ok {
+			return nil
+		}
+		return errors.Errorf("undefined function %s", name)
 	}
-	if _, ok := p.progressF[key(ectx, name)]; ok {
+	if _, ok := p.progressF[name]; ok {
 		return errors.Errorf("function cycle not allowed for %s", name)
 	}
-	p.progressF[key(ectx, name)] = struct{}{}
+	p.progressF[name] = struct{}{}

 	if f.Result == nil {
 		return errors.Errorf("empty result not allowed for %s", name)
@@ -217,7 +217,7 @@ func (p *parser) resolveFunction(ectx *hcl.EvalContext, name string) error {
 		return diags
 	}

-	if diags := p.loadDeps(p.ectx, f.Result.Expr, params, false); diags.HasErrors() {
+	if diags := p.loadDeps(f.Result.Expr, params); diags.HasErrors() {
 		return diags
 	}

@@ -227,6 +227,7 @@ func (p *parser) resolveFunction(ectx *hcl.EvalContext, name string) error {
 	if diags.HasErrors() {
 		return diags
 	}
+	p.doneF[name] = struct{}{}
 	p.ectx.Functions[name] = v

 	return nil
@@ -234,17 +235,14 @@ func (p *parser) resolveFunction(ectx *hcl.EvalContext, name string) error {

 // resolveValue forces evaluation of a named value, storing the result into the
 // parser.
-func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) {
+func (p *parser) resolveValue(name string) (err error) {
 	if _, ok := p.ectx.Variables[name]; ok {
 		return nil
 	}
-	if _, ok := ectx.Variables[name]; ok {
-		return nil
-	}
-	if _, ok := p.progressV[key(ectx, name)]; ok {
+	if _, ok := p.progress[name]; ok {
 		return errors.Errorf("variable cycle not allowed for %s", name)
 	}
-	p.progressV[key(ectx, name)] = struct{}{}
+	p.progress[name] = struct{}{}

 	var v *cty.Value
 	defer func() {
@@ -257,10 +255,9 @@ func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) {
 	if _, builtin := p.opt.Vars[name]; !ok && !builtin {
 		vr, ok := p.vars[name]
 		if !ok {
-			return errors.Wrapf(errUndefined, "variable %q does not exist", name)
+			return errors.Errorf("undefined variable %q", name)
 		}
 		def = vr.Default
-		ectx = p.ectx
 	}

 	if def == nil {
@@ -273,10 +270,10 @@ func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) {
 		return
 	}

-	if diags := p.loadDeps(ectx, def.Expr, nil, true); diags.HasErrors() {
+	if diags := p.loadDeps(def.Expr, nil); diags.HasErrors() {
 		return diags
 	}
-	vv, diags := def.Expr.Value(ectx)
+	vv, diags := def.Expr.Value(p.ectx)
 	if diags.HasErrors() {
 		return diags
 	}
@@ -315,226 +312,154 @@ func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) {
 // target schema is provided, only the attributes and blocks present in the
 // schema will be evaluated.
 func (p *parser) resolveBlock(block *hcl.Block, target *hcl.BodySchema) (err error) {
-	// prepare the variable map for this type
-	if _, ok := p.ectx.Variables[block.Type]; !ok {
-		p.ectx.Variables[block.Type] = cty.MapValEmpty(cty.Map(cty.String))
+	name := block.Labels[0]
+	if err := p.opt.ValidateLabel(name); err != nil {
+		return hcl.Diagnostics{
+			&hcl.Diagnostic{
+				Severity: hcl.DiagError,
+				Summary:  "Invalid name",
+				Detail:   err.Error(),
+				Subject:  &block.LabelRanges[0],
+			},
+		}
 	}

-	// prepare the output destination and evaluation context
+	if _, ok := p.doneB[block]; !ok {
+		p.doneB[block] = map[string]struct{}{}
+	}
+	if _, ok := p.progressB[block]; !ok {
+		p.progressB[block] = map[string]struct{}{}
+	}
+
+	if target != nil {
+		// filter out attributes and blocks that are already evaluated
+		original := target
+		target = &hcl.BodySchema{}
+		for _, a := range original.Attributes {
+			if _, ok := p.doneB[block][a.Name]; !ok {
+				target.Attributes = append(target.Attributes, a)
+			}
+		}
+		for _, b := range original.Blocks {
+			if _, ok := p.doneB[block][b.Type]; !ok {
+				target.Blocks = append(target.Blocks, b)
+			}
+		}
+		if len(target.Attributes) == 0 && len(target.Blocks) == 0 {
+			return nil
+		}
+	}
+
+	if target != nil {
+		// detect reference cycles
+		for _, a := range target.Attributes {
+			if _, ok := p.progressB[block][a.Name]; ok {
+				return errors.Errorf("reference cycle not allowed for %s.%s.%s", block.Type, name, a.Name)
+			}
+		}
+		for _, b := range target.Blocks {
+			if _, ok := p.progressB[block][b.Type]; ok {
+				return errors.Errorf("reference cycle not allowed for %s.%s.%s", block.Type, name, b.Type)
+			}
+		}
+		for _, a := range target.Attributes {
+			p.progressB[block][a.Name] = struct{}{}
+		}
+		for _, b := range target.Blocks {
+			p.progressB[block][b.Type] = struct{}{}
+		}
+	}
+
+	// create a filtered body that contains only the target properties
+	body := func() hcl.Body {
+		if target != nil {
+			return FilterIncludeBody(block.Body, target)
+		}
+
+		filter := &hcl.BodySchema{}
+		for k := range p.doneB[block] {
+			filter.Attributes = append(filter.Attributes, hcl.AttributeSchema{Name: k})
+			filter.Blocks = append(filter.Blocks, hcl.BlockHeaderSchema{Type: k})
+		}
+		return FilterExcludeBody(block.Body, filter)
+	}
+
+	// load dependencies from all targeted properties
 	t, ok := p.blockTypes[block.Type]
 	if !ok {
 		return nil
 	}
-	var outputs []reflect.Value
-	var ectxs []*hcl.EvalContext
+	schema, _ := gohcl.ImpliedBodySchema(reflect.New(t).Interface())
+	content, _, diag := body().PartialContent(schema)
+	if diag.HasErrors() {
+		return diag
+	}
+	for _, a := range content.Attributes {
+		diag := p.loadDeps(a.Expr, nil)
+		if diag.HasErrors() {
+			return diag
+		}
+	}
+	for _, b := range content.Blocks {
+		err := p.resolveBlock(b, nil)
+		if err != nil {
+			return err
+		}
+	}
+
+	// decode!
+	var output reflect.Value
 	if prev, ok := p.blockValues[block]; ok {
-		outputs = prev
-		ectxs = p.blockEvalCtx[block]
+		output = prev
 	} else {
-		if v, ok := reflect.New(t).Interface().(WithEvalContexts); ok {
-			ectxs, err = v.GetEvalContexts(p.ectx, block, func(expr hcl.Expression) hcl.Diagnostics {
-				return p.loadDeps(p.ectx, expr, nil, true)
-			})
-			if err != nil {
-				return err
-			}
-			for _, ectx := range ectxs {
-				if ectx != p.ectx && ectx.Parent() != p.ectx {
-					return errors.Errorf("EvalContext must return a context with the correct parent")
-				}
-			}
-		} else {
-			ectxs = append([]*hcl.EvalContext{}, p.ectx)
+		output = reflect.New(t)
+		setLabel(output, block.Labels[0]) // early attach labels, so we can reference them
+	}
+	diag = gohcl.DecodeBody(body(), p.ectx, output.Interface())
+	if diag.HasErrors() {
+		return diag
+	}
+	p.blockValues[block] = output
+
+	// mark all targeted properties as done
+	for _, a := range content.Attributes {
+		p.doneB[block][a.Name] = struct{}{}
+	}
+	for _, b := range content.Blocks {
+		p.doneB[block][b.Type] = struct{}{}
+	}
+	if target != nil {
+		for _, a := range target.Attributes {
+			p.doneB[block][a.Name] = struct{}{}
 		}
-		for range ectxs {
-			outputs = append(outputs, reflect.New(t))
+		for _, b := range target.Blocks {
+			p.doneB[block][b.Type] = struct{}{}
 		}
 	}
-	p.blockValues[block] = outputs
-	p.blockEvalCtx[block] = ectxs

-	for i, output := range outputs {
-		target := target
-		ectx := ectxs[i]
-		name := block.Labels[0]
-		if names, ok := p.blockNames[block]; ok {
-			name = names[i]
-		}
-
-		if _, ok := p.doneB[key(block, ectx)]; !ok {
-			p.doneB[key(block, ectx)] = map[string]struct{}{}
-		}
-		if _, ok := p.progressB[key(block, ectx)]; !ok {
-			p.progressB[key(block, ectx)] = map[string]struct{}{}
-		}
-
-		if target != nil {
-			// filter out attributes and blocks that are already evaluated
-			original := target
-			target = &hcl.BodySchema{}
-			for _, a := range original.Attributes {
-				if _, ok := p.doneB[key(block, ectx)][a.Name]; !ok {
-					target.Attributes = append(target.Attributes, a)
-				}
-			}
-			for _, b := range original.Blocks {
-				if _, ok := p.doneB[key(block, ectx)][b.Type]; !ok {
-					target.Blocks = append(target.Blocks, b)
-				}
-			}
-			if len(target.Attributes) == 0 && len(target.Blocks) == 0 {
-				return nil
-			}
-		}
-
-		if target != nil {
-			// detect reference cycles
-			for _, a := range target.Attributes {
-				if _, ok := p.progressB[key(block, ectx)][a.Name]; ok {
-					return errors.Errorf("reference cycle not allowed for %s.%s.%s", block.Type, name, a.Name)
-				}
-			}
-			for _, b := range target.Blocks {
-				if _, ok := p.progressB[key(block, ectx)][b.Type]; ok {
-					return errors.Errorf("reference cycle not allowed for %s.%s.%s", block.Type, name, b.Type)
-				}
-			}
-			for _, a := range target.Attributes {
-				p.progressB[key(block, ectx)][a.Name] = struct{}{}
-			}
-			for _, b := range target.Blocks {
-				p.progressB[key(block, ectx)][b.Type] = struct{}{}
-			}
-		}
-
-		// create a filtered body that contains only the target properties
-		body := func() hcl.Body {
-			if target != nil {
-				return FilterIncludeBody(block.Body, target)
-			}
-
-			filter := &hcl.BodySchema{}
-			for k := range p.doneB[key(block, ectx)] {
-				filter.Attributes = append(filter.Attributes, hcl.AttributeSchema{Name: k})
-				filter.Blocks = append(filter.Blocks, hcl.BlockHeaderSchema{Type: k})
-			}
-			return FilterExcludeBody(block.Body, filter)
-		}
-
-		// load dependencies from all targeted properties
-		schema, _ := gohcl.ImpliedBodySchema(reflect.New(t).Interface())
-		content, _, diag := body().PartialContent(schema)
-		if diag.HasErrors() {
-			return diag
-		}
-		for _, a := range content.Attributes {
-			diag := p.loadDeps(ectx, a.Expr, nil, true)
-			if diag.HasErrors() {
-				return diag
-			}
-		}
-		for _, b := range content.Blocks {
-			err := p.resolveBlock(b, nil)
-			if err != nil {
-				return err
-			}
-		}
-
-		// decode!
-		diag = gohcl.DecodeBody(body(), ectx, output.Interface())
-		if diag.HasErrors() {
-			return diag
-		}
-
-		// mark all targeted properties as done
-		for _, a := range content.Attributes {
-			p.doneB[key(block, ectx)][a.Name] = struct{}{}
-		}
-		for _, b := range content.Blocks {
-			p.doneB[key(block, ectx)][b.Type] = struct{}{}
-		}
-		if target != nil {
-			for _, a := range target.Attributes {
-				p.doneB[key(block, ectx)][a.Name] = struct{}{}
-			}
-			for _, b := range target.Blocks {
-				p.doneB[key(block, ectx)][b.Type] = struct{}{}
-			}
-		}
-
-		// store the result into the evaluation context (so it can be referenced)
-		outputType, err := gocty.ImpliedType(output.Interface())
-		if err != nil {
-			return err
-		}
-		outputValue, err := gocty.ToCtyValue(output.Interface(), outputType)
-		if err != nil {
-			return err
-		}
-		var m map[string]cty.Value
-		if m2, ok := p.ectx.Variables[block.Type]; ok {
-			m = m2.AsValueMap()
-		}
-		if m == nil {
-			m = map[string]cty.Value{}
-		}
-		m[name] = outputValue
-		p.ectx.Variables[block.Type] = cty.MapVal(m)
+	// store the result into the evaluation context (so if can be referenced)
+	outputType, err := gocty.ImpliedType(output.Interface())
+	if err != nil {
+		return err
 	}
+	outputValue, err := gocty.ToCtyValue(output.Interface(), outputType)
+	if err != nil {
+		return err
+	}
+	var m map[string]cty.Value
+	if m2, ok := p.ectx.Variables[block.Type]; ok {
+		m = m2.AsValueMap()
+	}
+	if m == nil {
+		m = map[string]cty.Value{}
+	}
+	m[name] = outputValue
+	p.ectx.Variables[block.Type] = cty.MapVal(m)

 	return nil
 }

-// resolveBlockNames returns the names of the block, calling resolveBlock to
-// evaluate any label fields to correctly resolve the name.
-func (p *parser) resolveBlockNames(block *hcl.Block) ([]string, error) {
-	if names, ok := p.blockNames[block]; ok {
-		return names, nil
-	}
-
-	if err := p.resolveBlock(block, &hcl.BodySchema{}); err != nil {
-		return nil, err
-	}
-
-	names := make([]string, 0, len(p.blockValues[block]))
-	for i, val := range p.blockValues[block] {
-		ectx := p.blockEvalCtx[block][i]
-
-		name := block.Labels[0]
-		if err := p.opt.ValidateLabel(name); err != nil {
-			return nil, err
-		}
-
-		if v, ok := val.Interface().(WithGetName); ok {
-			var err error
-			name, err = v.GetName(ectx, block, func(expr hcl.Expression) hcl.Diagnostics {
-				return p.loadDeps(ectx, expr, nil, true)
-			})
-			if err != nil {
-				return nil, err
-			}
-			if err := p.opt.ValidateLabel(name); err != nil {
-				return nil, err
-			}
-		}
-
-		setName(val, name)
-		names = append(names, name)
-	}
-
-	found := map[string]struct{}{}
-	for _, name := range names {
-		if _, ok := found[name]; ok {
-			return nil, errors.Errorf("duplicate name %q", name)
-		}
-		found[name] = struct{}{}
-	}
-
-	p.blockNames[block] = names
-	return names, nil
-}
-
-func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string, hcl.Diagnostics) {
+func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 	reserved := map[string]struct{}{}
 	schema, _ := gohcl.ImpliedBodySchema(val)

@@ -547,7 +472,7 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string

 	var defs inputs
 	if err := gohcl.DecodeBody(b, nil, &defs); err != nil {
-		return nil, err
+		return err
 	}
 	defsSchema, _ := gohcl.ImpliedBodySchema(defs)

@@ -570,20 +495,20 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
 		attrs: map[string]*hcl.Attribute{},
 		funcs: map[string]*functionDef{},

-		blocks:       map[string]map[string][]*hcl.Block{},
-		blockValues:  map[*hcl.Block][]reflect.Value{},
-		blockEvalCtx: map[*hcl.Block][]*hcl.EvalContext{},
-		blockNames:   map[*hcl.Block][]string{},
-		blockTypes:   map[string]reflect.Type{},
+		blocks:      map[string]map[string][]*hcl.Block{},
+		blockValues: map[*hcl.Block]reflect.Value{},
+		blockTypes:  map[string]reflect.Type{},
+
+		progress:  map[string]struct{}{},
+		progressF: map[string]struct{}{},
+		progressB: map[*hcl.Block]map[string]struct{}{},
+
+		doneF: map[string]struct{}{},
+		doneB: map[*hcl.Block]map[string]struct{}{},
 		ectx: &hcl.EvalContext{
 			Variables: map[string]cty.Value{},
-			Functions: Stdlib(),
+			Functions: stdlibFunctions,
 		},
-
-		progressV: map[uint64]struct{}{},
-		progressF: map[uint64]struct{}{},
-		progressB: map[uint64]map[string]struct{}{},
-		doneB:     map[uint64]map[string]struct{}{},
 	}

 	for _, v := range defs.Variables {
@@ -603,18 +528,18 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string

 	content, b, diags := b.PartialContent(schema)
 	if diags.HasErrors() {
-		return nil, diags
+		return diags
 	}

 	blocks, b, diags := b.PartialContent(defsSchema)
 	if diags.HasErrors() {
-		return nil, diags
+		return diags
 	}

 	attrs, diags := b.JustAttributes()
 	if diags.HasErrors() {
-		if d := removeAttributesDiags(diags, reserved, p.vars, attrs); len(d) > 0 {
-			return nil, d
+		if d := removeAttributesDiags(diags, reserved, p.vars); len(d) > 0 {
+			return d
 		}
 	}

@@ -627,56 +552,92 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
 	delete(p.attrs, "function")

 	for k := range p.opt.Vars {
-		_ = p.resolveValue(p.ectx, k)
+		_ = p.resolveValue(k)
 	}

 	for _, a := range content.Attributes {
-		a := a
-		return nil, hcl.Diagnostics{
+		return hcl.Diagnostics{
 			&hcl.Diagnostic{
 				Severity: hcl.DiagError,
 				Summary:  "Invalid attribute",
 				Detail:   "global attributes currently not supported",
-				Subject:  a.Range.Ptr(),
-				Context:  a.Range.Ptr(),
+				Subject:  &a.Range,
+				Context:  &a.Range,
 			},
 		}
 	}

 	for k := range p.vars {
-		if err := p.resolveValue(p.ectx, k); err != nil {
+		if err := p.resolveValue(k); err != nil {
 			if diags, ok := err.(hcl.Diagnostics); ok {
-				return nil, diags
+				return diags
 			}
 			r := p.vars[k].Body.MissingItemRange()
-			return nil, wrapErrorDiagnostic("Invalid value", err, &r, &r)
+			return hcl.Diagnostics{
+				&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid value",
+					Detail:   err.Error(),
+					Subject:  &r,
+					Context:  &r,
+				},
+			}
 		}
 	}

 	for k := range p.funcs {
-		if err := p.resolveFunction(p.ectx, k); err != nil {
+		if err := p.resolveFunction(k); err != nil {
 			if diags, ok := err.(hcl.Diagnostics); ok {
-				return nil, diags
+				return diags
 			}
 			var subject *hcl.Range
 			var context *hcl.Range
 			if p.funcs[k].Params != nil {
-				subject = p.funcs[k].Params.Range.Ptr()
+				subject = &p.funcs[k].Params.Range
 				context = subject
 			} else {
 				for _, block := range blocks.Blocks {
-					block := block
 					if block.Type == "function" && len(block.Labels) == 1 && block.Labels[0] == k {
-						subject = block.LabelRanges[0].Ptr()
-						context = block.DefRange.Ptr()
+						subject = &block.LabelRanges[0]
+						context = &block.DefRange
 						break
 					}
 				}
 			}
-			return nil, wrapErrorDiagnostic("Invalid function", err, subject, context)
+			return hcl.Diagnostics{
+				&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid function",
+					Detail:   err.Error(),
+					Subject:  subject,
+					Context:  context,
+				},
+			}
 		}
 	}

+	for _, b := range content.Blocks {
+		if len(b.Labels) == 0 || len(b.Labels) > 1 {
+			return hcl.Diagnostics{
+				&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid block",
+					Detail:   fmt.Sprintf("invalid block label: %v", b.Labels),
+					Subject:  &b.LabelRanges[0],
+					Context:  &b.LabelRanges[0],
+				},
+			}
+		}
+		bm, ok := p.blocks[b.Type]
+		if !ok {
+			bm = map[string][]*hcl.Block{}
+			p.blocks[b.Type] = bm
+		}
+
+		lbl := b.Labels[0]
+		bm[lbl] = append(bm[lbl], b)
+	}
+
 	type value struct {
 		reflect.Value
 		idx int
@@ -687,7 +648,7 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
 		values map[string]value
 	}
 	types := map[string]field{}
-	renamed := map[string]map[string][]string{}
+
 	vt := reflect.ValueOf(val).Elem().Type()
 	for i := 0; i < vt.NumField(); i++ {
 		tags := strings.Split(vt.Field(i).Tag.Get("hcl"), ",")
@@ -698,43 +659,10 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
 			typ:    vt.Field(i).Type,
 			values: make(map[string]value),
 		}
-		renamed[tags[0]] = map[string][]string{}
 	}

-	tmpBlocks := map[string]map[string][]*hcl.Block{}
-	for _, b := range content.Blocks {
-		if len(b.Labels) == 0 || len(b.Labels) > 1 {
-			return nil, hcl.Diagnostics{
-				&hcl.Diagnostic{
-					Severity: hcl.DiagError,
-					Summary:  "Invalid block",
-					Detail:   fmt.Sprintf("invalid block label: %v", b.Labels),
-					Subject:  &b.LabelRanges[0],
-					Context:  &b.LabelRanges[0],
-				},
-			}
-		}
-
-		bm, ok := tmpBlocks[b.Type]
-		if !ok {
-			bm = map[string][]*hcl.Block{}
-			tmpBlocks[b.Type] = bm
-		}
-
-		names, err := p.resolveBlockNames(b)
-		if err != nil {
-			return nil, wrapErrorDiagnostic("Invalid name", err, &b.LabelRanges[0], &b.LabelRanges[0])
-		}
-		for _, name := range names {
-			bm[name] = append(bm[name], b)
-			renamed[b.Type][b.Labels[0]] = append(renamed[b.Type][b.Labels[0]], name)
-		}
-	}
-	p.blocks = tmpBlocks
-
 	diags = hcl.Diagnostics{}
 	for _, b := range content.Blocks {
-		b := b
 		v := reflect.ValueOf(val)

 		err := p.resolveBlock(b, nil)
@@ -745,119 +673,89 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
 					continue
 				}
 			} else {
-				return nil, wrapErrorDiagnostic("Invalid block", err, b.LabelRanges[0].Ptr(), b.DefRange.Ptr())
+				return hcl.Diagnostics{
+					&hcl.Diagnostic{
+						Severity: hcl.DiagError,
+						Summary:  "Invalid attribute",
+						Detail:   err.Error(),
+						Subject:  &b.LabelRanges[0],
+						Context:  &b.DefRange,
+					},
+				}
 			}
 		}

-		vvs := p.blockValues[b]
-		for _, vv := range vvs {
-			t := types[b.Type]
-			lblIndex, lblExists := getNameIndex(vv)
-			lblName, _ := getName(vv)
-			oldValue, exists := t.values[lblName]
-			if !exists && lblExists {
-				if v.Elem().Field(t.idx).Type().Kind() == reflect.Slice {
-					for i := 0; i < v.Elem().Field(t.idx).Len(); i++ {
-						if lblName == v.Elem().Field(t.idx).Index(i).Elem().Field(lblIndex).String() {
-							exists = true
-							oldValue = value{Value: v.Elem().Field(t.idx).Index(i), idx: i}
-							break
-						}
+		vv := p.blockValues[b]
+
+		t := types[b.Type]
+		lblIndex := setLabel(vv, b.Labels[0])
+
+		oldValue, exists := t.values[b.Labels[0]]
+		if !exists && lblIndex != -1 {
+			if v.Elem().Field(t.idx).Type().Kind() == reflect.Slice {
+				for i := 0; i < v.Elem().Field(t.idx).Len(); i++ {
+					if b.Labels[0] == v.Elem().Field(t.idx).Index(i).Elem().Field(lblIndex).String() {
+						exists = true
+						oldValue = value{Value: v.Elem().Field(t.idx).Index(i), idx: i}
+						break
 					}
 				}
 			}
-			if exists {
-				if m := oldValue.Value.MethodByName("Merge"); m.IsValid() {
-					m.Call([]reflect.Value{vv})
-				} else {
-					v.Elem().Field(t.idx).Index(oldValue.idx).Set(vv)
-				}
+		}
+		if exists {
+			if m := oldValue.Value.MethodByName("Merge"); m.IsValid() {
+				m.Call([]reflect.Value{vv})
 			} else {
-				slice := v.Elem().Field(t.idx)
-				if slice.IsNil() {
-					slice = reflect.New(t.typ).Elem()
-				}
-				t.values[lblName] = value{Value: vv, idx: slice.Len()}
-				v.Elem().Field(t.idx).Set(reflect.Append(slice, vv))
+				v.Elem().Field(t.idx).Index(oldValue.idx).Set(vv)
 			}
+		} else {
+			slice := v.Elem().Field(t.idx)
+			if slice.IsNil() {
+				slice = reflect.New(t.typ).Elem()
+			}
+			t.values[b.Labels[0]] = value{Value: vv, idx: slice.Len()}
+			v.Elem().Field(t.idx).Set(reflect.Append(slice, vv))
 		}
 	}
 	if diags.HasErrors() {
-		return nil, diags
+		return diags
 	}

 	for k := range p.attrs {
-		if err := p.resolveValue(p.ectx, k); err != nil {
+		if err := p.resolveValue(k); err != nil {
 			if diags, ok := err.(hcl.Diagnostics); ok {
-				return nil, diags
+				return diags
+			}
+			return hcl.Diagnostics{
+				&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid attribute",
+					Detail:   err.Error(),
+					Subject:  &p.attrs[k].Range,
+					Context:  &p.attrs[k].Range,
+				},
 			}
-			return nil, wrapErrorDiagnostic("Invalid attribute", err, &p.attrs[k].Range, &p.attrs[k].Range)
 		}
 	}

-	return renamed, nil
+	return nil
 }

-// wrapErrorDiagnostic wraps an error into a hcl.Diagnostics object.
-// If the error is already an hcl.Diagnostics object, it is returned as is.
-func wrapErrorDiagnostic(message string, err error, subject *hcl.Range, context *hcl.Range) hcl.Diagnostics {
-	switch err := err.(type) {
-	case *hcl.Diagnostic:
-		return hcl.Diagnostics{err}
-	case hcl.Diagnostics:
-		return err
-	default:
-		return hcl.Diagnostics{
-			&hcl.Diagnostic{
-				Severity: hcl.DiagError,
-				Summary:  message,
-				Detail:   err.Error(),
-				Subject:  subject,
-				Context:  context,
-			},
-		}
-	}
-}
-
-func setName(v reflect.Value, name string) {
+func setLabel(v reflect.Value, lbl string) int {
+	// cache field index?
 	numFields := v.Elem().Type().NumField()
 	for i := 0; i < numFields; i++ {
-		parts := strings.Split(v.Elem().Type().Field(i).Tag.Get("hcl"), ",")
-		for _, t := range parts[1:] {
+		for _, t := range strings.Split(v.Elem().Type().Field(i).Tag.Get("hcl"), ",") {
 			if t == "label" {
-				v.Elem().Field(i).Set(reflect.ValueOf(name))
+				v.Elem().Field(i).Set(reflect.ValueOf(lbl))
+				return i
 			}
 		}
 	}
+	return -1
 }

-func getName(v reflect.Value) (string, bool) {
-	numFields := v.Elem().Type().NumField()
-	for i := 0; i < numFields; i++ {
-		parts := strings.Split(v.Elem().Type().Field(i).Tag.Get("hcl"), ",")
-		for _, t := range parts[1:] {
-			if t == "label" {
-				return v.Elem().Field(i).String(), true
-			}
-		}
-	}
-	return "", false
-}
-
-func getNameIndex(v reflect.Value) (int, bool) {
-	numFields := v.Elem().Type().NumField()
-	for i := 0; i < numFields; i++ {
-		parts := strings.Split(v.Elem().Type().Field(i).Tag.Get("hcl"), ",")
-		for _, t := range parts[1:] {
-			if t == "label" {
-				return i, true
-			}
-		}
-	}
-	return 0, false
-}
-
-func removeAttributesDiags(diags hcl.Diagnostics, reserved map[string]struct{}, vars map[string]*variable, attrs hcl.Attributes) hcl.Diagnostics {
+func removeAttributesDiags(diags hcl.Diagnostics, reserved map[string]struct{}, vars map[string]*variable) hcl.Diagnostics {
 	var fdiags hcl.Diagnostics
 	for _, d := range diags {
 		if fout := func(d *hcl.Diagnostic) bool {
@@ -879,12 +777,6 @@ func removeAttributesDiags(diags hcl.Diagnostics, reserved map[string]struct{},
 					return true
 				}
 			}
-			for a := range attrs {
-				// Do the same for attributes
-				if strings.HasPrefix(d.Detail, fmt.Sprintf(`Argument "%s" was already set at `, a)) {
-					return true
-				}
-			}
 			return false
 		}(d); !fout {
 			fdiags = append(fdiags, d)
@@ -892,21 +784,3 @@ func removeAttributesDiags(diags hcl.Diagnostics, reserved map[string]struct{},
 	}
 	return fdiags
 }
-
-// key returns a unique hash for the given values
-func key(ks ...any) uint64 {
-	hash := fnv.New64a()
-	for _, k := range ks {
-		v := reflect.ValueOf(k)
-		switch v.Kind() {
-		case reflect.String:
-			hash.Write([]byte(v.String()))
-		case reflect.Pointer:
-			ptr := reflect.ValueOf(k).Pointer()
-			binary.Write(hash, binary.LittleEndian, uint64(ptr))
-		default:
-			panic(fmt.Sprintf("unknown key kind %s", v.Kind().String()))
-		}
-	}
-	return hash.Sum64()
-}
--- a/bake/hclparser/merged.go
+++ b/bake/hclparser/merged.go
@@ -1,230 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Forked from https://github.com/hashicorp/hcl/blob/4679383728fe331fc8a6b46036a27b8f818d9bc0/merged.go
-
-package hclparser
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/hcl/v2"
-)
-
-// MergeFiles combines the given files to produce a single body that contains
-// configuration from all of the given files.
-//
-// The ordering of the given files decides the order in which contained
-// elements will be returned. If any top-level attributes are defined with
-// the same name across multiple files, a diagnostic will be produced from
-// the Content and PartialContent methods describing this error in a
-// user-friendly way.
-func MergeFiles(files []*hcl.File) hcl.Body {
-	var bodies []hcl.Body
-	for _, file := range files {
-		bodies = append(bodies, file.Body)
-	}
-	return MergeBodies(bodies)
-}
-
-// MergeBodies is like MergeFiles except it deals directly with bodies, rather
-// than with entire files.
-func MergeBodies(bodies []hcl.Body) hcl.Body {
-	if len(bodies) == 0 {
-		// Swap out for our singleton empty body, to reduce the number of
-		// empty slices we have hanging around.
-		return emptyBody
-	}
-
-	// If any of the given bodies are already merged bodies, we'll unpack
-	// to flatten to a single mergedBodies, since that's conceptually simpler.
-	// This also, as a side-effect, eliminates any empty bodies, since
-	// empties are merged bodies with no inner bodies.
-	var newLen int
-	var flatten bool
-	for _, body := range bodies {
-		if children, merged := body.(mergedBodies); merged {
-			newLen += len(children)
-			flatten = true
-		} else {
-			newLen++
-		}
-	}
-
-	if !flatten { // not just newLen == len, because we might have mergedBodies with single bodies inside
-		return mergedBodies(bodies)
-	}
-
-	if newLen == 0 {
-		// Don't allocate a new empty when we already have one
-		return emptyBody
-	}
-
-	n := make([]hcl.Body, 0, newLen)
-	for _, body := range bodies {
-		if children, merged := body.(mergedBodies); merged {
-			n = append(n, children...)
-		} else {
-			n = append(n, body)
-		}
-	}
-	return mergedBodies(n)
-}
-
-var emptyBody = mergedBodies([]hcl.Body{})
-
-// EmptyBody returns a body with no content. This body can be used as a
-// placeholder when a body is required but no body content is available.
-func EmptyBody() hcl.Body {
-	return emptyBody
-}
-
-type mergedBodies []hcl.Body
-
-// Content returns the content produced by applying the given schema to all
-// of the merged bodies and merging the result.
-//
-// Although required attributes _are_ supported, they should be used sparingly
-// with merged bodies since in this case there is no contextual information
-// with which to return good diagnostics. Applications working with merged
-// bodies may wish to mark all attributes as optional and then check for
-// required attributes afterwards, to produce better diagnostics.
-func (mb mergedBodies) Content(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Diagnostics) {
-	// the returned body will always be empty in this case, because mergedContent
-	// will only ever call Content on the child bodies.
-	content, _, diags := mb.mergedContent(schema, false)
-	return content, diags
-}
-
-func (mb mergedBodies) PartialContent(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Body, hcl.Diagnostics) {
-	return mb.mergedContent(schema, true)
-}
-
-func (mb mergedBodies) JustAttributes() (hcl.Attributes, hcl.Diagnostics) {
-	attrs := make(map[string]*hcl.Attribute)
-	var diags hcl.Diagnostics
-
-	for _, body := range mb {
-		thisAttrs, thisDiags := body.JustAttributes()
-
-		if len(thisDiags) != 0 {
-			diags = append(diags, thisDiags...)
-		}
-
-		if thisAttrs != nil {
-			for name, attr := range thisAttrs {
-				if existing := attrs[name]; existing != nil {
-					diags = diags.Append(&hcl.Diagnostic{
-						Severity: hcl.DiagError,
-						Summary:  "Duplicate argument",
-						Detail: fmt.Sprintf(
-							"Argument %q was already set at %s",
-							name, existing.NameRange.String(),
-						),
-						Subject: thisAttrs[name].NameRange.Ptr(),
-					})
-				}
-				attrs[name] = attr
-			}
-		}
-	}
-
-	return attrs, diags
-}
-
-func (mb mergedBodies) MissingItemRange() hcl.Range {
-	if len(mb) == 0 {
-		// Nothing useful to return here, so we'll return some garbage.
-		return hcl.Range{
-			Filename: "<empty>",
-		}
-	}
-
-	// arbitrarily use the first body's missing item range
-	return mb[0].MissingItemRange()
-}
-
-func (mb mergedBodies) mergedContent(schema *hcl.BodySchema, partial bool) (*hcl.BodyContent, hcl.Body, hcl.Diagnostics) {
-	// We need to produce a new schema with none of the attributes marked as
-	// required, since _any one_ of our bodies can contribute an attribute value.
-	// We'll separately check that all required attributes are present at
-	// the end.
-	mergedSchema := &hcl.BodySchema{
-		Blocks: schema.Blocks,
-	}
-	for _, attrS := range schema.Attributes {
-		mergedAttrS := attrS
-		mergedAttrS.Required = false
-		mergedSchema.Attributes = append(mergedSchema.Attributes, mergedAttrS)
-	}
-
-	var mergedLeftovers []hcl.Body
-	content := &hcl.BodyContent{
-		Attributes: map[string]*hcl.Attribute{},
-	}
-
-	var diags hcl.Diagnostics
-	for _, body := range mb {
-		var thisContent *hcl.BodyContent
-		var thisLeftovers hcl.Body
-		var thisDiags hcl.Diagnostics
-
-		if partial {
-			thisContent, thisLeftovers, thisDiags = body.PartialContent(mergedSchema)
-		} else {
-			thisContent, thisDiags = body.Content(mergedSchema)
-		}
-
-		if thisLeftovers != nil {
-			mergedLeftovers = append(mergedLeftovers, thisLeftovers)
-		}
-		if len(thisDiags) != 0 {
-			diags = append(diags, thisDiags...)
-		}
-
-		if thisContent.Attributes != nil {
-			for name, attr := range thisContent.Attributes {
-				if existing := content.Attributes[name]; existing != nil {
-					diags = diags.Append(&hcl.Diagnostic{
-						Severity: hcl.DiagError,
-						Summary:  "Duplicate argument",
-						Detail: fmt.Sprintf(
-							"Argument %q was already set at %s",
-							name, existing.NameRange.String(),
-						),
-						Subject: thisContent.Attributes[name].NameRange.Ptr(),
-					})
-				}
-				content.Attributes[name] = attr
-			}
-		}
-
-		if len(thisContent.Blocks) != 0 {
-			content.Blocks = append(content.Blocks, thisContent.Blocks...)
-		}
-	}
-
-	// Finally, we check for required attributes.
-	for _, attrS := range schema.Attributes {
-		if !attrS.Required {
-			continue
-		}
-
-		if content.Attributes[attrS.Name] == nil {
-			// We don't have any context here to produce a good diagnostic,
-			// which is why we warn in the Content docstring to minimize the
-			// use of required attributes on merged bodies.
-			diags = diags.Append(&hcl.Diagnostic{
-				Severity: hcl.DiagError,
-				Summary:  "Missing required argument",
-				Detail: fmt.Sprintf(
-					"The argument %q is required, but was not set.",
-					attrS.Name,
-				),
-			})
-		}
-	}
-
-	leftoverBody := MergeBodies(mergedLeftovers)
-	return content, leftoverBody, diags
-}
--- a/bake/hclparser/stdlib.go
+++ b/bake/hclparser/stdlib.go
@@ -31,21 +31,21 @@ var stdlibFunctions = map[string]function.Function{
 	"cidrnetmask":            cidr.NetmaskFunc,
 	"cidrsubnet":             cidr.SubnetFunc,
 	"cidrsubnets":            cidr.SubnetsFunc,
+	"csvdecode":              stdlib.CSVDecodeFunc,
 	"coalesce":               stdlib.CoalesceFunc,
 	"coalescelist":           stdlib.CoalesceListFunc,
 	"compact":                stdlib.CompactFunc,
 	"concat":                 stdlib.ConcatFunc,
 	"contains":               stdlib.ContainsFunc,
 	"convert":                typeexpr.ConvertFunc,
-	"csvdecode":              stdlib.CSVDecodeFunc,
 	"distinct":               stdlib.DistinctFunc,
 	"divide":                 stdlib.DivideFunc,
 	"element":                stdlib.ElementFunc,
 	"equal":                  stdlib.EqualFunc,
 	"flatten":                stdlib.FlattenFunc,
 	"floor":                  stdlib.FloorFunc,
-	"format":                 stdlib.FormatFunc,
 	"formatdate":             stdlib.FormatDateFunc,
+	"format":                 stdlib.FormatFunc,
 	"formatlist":             stdlib.FormatListFunc,
 	"greaterthan":            stdlib.GreaterThanFunc,
 	"greaterthanorequalto":   stdlib.GreaterThanOrEqualToFunc,
@@ -53,10 +53,10 @@ var stdlibFunctions = map[string]function.Function{
 	"indent":                 stdlib.IndentFunc,
 	"index":                  stdlib.IndexFunc,
 	"int":                    stdlib.IntFunc,
-	"join":                   stdlib.JoinFunc,
 	"jsondecode":             stdlib.JSONDecodeFunc,
 	"jsonencode":             stdlib.JSONEncodeFunc,
 	"keys":                   stdlib.KeysFunc,
+	"join":                   stdlib.JoinFunc,
 	"length":                 stdlib.LengthFunc,
 	"lessthan":               stdlib.LessThanFunc,
 	"lessthanorequalto":      stdlib.LessThanOrEqualToFunc,
@@ -70,16 +70,15 @@ var stdlibFunctions = map[string]function.Function{
 	"modulo":                 stdlib.ModuloFunc,
 	"multiply":               stdlib.MultiplyFunc,
 	"negate":                 stdlib.NegateFunc,
-	"not":                    stdlib.NotFunc,
 	"notequal":               stdlib.NotEqualFunc,
+	"not":                    stdlib.NotFunc,
 	"or":                     stdlib.OrFunc,
 	"parseint":               stdlib.ParseIntFunc,
 	"pow":                    stdlib.PowFunc,
 	"range":                  stdlib.RangeFunc,
-	"regex_replace":          stdlib.RegexReplaceFunc,
-	"regex":                  stdlib.RegexFunc,
 	"regexall":               stdlib.RegexAllFunc,
-	"replace":                stdlib.ReplaceFunc,
+	"regex":                  stdlib.RegexFunc,
+	"regex_replace":          stdlib.RegexReplaceFunc,
 	"reverse":                stdlib.ReverseFunc,
 	"reverselist":            stdlib.ReverseListFunc,
 	"rsadecrypt":             crypto.RsaDecryptFunc,
@@ -125,11 +124,3 @@ var timestampFunc = function.New(&function.Spec{
 		return cty.StringVal(time.Now().UTC().Format(time.RFC3339)), nil
 	},
 })
-
-func Stdlib() map[string]function.Function {
-	funcs := make(map[string]function.Function, len(stdlibFunctions))
-	for k, v := range stdlibFunctions {
-		funcs[k] = v
-	}
-	return funcs
-}
--- a/bake/remote.go
+++ b/bake/remote.go
@@ -4,16 +4,14 @@ import (
 	"archive/tar"
 	"bytes"
 	"context"
+	"strings"

 	"github.com/docker/buildx/builder"
-	controllerapi "github.com/docker/buildx/controller/pb"
 	"github.com/docker/buildx/driver"
 	"github.com/docker/buildx/util/progress"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/client/llb"
-	"github.com/moby/buildkit/frontend/dockerui"
 	gwclient "github.com/moby/buildkit/frontend/gateway/client"
-	"github.com/moby/buildkit/session"
 	"github.com/pkg/errors"
 )

@@ -23,16 +21,10 @@ type Input struct {
 }

 func ReadRemoteFiles(ctx context.Context, nodes []builder.Node, url string, names []string, pw progress.Writer) ([]File, *Input, error) {
-	var session []session.Attachable
 	var filename string
-	st, ok := dockerui.DetectGitContext(url, false)
-	if ok {
-		ssh, err := controllerapi.CreateSSH([]*controllerapi.SSH{{ID: "default"}})
-		if err == nil {
-			session = append(session, ssh)
-		}
-	} else {
-		st, filename, ok = dockerui.DetectHTTPContext(url)
+	st, ok := detectGitContext(url)
+	if !ok {
+		st, filename, ok = detectHTTPContext(url)
 		if !ok {
 			return nil, nil, errors.Errorf("not url context")
 		}
@@ -42,9 +34,9 @@ func ReadRemoteFiles(ctx context.Context, nodes []builder.Node, url string, name
 	var files []File

 	var node *builder.Node
-	for i, n := range nodes {
+	for _, n := range nodes {
 		if n.Err == nil {
-			node = &nodes[i]
+			node = &n
 			continue
 		}
 	}
@@ -59,7 +51,7 @@ func ReadRemoteFiles(ctx context.Context, nodes []builder.Node, url string, name

 	ch, done := progress.NewChannel(pw)
 	defer func() { <-done }()
-	_, err = c.Build(ctx, client.SolveOpt{Session: session, Internal: true}, "buildx", func(ctx context.Context, c gwclient.Client) (*gwclient.Result, error) {
+	_, err = c.Build(ctx, client.SolveOpt{}, "buildx", func(ctx context.Context, c gwclient.Client) (*gwclient.Result, error) {
 		def, err := st.Marshal(ctx)
 		if err != nil {
 			return nil, err
@@ -91,6 +83,51 @@ func ReadRemoteFiles(ctx context.Context, nodes []builder.Node, url string, name
 	return files, inp, nil
 }

+func IsRemoteURL(url string) bool {
+	if _, _, ok := detectHTTPContext(url); ok {
+		return true
+	}
+	if _, ok := detectGitContext(url); ok {
+		return true
+	}
+	return false
+}
+
+func detectHTTPContext(url string) (*llb.State, string, bool) {
+	if httpPrefix.MatchString(url) {
+		httpContext := llb.HTTP(url, llb.Filename("context"), llb.WithCustomName("[internal] load remote build context"))
+		return &httpContext, "context", true
+	}
+	return nil, "", false
+}
+
+func detectGitContext(ref string) (*llb.State, bool) {
+	found := false
+	if httpPrefix.MatchString(ref) && gitURLPathWithFragmentSuffix.MatchString(ref) {
+		found = true
+	}
+
+	for _, prefix := range []string{"git://", "github.com/", "git@"} {
+		if strings.HasPrefix(ref, prefix) {
+			found = true
+			break
+		}
+	}
+	if !found {
+		return nil, false
+	}
+
+	parts := strings.SplitN(ref, "#", 2)
+	branch := ""
+	if len(parts) > 1 {
+		branch = parts[1]
+	}
+	gitOpts := []llb.GitOption{llb.WithCustomName("[internal] load git source " + ref)}
+
+	st := llb.Git(parts[0], branch, gitOpts...)
+	return &st, true
+}
+
 func isArchive(header []byte) bool {
 	for _, m := range [][]byte{
 		{0x42, 0x5A, 0x68},                   // bzip2
--- a/build/build.go
+++ b/build/build.go
@@ -23,16 +23,15 @@ import (
 	"github.com/containerd/containerd/content/local"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/platforms"
-	"github.com/distribution/reference"
 	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/driver"
-	"github.com/docker/buildx/util/desktop"
 	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/buildx/util/resolver"
 	"github.com/docker/buildx/util/waitmap"
 	"github.com/docker/cli/opts"
+	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/builder/remotecontext/urlutil"
 	"github.com/docker/docker/pkg/jsonmessage"
@@ -46,7 +45,6 @@ import (
 	"github.com/moby/buildkit/session/upload/uploadprovider"
 	"github.com/moby/buildkit/solver/errdefs"
 	"github.com/moby/buildkit/solver/pb"
-	spb "github.com/moby/buildkit/sourcepolicy/pb"
 	"github.com/moby/buildkit/util/apicaps"
 	"github.com/moby/buildkit/util/entitlements"
 	"github.com/moby/buildkit/util/progress/progresswriter"
@@ -65,14 +63,12 @@ var (
 )

 const (
-	//nolint:gosec // G101: false-positive
-	printFallbackImage = "docker/dockerfile:1.5.2-labs@sha256:f2e91734a84c0922ff47aa4098ab775f1dfa932430d2888dd5cad5251fafdac4"
+	printFallbackImage = "docker/dockerfile-upstream:1.4-outline@sha256:627443ff4e2d0f635d429cfc1da5388bcd5a70949c38adcd3cd7c4e5df67c73c"
 )

 type Options struct {
 	Inputs Inputs

-	Ref           string
 	Allow         []entitlements.Entitlement
 	Attests       map[string]*string
 	BuildArgs     map[string]string
@@ -81,22 +77,22 @@ type Options struct {
 	CgroupParent  string
 	Exports       []client.ExportEntry
 	ExtraHosts    []string
+	ImageIDFile   string
 	Labels        map[string]string
 	NetworkMode   string
 	NoCache       bool
 	NoCacheFilter []string
 	Platforms     []specs.Platform
 	Pull          bool
+	Session       []session.Attachable
 	ShmSize       opts.MemBytes
 	Tags          []string
 	Target        string
 	Ulimits       *opts.UlimitOpt

-	Session      []session.Attachable
-	Linked       bool // Linked marks this target as exclusively linked (not requested by the user).
-	PrintFunc    *PrintFunc
-	SourcePolicy *spb.Policy
-	GroupRef     string
+	// Linked marks this target as exclusively linked (not requested by the user).
+	Linked    bool
+	PrintFunc *PrintFunc
 }

 type PrintFunc struct {
@@ -267,11 +263,11 @@ func resolveDriversBase(ctx context.Context, nodes []builder.Node, opt map[strin
 	}

 	undetectedPlatform := false
-	allPlatforms := map[string]struct{}{}
+	allPlatforms := map[string]int{}
 	for _, opt := range opt {
 		for _, p := range opt.Platforms {
 			k := platforms.Format(p)
-			allPlatforms[k] = struct{}{}
+			allPlatforms[k] = -1
 			if _, ok := availablePlatforms[k]; !ok {
 				undetectedPlatform = true
 			}
@@ -364,7 +360,7 @@ func toRepoOnly(in string) (string, error) {
 	return strings.Join(out, ","), nil
 }

-func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Options, bopts gateway.BuildOpts, configDir string, pw progress.Writer, docker *dockerutil.Client) (solveOpt *client.SolveOpt, release func(), err error) {
+func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Options, bopts gateway.BuildOpts, configDir string, pw progress.Writer, dl dockerLoadCallback) (solveOpt *client.SolveOpt, release func(), err error) {
 	nodeDriver := node.Driver
 	defers := make([]func(), 0, 2)
 	releaseF := func() {
@@ -379,6 +375,13 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 		}
 	}()

+	if opt.ImageIDFile != "" {
+		// Avoid leaving a stale file if we eventually fail
+		if err := os.Remove(opt.ImageIDFile); err != nil && !os.IsNotExist(err) {
+			return nil, nil, errors.Wrap(err, "removing image ID file")
+		}
+	}
+
 	// inline cache from build arg
 	if v, ok := opt.BuildArgs["BUILDKIT_INLINE_CACHE"]; ok {
 		if v, _ := strconv.ParseBool(v); v {
@@ -390,8 +393,8 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 	}

 	for _, e := range opt.CacheTo {
-		if e.Type != "inline" && !nodeDriver.Features(ctx)[driver.CacheExport] {
-			return nil, nil, notSupported(driver.CacheExport, nodeDriver, "https://docs.docker.com/go/build-cache-backends/")
+		if e.Type != "inline" && !nodeDriver.Features()[driver.CacheExport] {
+			return nil, nil, notSupported(nodeDriver, driver.CacheExport)
 		}
 	}

@@ -424,18 +427,12 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 	}

 	so := client.SolveOpt{
-		Ref:                 opt.Ref,
 		Frontend:            "dockerfile.v0",
 		FrontendAttrs:       map[string]string{},
 		LocalDirs:           map[string]string{},
 		CacheExports:        cacheTo,
 		CacheImports:        cacheFrom,
 		AllowedEntitlements: opt.Allow,
-		SourcePolicy:        opt.SourcePolicy,
-	}
-
-	if so.Ref == "" {
-		so.Ref = identity.NewID()
 	}

 	if opt.CgroupParent != "" {
@@ -459,28 +456,17 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 			attests[k] = *v
 		}
 	}
-	supportsAttestations := bopts.LLBCaps.Contains(apicaps.CapID("exporter.image.attestations")) && nodeDriver.Features(ctx)[driver.MultiPlatform]
+	supportsAttestations := bopts.LLBCaps.Contains(apicaps.CapID("exporter.image.attestations"))
 	if len(attests) > 0 {
 		if !supportsAttestations {
 			return nil, nil, errors.Errorf("attestations are not supported by the current buildkitd")
 		}
 		for k, v := range attests {
-			so.FrontendAttrs["attest:"+k] = v
+			so.FrontendAttrs[k] = v
 		}
 	}
-
-	if _, ok := opt.Attests["provenance"]; !ok && supportsAttestations {
-		const noAttestEnv = "BUILDX_NO_DEFAULT_ATTESTATIONS"
-		var noProv bool
-		if v, ok := os.LookupEnv(noAttestEnv); ok {
-			noProv, err = strconv.ParseBool(v)
-			if err != nil {
-				return nil, nil, errors.Wrap(err, "invalid "+noAttestEnv)
-			}
-		}
-		if !noProv {
-			so.FrontendAttrs["attest:provenance"] = "mode=min,inline-only=true"
-		}
+	if _, ok := opt.Attests["attest:provenance"]; !ok && supportsAttestations {
+		so.FrontendAttrs["attest:provenance"] = "mode=min,inline-only=true"
 	}

 	switch len(opt.Exports) {
@@ -533,36 +519,29 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op

 	// set up exporters
 	for i, e := range opt.Exports {
-		if e.Type == "oci" && !nodeDriver.Features(ctx)[driver.OCIExporter] {
-			return nil, nil, notSupported(driver.OCIExporter, nodeDriver, "https://docs.docker.com/go/build-exporters/")
+		if (e.Type == "local" || e.Type == "tar") && opt.ImageIDFile != "" {
+			return nil, nil, errors.Errorf("local and tar exporters are incompatible with image ID file")
+		}
+		if e.Type == "oci" && !nodeDriver.Features()[driver.OCIExporter] {
+			return nil, nil, notSupported(nodeDriver, driver.OCIExporter)
 		}
 		if e.Type == "docker" {
-			features := docker.Features(ctx, e.Attrs["context"])
-			if features[dockerutil.OCIImporter] && e.Output == nil {
-				// rely on oci importer if available (which supports
-				// multi-platform images), otherwise fall back to docker
-				opt.Exports[i].Type = "oci"
-			} else if len(opt.Platforms) > 1 || len(attests) > 0 {
-				if e.Output != nil {
-					return nil, nil, errors.Errorf("docker exporter does not support exporting manifest lists, use the oci exporter instead")
-				}
+			if len(opt.Platforms) > 1 || len(attests) > 0 {
 				return nil, nil, errors.Errorf("docker exporter does not currently support exporting manifest lists")
 			}
 			if e.Output == nil {
 				if nodeDriver.IsMobyDriver() {
 					e.Type = "image"
 				} else {
-					w, cancel, err := docker.LoadImage(ctx, e.Attrs["context"], pw)
+					w, cancel, err := dl(e.Attrs["context"])
 					if err != nil {
 						return nil, nil, err
 					}
 					defers = append(defers, cancel)
-					opt.Exports[i].Output = func(_ map[string]string) (io.WriteCloser, error) {
-						return w, nil
-					}
+					opt.Exports[i].Output = wrapWriteCloser(w)
 				}
-			} else if !nodeDriver.Features(ctx)[driver.DockerExporter] {
-				return nil, nil, notSupported(driver.DockerExporter, nodeDriver, "https:/docs.docker.com/go/build-exporters/")
+			} else if !nodeDriver.Features()[driver.DockerExporter] {
+				return nil, nil, notSupported(nodeDriver, driver.DockerExporter)
 			}
 		}
 		if e.Type == "image" && nodeDriver.IsMobyDriver() {
@@ -600,10 +579,7 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 	}

 	if opt.Pull {
-		so.FrontendAttrs["image-resolve-mode"] = pb.AttrImageResolveModeForcePull
-	} else if nodeDriver.IsMobyDriver() {
-		// moby driver always resolves local images by default
-		so.FrontendAttrs["image-resolve-mode"] = pb.AttrImageResolveModePreferLocal
+		so.FrontendAttrs["image-resolve-mode"] = "pull"
 	}
 	if opt.Target != "" {
 		so.FrontendAttrs["target"] = opt.Target
@@ -627,14 +603,21 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 		}
 	}

+	// Propagate SOURCE_DATE_EPOCH from the client env
+	if v := os.Getenv("SOURCE_DATE_EPOCH"); v != "" {
+		if _, ok := so.FrontendAttrs["build-arg:SOURCE_DATE_EPOCH"]; !ok {
+			so.FrontendAttrs["build-arg:SOURCE_DATE_EPOCH"] = v
+		}
+	}
+
 	// set platforms
 	if len(opt.Platforms) != 0 {
 		pp := make([]string, len(opt.Platforms))
 		for i, p := range opt.Platforms {
 			pp[i] = platforms.Format(p)
 		}
-		if len(pp) > 1 && !nodeDriver.Features(ctx)[driver.MultiPlatform] {
-			return nil, nil, notSupported(driver.MultiPlatform, nodeDriver, "https://docs.docker.com/go/build-multi-platform/")
+		if len(pp) > 1 && !nodeDriver.Features()[driver.MultiPlatform] {
+			return nil, nil, notSupported(nodeDriver, driver.MultiPlatform)
 		}
 		so.FrontendAttrs["platform"] = strings.Join(pp, ",")
 	}
@@ -652,7 +635,7 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 	}

 	// setup extrahosts
-	extraHosts, err := toBuildkitExtraHosts(ctx, opt.ExtraHosts, nodeDriver)
+	extraHosts, err := toBuildkitExtraHosts(opt.ExtraHosts, nodeDriver.IsMobyDriver())
 	if err != nil {
 		return nil, nil, err
 	}
@@ -676,11 +659,156 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 	return &so, releaseF, nil
 }

-func Build(ctx context.Context, nodes []builder.Node, opt map[string]Options, docker *dockerutil.Client, configDir string, w progress.Writer) (resp map[string]*client.SolveResponse, err error) {
-	return BuildWithResultHandler(ctx, nodes, opt, docker, configDir, w, nil)
+// ContainerConfig is configuration for a container to run.
+type ContainerConfig struct {
+	ResultCtx *ResultContext
+
+	Stdin  io.ReadCloser
+	Stdout io.WriteCloser
+	Stderr io.WriteCloser
+	Tty    bool
+
+	Entrypoint []string
+	Cmd        []string
+	Env        []string
+	User       *string
+	Cwd        *string
 }

-func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[string]Options, docker *dockerutil.Client, configDir string, w progress.Writer, resultHandleFunc func(driverIndex int, rCtx *ResultHandle)) (resp map[string]*client.SolveResponse, err error) {
+// ResultContext is a build result with the client that built it.
+type ResultContext struct {
+	Client *client.Client
+	Res    *gateway.Result
+}
+
+// Invoke invokes a build result as a container.
+func Invoke(ctx context.Context, cfg ContainerConfig) error {
+	if cfg.ResultCtx == nil {
+		return errors.Errorf("result must be provided")
+	}
+	c, res := cfg.ResultCtx.Client, cfg.ResultCtx.Res
+
+	mainCtx := ctx
+
+	_, err := c.Build(context.TODO(), client.SolveOpt{}, "buildx", func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
+		ctx, cancel := context.WithCancel(ctx)
+		go func() {
+			<-mainCtx.Done()
+			cancel()
+		}()
+
+		if res.Ref == nil {
+			return nil, errors.Errorf("no reference is registered")
+		}
+		st, err := res.Ref.ToState()
+		if err != nil {
+			return nil, err
+		}
+		def, err := st.Marshal(ctx)
+		if err != nil {
+			return nil, err
+		}
+		imgRef, err := c.Solve(ctx, gateway.SolveRequest{
+			Definition: def.ToPB(),
+		})
+		if err != nil {
+			return nil, err
+		}
+		ctr, err := c.NewContainer(ctx, gateway.NewContainerRequest{
+			Mounts: []gateway.Mount{
+				{
+					Dest:      "/",
+					MountType: pb.MountType_BIND,
+					Ref:       imgRef.Ref,
+				},
+			},
+		})
+		if err != nil {
+			return nil, err
+		}
+		defer ctr.Release(context.TODO())
+
+		imgData := res.Metadata[exptypes.ExporterImageConfigKey]
+		var img *specs.Image
+		if len(imgData) > 0 {
+			img = &specs.Image{}
+			if err := json.Unmarshal(imgData, img); err != nil {
+				fmt.Println(err)
+				return nil, err
+			}
+		}
+
+		user := ""
+		if cfg.User != nil {
+			user = *cfg.User
+		} else if img != nil {
+			user = img.Config.User
+		}
+
+		cwd := ""
+		if cfg.Cwd != nil {
+			cwd = *cfg.Cwd
+		} else if img != nil {
+			cwd = img.Config.WorkingDir
+		}
+
+		env := []string{}
+		if img != nil {
+			env = append(env, img.Config.Env...)
+		}
+		env = append(env, cfg.Env...)
+
+		args := []string{}
+		if cfg.Entrypoint != nil {
+			args = append(args, cfg.Entrypoint...)
+		} else if img != nil {
+			args = append(args, img.Config.Entrypoint...)
+		}
+		if cfg.Cmd != nil {
+			args = append(args, cfg.Cmd...)
+		} else if img != nil {
+			args = append(args, img.Config.Cmd...)
+		}
+
+		proc, err := ctr.Start(ctx, gateway.StartRequest{
+			Args:   args,
+			Env:    env,
+			User:   user,
+			Cwd:    cwd,
+			Tty:    cfg.Tty,
+			Stdin:  cfg.Stdin,
+			Stdout: cfg.Stdout,
+			Stderr: cfg.Stderr,
+		})
+		if err != nil {
+			return nil, errors.Errorf("failed to start container: %v", err)
+		}
+		errCh := make(chan error)
+		doneCh := make(chan struct{})
+		go func() {
+			if err := proc.Wait(); err != nil {
+				errCh <- err
+				return
+			}
+			close(doneCh)
+		}()
+		select {
+		case <-doneCh:
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		case err := <-errCh:
+			return nil, err
+		}
+		return nil, nil
+	}, nil)
+	return err
+}
+
+func Build(ctx context.Context, nodes []builder.Node, opt map[string]Options, docker *dockerutil.Client, configDir string, w progress.Writer) (resp map[string]*client.SolveResponse, err error) {
+	return BuildWithResultHandler(ctx, nodes, opt, docker, configDir, w, nil, false)
+}
+
+func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[string]Options, docker *dockerutil.Client, configDir string, w progress.Writer, resultHandleFunc func(driverIndex int, rCtx *ResultContext), allowNoOutput bool) (resp map[string]*client.SolveResponse, err error) {
 	if len(nodes) == 0 {
 		return nil, errors.Errorf("driver required for build")
 	}
@@ -705,7 +833,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 				noOutputTargets = append(noOutputTargets, name)
 			}
 		}
-		if len(noOutputTargets) > 0 {
+		if len(noOutputTargets) > 0 && !allowNoOutput {
 			var warnNoOutputBuf bytes.Buffer
 			warnNoOutputBuf.WriteString("No output specified ")
 			if len(noOutputTargets) == 1 && noOutputTargets[0] == "default" {
@@ -738,7 +866,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 		hasMobyDriver := false
 		gitattrs, err := getGitAttributes(ctx, opt.Inputs.ContextPath, opt.Inputs.DockerfilePath)
 		if err != nil {
-			logrus.WithError(err).Warn("current commit information was not captured by the build")
+			logrus.Warn(err)
 		}
 		for i, np := range m[k] {
 			node := nodes[np.driverIndex]
@@ -746,13 +874,12 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 				hasMobyDriver = true
 			}
 			opt.Platforms = np.platforms
-			so, release, err := toSolveOpt(ctx, node, multiDriver, opt, np.bopts, configDir, w, docker)
+			so, release, err := toSolveOpt(ctx, node, multiDriver, opt, np.bopts, configDir, w, func(name string) (io.WriteCloser, func(), error) {
+				return docker.LoadImage(ctx, name, w)
+			})
 			if err != nil {
 				return nil, err
 			}
-			if err := saveLocalState(so, k, opt, node, configDir); err != nil {
-				return nil, err
-			}
 			for k, v := range gitattrs {
 				so.FrontendAttrs[k] = v
 			}
@@ -836,7 +963,6 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s

 			for i, dp := range dps {
 				i, dp, so := i, dp, *dp.so
-				node := nodes[dp.driverIndex]
 				if multiDriver {
 					for i, e := range so.Exports {
 						switch e.Type {
@@ -900,71 +1026,56 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s

 					cc := c
 					var printRes map[string][]byte
-					buildFunc := func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
-						if opt.PrintFunc != nil {
-							if _, ok := req.FrontendOpt["frontend.caps"]; !ok {
-								req.FrontendOpt["frontend.caps"] = "moby.buildkit.frontend.subrequests+forward"
-							} else {
-								req.FrontendOpt["frontend.caps"] += ",moby.buildkit.frontend.subrequests+forward"
+					rr, err := c.Build(ctx, so, "buildx", func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
+						var isFallback bool
+						var origErr error
+						for {
+							if opt.PrintFunc != nil {
+								if _, ok := req.FrontendOpt["frontend.caps"]; !ok {
+									req.FrontendOpt["frontend.caps"] = "moby.buildkit.frontend.subrequests+forward"
+								} else {
+									req.FrontendOpt["frontend.caps"] += ",moby.buildkit.frontend.subrequests+forward"
+								}
+								req.FrontendOpt["requestid"] = "frontend." + opt.PrintFunc.Name
+								if isFallback {
+									req.FrontendOpt["build-arg:BUILDKIT_SYNTAX"] = printFallbackImage
+								}
 							}
-							req.FrontendOpt["requestid"] = "frontend." + opt.PrintFunc.Name
-						}
-
-						res, err := c.Solve(ctx, req)
-						if err != nil {
-							fallback := false
-							var reqErr *errdefs.UnsupportedSubrequestError
-							if errors.As(err, &reqErr) {
-								switch reqErr.Name {
-								case "frontend.outline", "frontend.targets":
-									fallback = true
-								default:
+							res, err := c.Solve(ctx, req)
+							if err != nil {
+								if origErr != nil {
 									return nil, err
 								}
-							} else {
-								return nil, err
-							}
-							// buildkit v0.8 vendored in Docker 20.10 does not support typed errors
-							if strings.Contains(err.Error(), "unsupported request frontend.outline") || strings.Contains(err.Error(), "unsupported request frontend.targets") {
-								fallback = true
-							}
-
-							if fallback {
-								req.FrontendOpt["build-arg:BUILDKIT_SYNTAX"] = printFallbackImage
-								res2, err2 := c.Solve(ctx, req)
-								if err2 != nil {
-									return nil, err
+								var reqErr *errdefs.UnsupportedSubrequestError
+								if !isFallback {
+									if errors.As(err, &reqErr) {
+										switch reqErr.Name {
+										case "frontend.outline", "frontend.targets":
+											isFallback = true
+											origErr = err
+											continue
+										}
+										return nil, err
+									}
+									// buildkit v0.8 vendored in Docker 20.10 does not support typed errors
+									if strings.Contains(err.Error(), "unsupported request frontend.outline") || strings.Contains(err.Error(), "unsupported request frontend.targets") {
+										isFallback = true
+										origErr = err
+										continue
+									}
 								}
-								res = res2
-							} else {
 								return nil, err
 							}
-						}
-						if opt.PrintFunc != nil {
-							printRes = res.Metadata
-						}
-
-						results.Set(resultKey(dp.driverIndex, k), res)
-						return res, nil
-					}
-					var rr *client.SolveResponse
-					if resultHandleFunc != nil {
-						var resultHandle *ResultHandle
-						resultHandle, rr, err = NewResultHandle(ctx, cc, so, "buildx", buildFunc, ch)
-						resultHandleFunc(dp.driverIndex, resultHandle)
-					} else {
-						rr, err = c.Build(ctx, so, "buildx", buildFunc, ch)
-					}
-					if desktop.BuildBackendEnabled() && node.Driver.HistoryAPISupported(ctx) {
-						buildRef := fmt.Sprintf("%s/%s/%s", node.Builder, node.Name, so.Ref)
-						if err != nil {
-							return &desktop.ErrorWithBuildRef{
-								Ref: buildRef,
-								Err: err,
+							if opt.PrintFunc != nil {
+								printRes = res.Metadata
 							}
+							results.Set(resultKey(dp.driverIndex, k), res)
+							if resultHandleFunc != nil {
+								resultHandleFunc(dp.driverIndex, &ResultContext{cc, res})
+							}
+							return res, nil
 						}
-						progress.WriteBuildRef(w, k, buildRef)
-					}
+					}, ch)
 					if err != nil {
 						return err
 					}
@@ -1032,6 +1143,13 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 				resp[k] = res[0]
 				respMu.Unlock()
 				if len(res) == 1 {
+					dgst := res[0].ExporterResponse[exptypes.ExporterImageDigestKey]
+					if v, ok := res[0].ExporterResponse[exptypes.ExporterImageConfigDigestKey]; ok {
+						dgst = v
+					}
+					if opt.ImageIDFile != "" {
+						return os.WriteFile(opt.ImageIDFile, []byte(dgst), 0644)
+					}
 					return nil
 				}

@@ -1105,10 +1223,15 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 								}
 							}

-							dt, desc, err := itpull.Combine(ctx, srcs, nil)
+							dt, desc, err := itpull.Combine(ctx, srcs)
 							if err != nil {
 								return err
 							}
+							if opt.ImageIDFile != "" {
+								if err := os.WriteFile(opt.ImageIDFile, []byte(desc.Digest), 0644); err != nil {
+									return err
+								}
+							}

 							itpush := imagetools.New(imageopt)

@@ -1125,7 +1248,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 							respMu.Lock()
 							resp[k] = &client.SolveResponse{
 								ExporterResponse: map[string]string{
-									exptypes.ExporterImageDigestKey: desc.Digest.String(),
+									"containerimage.digest": desc.Digest.String(),
 								},
 							}
 							respMu.Unlock()
@@ -1269,7 +1392,7 @@ func createTempDockerfile(r io.Reader) (string, error) {
 	return dir, err
 }

-func LoadInputs(ctx context.Context, d *driver.DriverHandle, inp Inputs, pw progress.Writer, target *client.SolveOpt) (func(), error) {
+func LoadInputs(ctx context.Context, d driver.Driver, inp Inputs, pw progress.Writer, target *client.SolveOpt) (func(), error) {
 	if inp.ContextPath == "" {
 		return nil, errors.New("please specify build context (e.g. \".\" for the current directory)")
 	}
@@ -1318,6 +1441,7 @@ func LoadInputs(ctx context.Context, d *driver.DriverHandle, inp Inputs, pw prog
 				target.LocalDirs["context"] = inp.ContextPath
 			}
 		}
+
 	case isLocalDir(inp.ContextPath):
 		target.LocalDirs["context"] = inp.ContextPath
 		switch inp.DockerfilePath {
@@ -1329,13 +1453,10 @@ func LoadInputs(ctx context.Context, d *driver.DriverHandle, inp Inputs, pw prog
 			dockerfileDir = filepath.Dir(inp.DockerfilePath)
 			dockerfileName = filepath.Base(inp.DockerfilePath)
 		}
-	case IsRemoteURL(inp.ContextPath):
+
+	case urlutil.IsGitURL(inp.ContextPath), urlutil.IsURL(inp.ContextPath):
 		if inp.DockerfilePath == "-" {
 			dockerfileReader = inp.InStream
-		} else if filepath.IsAbs(inp.DockerfilePath) {
-			dockerfileDir = filepath.Dir(inp.DockerfilePath)
-			dockerfileName = filepath.Base(inp.DockerfilePath)
-			target.FrontendAttrs["dockerfilekey"] = "dockerfile"
 		}
 		target.FrontendAttrs["context"] = inp.ContextPath
 	default:
@@ -1388,7 +1509,7 @@ func LoadInputs(ctx context.Context, d *driver.DriverHandle, inp Inputs, pw prog
 			continue
 		}

-		if IsRemoteURL(v.Path) || strings.HasPrefix(v.Path, "docker-image://") || strings.HasPrefix(v.Path, "target:") {
+		if urlutil.IsGitURL(v.Path) || urlutil.IsURL(v.Path) || strings.HasPrefix(v.Path, "docker-image://") || strings.HasPrefix(v.Path, "target:") {
 			target.FrontendAttrs["context:"+k] = v.Path
 			continue
 		}
@@ -1529,8 +1650,8 @@ func waitContextDeps(ctx context.Context, index int, results *waitmap.Map, so *c
 				if dt, ok := rr.Metadata[exptypes.ExporterImageConfigKey+"/"+platform]; ok {
 					metadata[exptypes.ExporterImageConfigKey] = dt
 				}
-				if dt, ok := rr.Metadata["containerimage.buildinfo/"+platform]; ok {
-					metadata["containerimage.buildinfo"] = dt
+				if dt, ok := rr.Metadata[exptypes.ExporterBuildInfo+"/"+platform]; ok {
+					metadata[exptypes.ExporterBuildInfo] = dt
 				}
 				if len(metadata) > 0 {
 					dt, err := json.Marshal(metadata)
@@ -1553,8 +1674,8 @@ func waitContextDeps(ctx context.Context, index int, results *waitmap.Map, so *c
 			if dt, ok := rr.Metadata[exptypes.ExporterImageConfigKey]; ok {
 				metadata[exptypes.ExporterImageConfigKey] = dt
 			}
-			if dt, ok := rr.Metadata["containerimage.buildinfo"]; ok {
-				metadata["containerimage.buildinfo"] = dt
+			if dt, ok := rr.Metadata[exptypes.ExporterBuildInfo]; ok {
+				metadata[exptypes.ExporterBuildInfo] = dt
 			}
 			if len(metadata) > 0 {
 				dt, err := json.Marshal(metadata)
@@ -1568,12 +1689,12 @@ func waitContextDeps(ctx context.Context, index int, results *waitmap.Map, so *c
 	return nil
 }

-func notSupported(f driver.Feature, d driver.Driver, docs string) error {
-	return errors.Errorf(`%s is not supported for the %s driver.
-Switch to a different driver, or turn on the containerd image store, and try again.
-Learn more at %s`, f, d.Factory().Name(), docs)
+func notSupported(d driver.Driver, f driver.Feature) error {
+	return errors.Errorf("%s feature is currently not supported for %s driver. Please switch to a different driver (eg. \"docker buildx create --use\")", f, d.Factory().Name())
 }

+type dockerLoadCallback func(name string) (io.WriteCloser, func(), error)
+
 func noDefaultLoad() bool {
 	v, ok := os.LookupEnv("BUILDX_NO_DEFAULT_LOAD")
 	if !ok {
@@ -1617,6 +1738,12 @@ func handleLowercaseDockerfile(dir, p string) string {
 	return p
 }

+func wrapWriteCloser(wc io.WriteCloser) func(map[string]string) (io.WriteCloser, error) {
+	return func(map[string]string) (io.WriteCloser, error) {
+		return wc, nil
+	}
+}
+
 var nodeIdentifierMu sync.Mutex

 func tryNodeIdentifier(configDir string) (out string) {
@@ -1650,28 +1777,3 @@ func noPrintFunc(opt map[string]Options) bool {
 	}
 	return true
 }
-
-// ReadSourcePolicy reads a source policy from a file.
-// The file path is taken from EXPERIMENTAL_BUILDKIT_SOURCE_POLICY env var.
-// if the env var is not set, this `returns nil, nil`
-func ReadSourcePolicy() (*spb.Policy, error) {
-	p := os.Getenv("EXPERIMENTAL_BUILDKIT_SOURCE_POLICY")
-	if p == "" {
-		return nil, nil
-	}
-
-	data, err := os.ReadFile(p)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to read policy file")
-	}
-	var pol spb.Policy
-	if err := json.Unmarshal(data, &pol); err != nil {
-		// maybe it's in protobuf format?
-		e2 := pol.Unmarshal(data)
-		if e2 != nil {
-			return nil, errors.Wrap(err, "failed to parse source policy")
-		}
-	}
-
-	return &pol, nil
-}
--- a/build/git.go
+++ b/build/git.go
@@ -51,29 +51,23 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st

 	gitc, err := gitutil.New(gitutil.WithContext(ctx), gitutil.WithWorkingDir(wd))
 	if err != nil {
-		if st, err1 := os.Stat(path.Join(wd, ".git")); err1 == nil && st.IsDir() {
-			return res, errors.Wrap(err, "git was not found in the system")
+		if st, err := os.Stat(path.Join(wd, ".git")); err == nil && st.IsDir() {
+			return res, errors.New("buildx: git was not found in the system. Current commit information was not captured by the build")
 		}
 		return
 	}

 	if !gitc.IsInsideWorkTree() {
 		if st, err := os.Stat(path.Join(wd, ".git")); err == nil && st.IsDir() {
-			return res, errors.New("failed to read current commit information with git rev-parse --is-inside-work-tree")
+			return res, errors.New("buildx: failed to read current commit information with git rev-parse --is-inside-work-tree")
 		}
 		return res, nil
 	}

-	if sha, err := gitc.FullCommit(); err != nil && !gitutil.IsUnknownRevision(err) {
-		return res, errors.Wrap(err, "failed to get git commit")
+	if sha, err := gitc.FullCommit(); err != nil {
+		return res, errors.Wrapf(err, "buildx: failed to get git commit")
 	} else if sha != "" {
-		checkDirty := false
-		if v, ok := os.LookupEnv("BUILDX_GIT_CHECK_DIRTY"); ok {
-			if v, err := strconv.ParseBool(v); err == nil {
-				checkDirty = v
-			}
-		}
-		if checkDirty && gitc.IsDirty() {
+		if gitc.IsDirty() {
 			sha += "-dirty"
 		}
 		if setGitLabels {
@@ -95,7 +89,7 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st

 	if setGitLabels {
 		if root, err := gitc.RootDir(); err != nil {
-			return res, errors.Wrap(err, "failed to get git root dir")
+			return res, errors.Wrapf(err, "buildx: failed to get git root dir")
 		} else if root != "" {
 			if dockerfilePath == "" {
 				dockerfilePath = filepath.Join(wd, "Dockerfile")
--- a/build/git_test.go
+++ b/build/git_test.go
@@ -131,7 +131,6 @@ func TestGetGitAttributes(t *testing.T) {

 func TestGetGitAttributesDirty(t *testing.T) {
 	setupTest(t)
-	t.Setenv("BUILDX_GIT_CHECK_DIRTY", "true")

 	// make a change to test dirty flag
 	df := []byte("FROM alpine:edge\n")
--- a/build/invoke.go
+++ b/build/invoke.go
@@ -1,138 +0,0 @@
-package build
-
-import (
-	"context"
-	_ "crypto/sha256" // ensure digests can be computed
-	"io"
-	"sync"
-	"sync/atomic"
-	"syscall"
-
-	controllerapi "github.com/docker/buildx/controller/pb"
-	gateway "github.com/moby/buildkit/frontend/gateway/client"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-)
-
-type Container struct {
-	cancelOnce      sync.Once
-	containerCancel func()
-	isUnavailable   atomic.Bool
-	initStarted     atomic.Bool
-	container       gateway.Container
-	releaseCh       chan struct{}
-	resultCtx       *ResultHandle
-}
-
-func NewContainer(ctx context.Context, resultCtx *ResultHandle, cfg *controllerapi.InvokeConfig) (*Container, error) {
-	mainCtx := ctx
-
-	ctrCh := make(chan *Container)
-	errCh := make(chan error)
-	go func() {
-		err := resultCtx.build(func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
-			ctx, cancel := context.WithCancel(ctx)
-			go func() {
-				<-mainCtx.Done()
-				cancel()
-			}()
-
-			containerCfg, err := resultCtx.getContainerConfig(ctx, c, cfg)
-			if err != nil {
-				return nil, err
-			}
-			containerCtx, containerCancel := context.WithCancel(ctx)
-			defer containerCancel()
-			bkContainer, err := c.NewContainer(containerCtx, containerCfg)
-			if err != nil {
-				return nil, err
-			}
-			releaseCh := make(chan struct{})
-			container := &Container{
-				containerCancel: containerCancel,
-				container:       bkContainer,
-				releaseCh:       releaseCh,
-				resultCtx:       resultCtx,
-			}
-			doneCh := make(chan struct{})
-			defer close(doneCh)
-			resultCtx.registerCleanup(func() {
-				container.Cancel()
-				<-doneCh
-			})
-			ctrCh <- container
-			<-container.releaseCh
-
-			return nil, bkContainer.Release(ctx)
-		})
-		if err != nil {
-			errCh <- err
-		}
-	}()
-	select {
-	case ctr := <-ctrCh:
-		return ctr, nil
-	case err := <-errCh:
-		return nil, err
-	case <-mainCtx.Done():
-		return nil, mainCtx.Err()
-	}
-}
-
-func (c *Container) Cancel() {
-	c.markUnavailable()
-	c.cancelOnce.Do(func() {
-		if c.containerCancel != nil {
-			c.containerCancel()
-		}
-		close(c.releaseCh)
-	})
-}
-
-func (c *Container) IsUnavailable() bool {
-	return c.isUnavailable.Load()
-}
-
-func (c *Container) markUnavailable() {
-	c.isUnavailable.Store(true)
-}
-
-func (c *Container) Exec(ctx context.Context, cfg *controllerapi.InvokeConfig, stdin io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) error {
-	if isInit := c.initStarted.CompareAndSwap(false, true); isInit {
-		defer func() {
-			// container can't be used after init exits
-			c.markUnavailable()
-		}()
-	}
-	err := exec(ctx, c.resultCtx, cfg, c.container, stdin, stdout, stderr)
-	if err != nil {
-		// Container becomes unavailable if one of the processes fails in it.
-		c.markUnavailable()
-	}
-	return err
-}
-
-func exec(ctx context.Context, resultCtx *ResultHandle, cfg *controllerapi.InvokeConfig, ctr gateway.Container, stdin io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) error {
-	processCfg, err := resultCtx.getProcessConfig(cfg, stdin, stdout, stderr)
-	if err != nil {
-		return err
-	}
-	proc, err := ctr.Start(ctx, processCfg)
-	if err != nil {
-		return errors.Errorf("failed to start container: %v", err)
-	}
-
-	doneCh := make(chan struct{})
-	defer close(doneCh)
-	go func() {
-		select {
-		case <-ctx.Done():
-			if err := proc.Signal(ctx, syscall.SIGKILL); err != nil {
-				logrus.Warnf("failed to kill process: %v", err)
-			}
-		case <-doneCh:
-		}
-	}()
-
-	return proc.Wait()
-}
--- a/build/localstate.go
+++ b/build/localstate.go
@@ -1,43 +0,0 @@
-package build
-
-import (
-	"path/filepath"
-
-	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/localstate"
-	"github.com/moby/buildkit/client"
-)
-
-func saveLocalState(so *client.SolveOpt, target string, opts Options, node builder.Node, configDir string) error {
-	var err error
-	if so.Ref == "" {
-		return nil
-	}
-	lp := opts.Inputs.ContextPath
-	dp := opts.Inputs.DockerfilePath
-	if lp != "" || dp != "" {
-		if lp != "" {
-			lp, err = filepath.Abs(lp)
-			if err != nil {
-				return err
-			}
-		}
-		if dp != "" {
-			dp, err = filepath.Abs(dp)
-			if err != nil {
-				return err
-			}
-		}
-		l, err := localstate.New(configDir)
-		if err != nil {
-			return err
-		}
-		return l.SaveRef(node.Builder, node.Name, so.Ref, localstate.State{
-			Target:         target,
-			LocalPath:      lp,
-			DockerfilePath: dp,
-			GroupRef:       opts.GroupRef,
-		})
-	}
-	return nil
-}
--- a/build/result.go
+++ b/build/result.go
@@ -1,495 +0,0 @@
-package build
-
-import (
-	"context"
-	_ "crypto/sha256" // ensure digests can be computed
-	"encoding/json"
-	"io"
-	"sync"
-
-	controllerapi "github.com/docker/buildx/controller/pb"
-	"github.com/moby/buildkit/client"
-	"github.com/moby/buildkit/exporter/containerimage/exptypes"
-	gateway "github.com/moby/buildkit/frontend/gateway/client"
-	"github.com/moby/buildkit/solver/errdefs"
-	"github.com/moby/buildkit/solver/pb"
-	"github.com/moby/buildkit/solver/result"
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"golang.org/x/sync/errgroup"
-)
-
-// NewResultHandle makes a call to client.Build, additionally returning a
-// opaque ResultHandle alongside the standard response and error.
-//
-// This ResultHandle can be used to execute additional build steps in the same
-// context as the build occurred, which can allow easy debugging of build
-// failures and successes.
-//
-// If the returned ResultHandle is not nil, the caller must call Done() on it.
-func NewResultHandle(ctx context.Context, cc *client.Client, opt client.SolveOpt, product string, buildFunc gateway.BuildFunc, ch chan *client.SolveStatus) (*ResultHandle, *client.SolveResponse, error) {
-	// Create a new context to wrap the original, and cancel it when the
-	// caller-provided context is cancelled.
-	//
-	// We derive the context from the background context so that we can forbid
-	// cancellation of the build request after <-done is closed (which we do
-	// before returning the ResultHandle).
-	baseCtx := ctx
-	ctx, cancel := context.WithCancelCause(context.Background())
-	done := make(chan struct{})
-	go func() {
-		select {
-		case <-baseCtx.Done():
-			cancel(baseCtx.Err())
-		case <-done:
-			// Once done is closed, we've recorded a ResultHandle, so we
-			// shouldn't allow cancelling the underlying build request anymore.
-		}
-	}()
-
-	// Create a new channel to forward status messages to the original.
-	//
-	// We do this so that we can discard status messages after the main portion
-	// of the build is complete. This is necessary for the solve error case,
-	// where the original gateway is kept open until the ResultHandle is
-	// closed - we don't want progress messages from operations in that
-	// ResultHandle to display after this function exits.
-	//
-	// Additionally, callers should wait for the progress channel to be closed.
-	// If we keep the session open and never close the progress channel, the
-	// caller will likely hang.
-	baseCh := ch
-	ch = make(chan *client.SolveStatus)
-	go func() {
-		for {
-			s, ok := <-ch
-			if !ok {
-				return
-			}
-			select {
-			case <-baseCh:
-				// base channel is closed, discard status messages
-			default:
-				baseCh <- s
-			}
-		}
-	}()
-	defer close(baseCh)
-
-	var resp *client.SolveResponse
-	var respErr error
-	var respHandle *ResultHandle
-
-	go func() {
-		defer cancel(context.Canceled) // ensure no dangling processes
-
-		var res *gateway.Result
-		var err error
-		resp, err = cc.Build(ctx, opt, product, func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
-			var err error
-			res, err = buildFunc(ctx, c)
-
-			if res != nil && err == nil {
-				// Force evaluation of the build result (otherwise, we likely
-				// won't get a solve error)
-				def, err2 := getDefinition(ctx, res)
-				if err2 != nil {
-					return nil, err2
-				}
-				res, err = evalDefinition(ctx, c, def)
-			}
-
-			if err != nil {
-				// Scenario 1: we failed to evaluate a node somewhere in the
-				// build graph.
-				//
-				// In this case, we construct a ResultHandle from this
-				// original Build session, and return it alongside the original
-				// build error. We then need to keep the gateway session open
-				// until the caller explicitly closes the ResultHandle.
-
-				var se *errdefs.SolveError
-				if errors.As(err, &se) {
-					respHandle = &ResultHandle{
-						done:     make(chan struct{}),
-						solveErr: se,
-						gwClient: c,
-						gwCtx:    ctx,
-					}
-					respErr = err // return original error to preserve stacktrace
-					close(done)
-
-					// Block until the caller closes the ResultHandle.
-					select {
-					case <-respHandle.done:
-					case <-ctx.Done():
-					}
-				}
-			}
-			return res, err
-		}, ch)
-		if respHandle != nil {
-			return
-		}
-		if err != nil {
-			// Something unexpected failed during the build, we didn't succeed,
-			// but we also didn't make it far enough to create a ResultHandle.
-			respErr = err
-			close(done)
-			return
-		}
-
-		// Scenario 2: we successfully built the image with no errors.
-		//
-		// In this case, the original gateway session has now been closed
-		// since the Build has been completed. So, we need to create a new
-		// gateway session to populate the ResultHandle. To do this, we
-		// need to re-evaluate the target result, in this new session. This
-		// should be instantaneous since the result should be cached.
-
-		def, err := getDefinition(ctx, res)
-		if err != nil {
-			respErr = err
-			close(done)
-			return
-		}
-
-		// NOTE: ideally this second connection should be lazily opened
-		opt := opt
-		opt.Ref = ""
-		opt.Exports = nil
-		opt.CacheExports = nil
-		opt.Internal = true
-		_, respErr = cc.Build(ctx, opt, "buildx", func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
-			res, err := evalDefinition(ctx, c, def)
-			if err != nil {
-				// This should probably not happen, since we've previously
-				// successfully evaluated the same result with no issues.
-				return nil, errors.Wrap(err, "inconsistent solve result")
-			}
-			respHandle = &ResultHandle{
-				done:     make(chan struct{}),
-				res:      res,
-				gwClient: c,
-				gwCtx:    ctx,
-			}
-			close(done)
-
-			// Block until the caller closes the ResultHandle.
-			select {
-			case <-respHandle.done:
-			case <-ctx.Done():
-			}
-			return nil, ctx.Err()
-		}, nil)
-		if respHandle != nil {
-			return
-		}
-		close(done)
-	}()
-
-	// Block until the other thread signals that it's completed the build.
-	select {
-	case <-done:
-	case <-baseCtx.Done():
-		if respErr == nil {
-			respErr = baseCtx.Err()
-		}
-	}
-	return respHandle, resp, respErr
-}
-
-// getDefinition converts a gateway result into a collection of definitions for
-// each ref in the result.
-func getDefinition(ctx context.Context, res *gateway.Result) (*result.Result[*pb.Definition], error) {
-	return result.ConvertResult(res, func(ref gateway.Reference) (*pb.Definition, error) {
-		st, err := ref.ToState()
-		if err != nil {
-			return nil, err
-		}
-		def, err := st.Marshal(ctx)
-		if err != nil {
-			return nil, err
-		}
-		return def.ToPB(), nil
-	})
-}
-
-// evalDefinition performs the reverse of getDefinition, converting a
-// collection of definitions into a gateway result.
-func evalDefinition(ctx context.Context, c gateway.Client, defs *result.Result[*pb.Definition]) (*gateway.Result, error) {
-	// force evaluation of all targets in parallel
-	results := make(map[*pb.Definition]*gateway.Result)
-	resultsMu := sync.Mutex{}
-	eg, egCtx := errgroup.WithContext(ctx)
-	defs.EachRef(func(def *pb.Definition) error {
-		eg.Go(func() error {
-			res, err := c.Solve(egCtx, gateway.SolveRequest{
-				Evaluate:   true,
-				Definition: def,
-			})
-			if err != nil {
-				return err
-			}
-			resultsMu.Lock()
-			results[def] = res
-			resultsMu.Unlock()
-			return nil
-		})
-		return nil
-	})
-	if err := eg.Wait(); err != nil {
-		return nil, err
-	}
-	res, _ := result.ConvertResult(defs, func(def *pb.Definition) (gateway.Reference, error) {
-		if res, ok := results[def]; ok {
-			return res.Ref, nil
-		}
-		return nil, nil
-	})
-	return res, nil
-}
-
-// ResultHandle is a build result with the client that built it.
-type ResultHandle struct {
-	res      *gateway.Result
-	solveErr *errdefs.SolveError
-
-	done     chan struct{}
-	doneOnce sync.Once
-
-	gwClient gateway.Client
-	gwCtx    context.Context
-
-	cleanups   []func()
-	cleanupsMu sync.Mutex
-}
-
-func (r *ResultHandle) Done() {
-	r.doneOnce.Do(func() {
-		r.cleanupsMu.Lock()
-		cleanups := r.cleanups
-		r.cleanups = nil
-		r.cleanupsMu.Unlock()
-		for _, f := range cleanups {
-			f()
-		}
-
-		close(r.done)
-		<-r.gwCtx.Done()
-	})
-}
-
-func (r *ResultHandle) registerCleanup(f func()) {
-	r.cleanupsMu.Lock()
-	r.cleanups = append(r.cleanups, f)
-	r.cleanupsMu.Unlock()
-}
-
-func (r *ResultHandle) build(buildFunc gateway.BuildFunc) (err error) {
-	_, err = buildFunc(r.gwCtx, r.gwClient)
-	return err
-}
-
-func (r *ResultHandle) getContainerConfig(ctx context.Context, c gateway.Client, cfg *controllerapi.InvokeConfig) (containerCfg gateway.NewContainerRequest, _ error) {
-	if r.res != nil && r.solveErr == nil {
-		logrus.Debugf("creating container from successful build")
-		ccfg, err := containerConfigFromResult(ctx, r.res, c, *cfg)
-		if err != nil {
-			return containerCfg, err
-		}
-		containerCfg = *ccfg
-	} else {
-		logrus.Debugf("creating container from failed build %+v", cfg)
-		ccfg, err := containerConfigFromError(r.solveErr, *cfg)
-		if err != nil {
-			return containerCfg, errors.Wrapf(err, "no result nor error is available")
-		}
-		containerCfg = *ccfg
-	}
-	return containerCfg, nil
-}
-
-func (r *ResultHandle) getProcessConfig(cfg *controllerapi.InvokeConfig, stdin io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) (_ gateway.StartRequest, err error) {
-	processCfg := newStartRequest(stdin, stdout, stderr)
-	if r.res != nil && r.solveErr == nil {
-		logrus.Debugf("creating container from successful build")
-		if err := populateProcessConfigFromResult(&processCfg, r.res, *cfg); err != nil {
-			return processCfg, err
-		}
-	} else {
-		logrus.Debugf("creating container from failed build %+v", cfg)
-		if err := populateProcessConfigFromError(&processCfg, r.solveErr, *cfg); err != nil {
-			return processCfg, err
-		}
-	}
-	return processCfg, nil
-}
-
-func containerConfigFromResult(ctx context.Context, res *gateway.Result, c gateway.Client, cfg controllerapi.InvokeConfig) (*gateway.NewContainerRequest, error) {
-	if cfg.Initial {
-		return nil, errors.Errorf("starting from the container from the initial state of the step is supported only on the failed steps")
-	}
-
-	ps, err := exptypes.ParsePlatforms(res.Metadata)
-	if err != nil {
-		return nil, err
-	}
-	ref, ok := res.FindRef(ps.Platforms[0].ID)
-	if !ok {
-		return nil, errors.Errorf("no reference found")
-	}
-
-	return &gateway.NewContainerRequest{
-		Mounts: []gateway.Mount{
-			{
-				Dest:      "/",
-				MountType: pb.MountType_BIND,
-				Ref:       ref,
-			},
-		},
-	}, nil
-}
-
-func populateProcessConfigFromResult(req *gateway.StartRequest, res *gateway.Result, cfg controllerapi.InvokeConfig) error {
-	imgData := res.Metadata[exptypes.ExporterImageConfigKey]
-	var img *specs.Image
-	if len(imgData) > 0 {
-		img = &specs.Image{}
-		if err := json.Unmarshal(imgData, img); err != nil {
-			return err
-		}
-	}
-
-	user := ""
-	if !cfg.NoUser {
-		user = cfg.User
-	} else if img != nil {
-		user = img.Config.User
-	}
-
-	cwd := ""
-	if !cfg.NoCwd {
-		cwd = cfg.Cwd
-	} else if img != nil {
-		cwd = img.Config.WorkingDir
-	}
-
-	env := []string{}
-	if img != nil {
-		env = append(env, img.Config.Env...)
-	}
-	env = append(env, cfg.Env...)
-
-	args := []string{}
-	if cfg.Entrypoint != nil {
-		args = append(args, cfg.Entrypoint...)
-	} else if img != nil {
-		args = append(args, img.Config.Entrypoint...)
-	}
-	if !cfg.NoCmd {
-		args = append(args, cfg.Cmd...)
-	} else if img != nil {
-		args = append(args, img.Config.Cmd...)
-	}
-
-	req.Args = args
-	req.Env = env
-	req.User = user
-	req.Cwd = cwd
-	req.Tty = cfg.Tty
-
-	return nil
-}
-
-func containerConfigFromError(solveErr *errdefs.SolveError, cfg controllerapi.InvokeConfig) (*gateway.NewContainerRequest, error) {
-	exec, err := execOpFromError(solveErr)
-	if err != nil {
-		return nil, err
-	}
-	var mounts []gateway.Mount
-	for i, mnt := range exec.Mounts {
-		rid := solveErr.Solve.MountIDs[i]
-		if cfg.Initial {
-			rid = solveErr.Solve.InputIDs[i]
-		}
-		mounts = append(mounts, gateway.Mount{
-			Selector:  mnt.Selector,
-			Dest:      mnt.Dest,
-			ResultID:  rid,
-			Readonly:  mnt.Readonly,
-			MountType: mnt.MountType,
-			CacheOpt:  mnt.CacheOpt,
-			SecretOpt: mnt.SecretOpt,
-			SSHOpt:    mnt.SSHOpt,
-		})
-	}
-	return &gateway.NewContainerRequest{
-		Mounts:  mounts,
-		NetMode: exec.Network,
-	}, nil
-}
-
-func populateProcessConfigFromError(req *gateway.StartRequest, solveErr *errdefs.SolveError, cfg controllerapi.InvokeConfig) error {
-	exec, err := execOpFromError(solveErr)
-	if err != nil {
-		return err
-	}
-	meta := exec.Meta
-	user := ""
-	if !cfg.NoUser {
-		user = cfg.User
-	} else {
-		user = meta.User
-	}
-
-	cwd := ""
-	if !cfg.NoCwd {
-		cwd = cfg.Cwd
-	} else {
-		cwd = meta.Cwd
-	}
-
-	env := append(meta.Env, cfg.Env...)
-
-	args := []string{}
-	if cfg.Entrypoint != nil {
-		args = append(args, cfg.Entrypoint...)
-	}
-	if cfg.Cmd != nil {
-		args = append(args, cfg.Cmd...)
-	}
-	if len(args) == 0 {
-		args = meta.Args
-	}
-
-	req.Args = args
-	req.Env = env
-	req.User = user
-	req.Cwd = cwd
-	req.Tty = cfg.Tty
-
-	return nil
-}
-
-func execOpFromError(solveErr *errdefs.SolveError) (*pb.ExecOp, error) {
-	if solveErr == nil {
-		return nil, errors.Errorf("no error is available")
-	}
-	switch op := solveErr.Solve.Op.GetOp().(type) {
-	case *pb.Op_Exec:
-		return op.Exec, nil
-	default:
-		return nil, errors.Errorf("invoke: unsupported error type")
-	}
-	// TODO: support other ops
-}
-
-func newStartRequest(stdin io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) gateway.StartRequest {
-	return gateway.StartRequest{
-		Stdin:  stdin,
-		Stdout: stdout,
-		Stderr: stderr,
-	}
-}
--- a/build/url.go
+++ b/build/url.go
@@ -13,7 +13,7 @@ import (
 	"github.com/pkg/errors"
 )

-func createTempDockerfileFromURL(ctx context.Context, d *driver.DriverHandle, url string, pw progress.Writer) (string, error) {
+func createTempDockerfileFromURL(ctx context.Context, d driver.Driver, url string, pw progress.Writer) (string, error) {
 	c, err := driver.Boot(ctx, ctx, d, pw)
 	if err != nil {
 		return "", err
@@ -21,7 +21,7 @@ func createTempDockerfileFromURL(ctx context.Context, d *driver.DriverHandle, ur
 	var out string
 	ch, done := progress.NewChannel(pw)
 	defer func() { <-done }()
-	_, err = c.Build(ctx, client.SolveOpt{Internal: true}, "buildx", func(ctx context.Context, c gwclient.Client) (*gwclient.Result, error) {
+	_, err = c.Build(ctx, client.SolveOpt{}, "buildx", func(ctx context.Context, c gwclient.Client) (*gwclient.Result, error) {
 		def, err := llb.HTTP(url, llb.Filename("Dockerfile"), llb.WithCustomNamef("[internal] load %s", url)).Marshal(ctx)
 		if err != nil {
 			return nil, err
--- a/build/utils.go
+++ b/build/utils.go
@@ -3,15 +3,11 @@ package build
 import (
 	"archive/tar"
 	"bytes"
-	"context"
 	"net"
 	"os"
 	"strings"

-	"github.com/docker/buildx/driver"
 	"github.com/docker/cli/opts"
-	"github.com/docker/docker/builder/remotecontext/urlutil"
-	"github.com/moby/buildkit/util/gitutil"
 	"github.com/pkg/errors"
 )

@@ -24,16 +20,6 @@ const (
 	mobyHostGatewayName = "host-gateway"
 )

-func IsRemoteURL(c string) bool {
-	if urlutil.IsURL(c) {
-		return true
-	}
-	if _, err := gitutil.ParseGitRef(c); err == nil {
-		return true
-	}
-	return false
-}
-
 func isLocalDir(c string) bool {
 	st, err := os.Stat(c)
 	return err == nil && st.IsDir()
@@ -59,7 +45,7 @@ func isArchive(header []byte) bool {
 }

 // toBuildkitExtraHosts converts hosts from docker key:value format to buildkit's csv format
-func toBuildkitExtraHosts(ctx context.Context, inp []string, nodeDriver *driver.DriverHandle) (string, error) {
+func toBuildkitExtraHosts(inp []string, mobyDriver bool) (string, error) {
 	if len(inp) == 0 {
 		return "", nil
 	}
@@ -69,16 +55,11 @@ func toBuildkitExtraHosts(ctx context.Context, inp []string, nodeDriver *driver.
 		if !ok || host == "" || ip == "" {
 			return "", errors.Errorf("invalid host %s", h)
 		}
-		// If the IP Address is a "host-gateway", replace this value with the
-		// IP address provided by the worker's label.
-		if ip == mobyHostGatewayName {
-			hgip, err := nodeDriver.HostGatewayIP(ctx)
-			if err != nil {
-				return "", errors.Wrap(err, "unable to derive the IP value for host-gateway")
+		// Skip IP address validation for "host-gateway" string with moby driver
+		if !mobyDriver || ip != mobyHostGatewayName {
+			if net.ParseIP(ip) == nil {
+				return "", errors.Errorf("invalid host %s", h)
 			}
-			ip = hgip.String()
-		} else if net.ParseIP(ip) == nil {
-			return "", errors.Errorf("invalid host %s", h)
 		}
 		hosts = append(hosts, host+"="+ip)
 	}
--- a/builder/builder.go
+++ b/builder/builder.go
@@ -13,7 +13,6 @@ import (
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/command"
-	"github.com/moby/buildkit/util/progress/progressui"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 )
@@ -109,7 +108,7 @@ func New(dockerCli command.Cli, opts ...Option) (_ *Builder, err error) {

 // Validate validates builder context
 func (b *Builder) Validate() error {
-	if b.NodeGroup != nil && b.NodeGroup.DockerContext {
+	if b.NodeGroup.DockerContext {
 		list, err := b.opts.dockerCli.ContextStore().List()
 		if err != nil {
 			return err
@@ -158,14 +157,13 @@ func (b *Builder) Boot(ctx context.Context) (bool, error) {
 		return false, nil
 	}

-	printer, err := progress.NewPrinter(context.TODO(), os.Stderr, progressui.AutoMode)
+	printer, err := progress.NewPrinter(context.TODO(), os.Stderr, os.Stderr, progress.PrinterModeAuto)
 	if err != nil {
 		return false, err
 	}

 	baseCtx := ctx
 	eg, _ := errgroup.WithContext(ctx)
-	errCh := make(chan error, len(toBoot))
 	for _, idx := range toBoot {
 		func(idx int) {
 			eg.Go(func() error {
@@ -173,7 +171,6 @@ func (b *Builder) Boot(ctx context.Context) (bool, error) {
 				_, err := driver.Boot(ctx, baseCtx, b.nodes[idx].Driver, pw)
 				if err != nil {
 					b.nodes[idx].Err = err
-					errCh <- err
 				}
 				return nil
 			})
@@ -181,15 +178,11 @@ func (b *Builder) Boot(ctx context.Context) (bool, error) {
 	}

 	err = eg.Wait()
-	close(errCh)
 	err1 := printer.Wait()
 	if err == nil {
 		err = err1
 	}

-	if err == nil && len(errCh) == len(toBoot) {
-		return false, <-errCh
-	}
 	return true, err
 }

@@ -214,7 +207,7 @@ type driverFactory struct {
 }

 // Factory returns the driver factory.
-func (b *Builder) Factory(ctx context.Context, dialMeta map[string][]string) (_ driver.Factory, err error) {
+func (b *Builder) Factory(ctx context.Context) (_ driver.Factory, err error) {
 	b.driverFactory.once.Do(func() {
 		if b.Driver != "" {
 			b.driverFactory.Factory, err = driver.GetFactory(b.Driver, true)
@@ -237,7 +230,7 @@ func (b *Builder) Factory(ctx context.Context, dialMeta map[string][]string) (_
 			if _, err = dockerapi.Ping(ctx); err != nil {
 				return
 			}
-			b.driverFactory.Factory, err = driver.GetDefaultFactory(ctx, ep, dockerapi, false, dialMeta)
+			b.driverFactory.Factory, err = driver.GetDefaultFactory(ctx, ep, dockerapi, false)
 			if err != nil {
 				return
 			}
--- a/builder/node.go
+++ b/builder/node.go
@@ -2,7 +2,6 @@ package builder

 import (
 	"context"
-	"sort"

 	"github.com/docker/buildx/driver"
 	ctxkube "github.com/docker/buildx/driver/kubernetes/context"
@@ -11,7 +10,6 @@ import (
 	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/buildx/util/platformutil"
-	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/util/grpcerrors"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
@@ -22,19 +20,13 @@ import (

 type Node struct {
 	store.Node
-	Builder     string
-	Driver      *driver.DriverHandle
+	Driver      driver.Driver
 	DriverInfo  *driver.Info
+	Platforms   []ocispecs.Platform
 	ImageOpt    imagetools.Opt
 	ProxyConfig map[string]string
 	Version     string
 	Err         error
-
-	// worker settings
-	IDs       []string
-	Platforms []ocispecs.Platform
-	GCPolicy  []client.PruneInfo
-	Labels    map[string]string
 }

 // Nodes returns nodes for this builder.
@@ -42,35 +34,9 @@ func (b *Builder) Nodes() []Node {
 	return b.nodes
 }

-type LoadNodesOption func(*loadNodesOptions)
-
-type loadNodesOptions struct {
-	data     bool
-	dialMeta map[string][]string
-}
-
-func WithData() LoadNodesOption {
-	return func(o *loadNodesOptions) {
-		o.data = true
-	}
-}
-
-func WithDialMeta(dialMeta map[string][]string) LoadNodesOption {
-	return func(o *loadNodesOptions) {
-		o.dialMeta = dialMeta
-	}
-}
-
 // LoadNodes loads and returns nodes for this builder.
 // TODO: this should be a method on a Node object and lazy load data for each driver.
-func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []Node, err error) {
-	lno := loadNodesOptions{
-		data: false,
-	}
-	for _, opt := range opts {
-		opt(&lno)
-	}
-
+func (b *Builder) LoadNodes(ctx context.Context, withData bool) (_ []Node, err error) {
 	eg, _ := errgroup.WithContext(ctx)
 	b.nodes = make([]Node, len(b.NodeGroup.Nodes))

@@ -80,7 +46,7 @@ func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []N
 		}
 	}()

-	factory, err := b.Factory(ctx, lno.dialMeta)
+	factory, err := b.Factory(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -97,7 +63,6 @@ func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []N
 					Node:        n,
 					ProxyConfig: storeutil.GetProxyConfig(b.opts.dockerCli),
 					Platforms:   n.Platforms,
-					Builder:     b.Name,
 				}
 				defer func() {
 					b.nodes[i] = node
@@ -112,12 +77,12 @@ func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []N
 				contextStore := b.opts.dockerCli.ContextStore()

 				var kcc driver.KubeClientConfig
-				kcc, err = ctxkube.ConfigFromEndpoint(n.Endpoint, contextStore)
+				kcc, err = ctxkube.ConfigFromContext(n.Endpoint, contextStore)
 				if err != nil {
 					// err is returned if n.Endpoint is non-context name like "unix:///var/run/docker.sock".
 					// try again with name="default".
 					// FIXME(@AkihiroSuda): n should retain real context name.
-					kcc, err = ctxkube.ConfigFromEndpoint("default", contextStore)
+					kcc, err = ctxkube.ConfigFromContext("default", contextStore)
 					if err != nil {
 						logrus.Error(err)
 					}
@@ -139,7 +104,7 @@ func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []N
 					}
 				}

-				d, err := driver.GetDriver(ctx, "buildx_buildkit_"+n.Name, factory, n.Endpoint, dockerapi, imageopt.Auth, kcc, n.Flags, n.Files, n.DriverOpts, n.Platforms, b.opts.contextPathHash, lno.dialMeta)
+				d, err := driver.GetDriver(ctx, "buildx_buildkit_"+n.Name, factory, n.Endpoint, dockerapi, imageopt.Auth, kcc, n.Flags, n.Files, n.DriverOpts, n.Platforms, b.opts.contextPathHash)
 				if err != nil {
 					node.Err = err
 					return nil
@@ -147,7 +112,7 @@ func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []N
 				node.Driver = d
 				node.ImageOpt = imageopt

-				if lno.data {
+				if withData {
 					if err := node.loadData(ctx); err != nil {
 						node.Err = err
 					}
@@ -162,7 +127,7 @@ func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []N
 	}

 	// TODO: This should be done in the routine loading driver data
-	if lno.data {
+	if withData {
 		kubernetesDriverCount := 0
 		for _, d := range b.nodes {
 			if d.DriverInfo != nil && len(d.DriverInfo.DynamicNodes) > 0 {
@@ -217,15 +182,9 @@ func (n *Node) loadData(ctx context.Context) error {
 		if err != nil {
 			return errors.Wrap(err, "listing workers")
 		}
-		for idx, w := range workers {
-			n.IDs = append(n.IDs, w.ID)
+		for _, w := range workers {
 			n.Platforms = append(n.Platforms, w.Platforms...)
-			if idx == 0 {
-				n.GCPolicy = w.GCPolicy
-				n.Labels = w.Labels
-			}
 		}
-		sort.Strings(n.IDs)
 		n.Platforms = platformutil.Dedupe(n.Platforms)
 		inf, err := driverClient.Info(ctx)
 		if err != nil {
--- a/cmd/buildx/main.go
+++ b/cmd/buildx/main.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"

+	"github.com/containerd/containerd/pkg/seed"
 	"github.com/docker/buildx/commands"
-	"github.com/docker/buildx/util/desktop"
 	"github.com/docker/buildx/version"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli-plugins/manager"
@@ -16,10 +16,10 @@ import (
 	"github.com/moby/buildkit/solver/errdefs"
 	"github.com/moby/buildkit/util/stack"

-	//nolint:staticcheck // vendored dependencies may still use this
-	"github.com/containerd/containerd/pkg/seed"
-
+	_ "k8s.io/client-go/plugin/pkg/client/auth/azure"
+	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
+	_ "k8s.io/client-go/plugin/pkg/client/auth/openstack"

 	_ "github.com/docker/buildx/driver/docker"
 	_ "github.com/docker/buildx/driver/docker-container"
@@ -28,9 +28,7 @@ import (
 )

 func init() {
-	//nolint:staticcheck
 	seed.WithTimeAndRand()
-
 	stack.SetVersionInfo(version.Version, version.Revision)
 }

@@ -87,9 +85,6 @@ func main() {
 	} else {
 		fmt.Fprintf(cmd.Err(), "ERROR: %v\n", err)
 	}
-	if ebr, ok := err.(*desktop.ErrorWithBuildRef); ok {
-		ebr.Print(cmd.Err())
-	}

 	os.Exit(1)
 }
--- a/commands/bake.go
+++ b/commands/bake.go
@@ -6,41 +6,29 @@ import (
 	"fmt"
 	"os"

-	"github.com/containerd/console"
 	"github.com/containerd/containerd/platforms"
 	"github.com/docker/buildx/bake"
 	"github.com/docker/buildx/build"
 	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/localstate"
 	"github.com/docker/buildx/util/buildflags"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/util/confutil"
-	"github.com/docker/buildx/util/desktop"
 	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/buildx/util/tracing"
 	"github.com/docker/cli/cli/command"
-	"github.com/moby/buildkit/identity"
 	"github.com/moby/buildkit/util/appcontext"
-	"github.com/moby/buildkit/util/progress/progressui"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

 type bakeOptions struct {
-	files      []string
-	overrides  []string
-	printOnly  bool
-	sbom       string
-	provenance string
-
-	builder      string
-	metadataFile string
-	exportPush   bool
-	exportLoad   bool
+	files     []string
+	overrides []string
+	printOnly bool
+	commonOptions
 }

-func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags commonFlags) (err error) {
+func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error) {
 	ctx := appcontext.Context()

 	ctx, end, err := tracing.TraceCurrentCommand(ctx, "bake")
@@ -55,11 +43,11 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 	cmdContext := "cwd://"

 	if len(targets) > 0 {
-		if build.IsRemoteURL(targets[0]) {
+		if bake.IsRemoteURL(targets[0]) {
 			url = targets[0]
 			targets = targets[1:]
 			if len(targets) > 0 {
-				if build.IsRemoteURL(targets[0]) {
+				if bake.IsRemoteURL(targets[0]) {
 					cmdContext = targets[0]
 					targets = targets[1:]
 				}
@@ -80,11 +68,11 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 	} else if in.exportLoad {
 		overrides = append(overrides, "*.output=type=docker")
 	}
-	if cFlags.noCache != nil {
-		overrides = append(overrides, fmt.Sprintf("*.no-cache=%t", *cFlags.noCache))
+	if in.noCache != nil {
+		overrides = append(overrides, fmt.Sprintf("*.no-cache=%t", *in.noCache))
 	}
-	if cFlags.pull != nil {
-		overrides = append(overrides, fmt.Sprintf("*.pull=%t", *cFlags.pull))
+	if in.pull != nil {
+		overrides = append(overrides, fmt.Sprintf("*.pull=%t", *in.pull))
 	}
 	if in.sbom != "" {
 		overrides = append(overrides, fmt.Sprintf("*.attest=%s", buildflags.CanonicalizeAttest("sbom", in.sbom)))
@@ -96,11 +84,23 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com

 	ctx2, cancel := context.WithCancel(context.TODO())
 	defer cancel()
+	printer, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, in.progress)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		if printer != nil {
+			err1 := printer.Wait()
+			if err == nil {
+				err = err1
+			}
+		}
+	}()

 	var nodes []builder.Node
 	var files []bake.File
 	var inp *bake.Input
-	var progressConsoleDesc, progressTextDesc string

 	// instance only needed for reading remote bake files or building
 	if url != "" || !in.printOnly {
@@ -114,46 +114,16 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 		if err = updateLastActivity(dockerCli, b.NodeGroup); err != nil {
 			return errors.Wrapf(err, "failed to update builder last activity time")
 		}
-		nodes, err = b.LoadNodes(ctx)
+		nodes, err = b.LoadNodes(ctx, false)
 		if err != nil {
 			return err
 		}
-		progressConsoleDesc = fmt.Sprintf("%s:%s", b.Driver, b.Name)
-		progressTextDesc = fmt.Sprintf("building with %q instance using %s driver", b.Name, b.Driver)
 	}

-	var term bool
-	if _, err := console.ConsoleFromFile(os.Stderr); err == nil {
-		term = true
-	}
-
-	progressMode := progressui.DisplayMode(cFlags.progress)
-	printer, err := progress.NewPrinter(ctx2, os.Stderr, progressMode,
-		progress.WithDesc(progressTextDesc, progressConsoleDesc),
-	)
-	if err != nil {
-		return err
-	}
-
-	defer func() {
-		if printer != nil {
-			err1 := printer.Wait()
-			if err == nil {
-				err = err1
-			}
-			if err == nil && progressMode != progressui.QuietMode {
-				desktop.PrintBuildDetails(os.Stderr, printer.BuildRefs(), term)
-			}
-		}
-	}()
-
 	if url != "" {
 		files, inp, err = bake.ReadRemoteFiles(ctx, nodes, url, in.files, printer)
 	} else {
-		progress.Wrap("[internal] load local bake definitions", printer.Write, func(sub progress.SubLogger) error {
-			files, err = bake.ReadLocalFiles(in.files, dockerCli.In(), sub)
-			return nil
-		})
+		files, err = bake.ReadLocalFiles(in.files)
 	}
 	if err != nil {
 		return err
@@ -161,7 +131,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com

 	tgts, grps, err := bake.ReadTargets(ctx, files, targets, overrides, map[string]string{
 		// don't forget to update documentation if you add a new
-		// built-in variable: docs/bake-reference.md#built-in-variables
+		// built-in variable: docs/manuals/bake/file-definition.md#built-in-variables
 		"BAKE_CMD_CONTEXT":    cmdContext,
 		"BAKE_LOCAL_PLATFORM": platforms.DefaultString(),
 	})
@@ -169,35 +139,20 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 		return err
 	}

-	if v := os.Getenv("SOURCE_DATE_EPOCH"); v != "" {
-		// TODO: extract env var parsing to a method easily usable by library consumers
-		for _, t := range tgts {
-			if _, ok := t.Args["SOURCE_DATE_EPOCH"]; ok {
-				continue
-			}
-			if t.Args == nil {
-				t.Args = map[string]*string{}
-			}
-			t.Args["SOURCE_DATE_EPOCH"] = &v
-		}
-	}
-
 	// this function can update target context string from the input so call before printOnly check
 	bo, err := bake.TargetsToBuildOpt(tgts, inp)
 	if err != nil {
 		return err
 	}

-	def := struct {
-		Group  map[string]*bake.Group  `json:"group,omitempty"`
-		Target map[string]*bake.Target `json:"target"`
-	}{
-		Group:  grps,
-		Target: tgts,
-	}
-
 	if in.printOnly {
-		dt, err := json.MarshalIndent(def, "", "  ")
+		dt, err := json.MarshalIndent(struct {
+			Group  map[string]*bake.Group  `json:"group,omitempty"`
+			Target map[string]*bake.Target `json:"target"`
+		}{
+			grps,
+			tgts,
+		}, "", "  ")
 		if err != nil {
 			return err
 		}
@@ -210,28 +165,6 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 		return nil
 	}

-	// local state group
-	groupRef := identity.NewID()
-	var refs []string
-	for k, b := range bo {
-		b.Ref = identity.NewID()
-		b.GroupRef = groupRef
-		refs = append(refs, b.Ref)
-		bo[k] = b
-	}
-	dt, err := json.Marshal(def)
-	if err != nil {
-		return err
-	}
-	if err := saveLocalStateGroup(dockerCli, groupRef, localstate.StateGroup{
-		Definition: dt,
-		Targets:    targets,
-		Inputs:     overrides,
-		Refs:       refs,
-	}); err != nil {
-		return err
-	}
-
 	resp, err := build.Build(ctx, nodes, bo, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), printer)
 	if err != nil {
 		return wrapBuildError(err, true)
@@ -252,7 +185,6 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com

 func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	var options bakeOptions
-	var cFlags commonFlags

 	cmd := &cobra.Command{
 		Use:     "bake [OPTIONS] [TARGET...]",
@@ -261,17 +193,14 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// reset to nil to avoid override is unset
 			if !cmd.Flags().Lookup("no-cache").Changed {
-				cFlags.noCache = nil
+				options.noCache = nil
 			}
 			if !cmd.Flags().Lookup("pull").Changed {
-				cFlags.pull = nil
+				options.pull = nil
 			}
-			options.builder = rootOpts.builder
-			options.metadataFile = cFlags.metadataFile
-			// Other common flags (noCache, pull and progress) are processed in runBake function.
-			return runBake(dockerCli, args, options, cFlags)
+			options.commonOptions.builder = rootOpts.builder
+			return runBake(dockerCli, args, options)
 		},
-		ValidArgsFunction: completion.BakeTargets(options.files),
 	}

 	flags := cmd.Flags()
@@ -284,15 +213,7 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	flags.StringVar(&options.provenance, "provenance", "", `Shorthand for "--set=*.attest=type=provenance"`)
 	flags.StringArrayVar(&options.overrides, "set", nil, `Override target value (e.g., "targetpattern.key=value")`)

-	commonBuildFlags(&cFlags, flags)
+	commonBuildFlags(&options.commonOptions, flags)

 	return cmd
 }
-
-func saveLocalStateGroup(dockerCli command.Cli, ref string, lsg localstate.StateGroup) error {
-	l, err := localstate.New(confutil.ConfigDir(dockerCli))
-	if err != nil {
-		return err
-	}
-	return l.SaveGroup(ref, lsg)
-}
--- a/commands/build.go
+++ b/commands/build.go
--- a/commands/create.go
+++ b/commands/create.go
@@ -12,13 +12,10 @@ import (

 	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/driver"
-	k8sutil "github.com/docker/buildx/driver/kubernetes/util"
 	remoteutil "github.com/docker/buildx/driver/remote/util"
-	"github.com/docker/buildx/localstate"
 	"github.com/docker/buildx/store"
 	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/cobrautil"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/util/confutil"
 	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/cli/cli"
@@ -72,7 +69,6 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 	if err != nil {
 		return err
 	}
-	// Ensure the file lock gets released no matter what happens.
 	defer release()

 	name := in.name
@@ -123,7 +119,7 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 			if len(args) > 0 {
 				arg = args[0]
 			}
-			f, err := driver.GetDefaultFactory(ctx, arg, dockerCli.Client(), true, nil)
+			f, err := driver.GetDefaultFactory(ctx, arg, dockerCli.Client(), true)
 			if err != nil {
 				return err
 			}
@@ -173,34 +169,18 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 		if err := ng.Leave(in.nodeName); err != nil {
 			return err
 		}
-		ls, err := localstate.New(confutil.ConfigDir(dockerCli))
-		if err != nil {
-			return err
-		}
-		if err := ls.RemoveBuilderNode(ng.Name, in.nodeName); err != nil {
-			return err
-		}
 	} else {
 		switch {
 		case driverName == "kubernetes":
 			if len(args) > 0 {
 				logrus.Warnf("kubernetes driver does not support endpoint args %q", args[0])
 			}
-			// generate node name if not provided to avoid duplicated endpoint
-			// error: https://github.com/docker/setup-buildx-action/issues/215
-			nodeName := in.nodeName
-			if nodeName == "" {
-				nodeName, err = k8sutil.GenerateNodeName(name, txn)
-				if err != nil {
-					return err
-				}
-			}
 			// naming endpoint to make --append works
 			ep = (&url.URL{
 				Scheme: driverName,
-				Path:   "/" + name,
+				Path:   "/" + in.name,
 				RawQuery: (&url.Values{
-					"deployment": {nodeName},
+					"deployment": {in.nodeName},
 					"kubeconfig": {os.Getenv("KUBECONFIG")},
 				}).Encode(),
 			}).String()
@@ -270,7 +250,7 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 	timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
 	defer cancel()

-	nodes, err := b.LoadNodes(timeoutCtx, builder.WithData())
+	nodes, err := b.LoadNodes(timeoutCtx, true)
 	if err != nil {
 		return err
 	}
@@ -301,10 +281,6 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 		}
 	}

-	// The store is no longer used from this point.
-	// Release it so we aren't holding the file lock during the boot.
-	release()
-
 	if in.bootstrap {
 		if _, err = b.Boot(ctx); err != nil {
 			return err
@@ -333,7 +309,6 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runCreate(dockerCli, options, args)
 		},
-		ValidArgsFunction: completion.Disable,
 	}

 	flags := cmd.Flags()
--- a/commands/debug/root.go
+++ b/commands/debug/root.go
@@ -1,96 +0,0 @@
-package debug
-
-import (
-	"context"
-	"os"
-	"runtime"
-
-	"github.com/containerd/console"
-	"github.com/docker/buildx/controller"
-	"github.com/docker/buildx/controller/control"
-	controllerapi "github.com/docker/buildx/controller/pb"
-	"github.com/docker/buildx/monitor"
-	"github.com/docker/buildx/util/progress"
-	"github.com/docker/cli/cli/command"
-	"github.com/moby/buildkit/util/progress/progressui"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-)
-
-// DebugConfig is a user-specified configuration for the debugger.
-type DebugConfig struct {
-	// InvokeFlag is a flag to configure the launched debugger and the commaned executed on the debugger.
-	InvokeFlag string
-
-	// OnFlag is a flag to configure the timing of launching the debugger.
-	OnFlag string
-}
-
-// DebuggableCmd is a command that supports debugger with recognizing the user-specified DebugConfig.
-type DebuggableCmd interface {
-	// NewDebugger returns the new *cobra.Command with support for the debugger with recognizing DebugConfig.
-	NewDebugger(*DebugConfig) *cobra.Command
-}
-
-func RootCmd(dockerCli command.Cli, children ...DebuggableCmd) *cobra.Command {
-	var controlOptions control.ControlOptions
-	var progressMode string
-	var options DebugConfig
-
-	cmd := &cobra.Command{
-		Use:   "debug",
-		Short: "Start debugger",
-		Args:  cobra.NoArgs,
-		Annotations: map[string]string{
-			"experimentalCLI": "",
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			printer, err := progress.NewPrinter(context.TODO(), os.Stderr, progressui.DisplayMode(progressMode))
-			if err != nil {
-				return err
-			}
-
-			ctx := context.TODO()
-			c, err := controller.NewController(ctx, controlOptions, dockerCli, printer)
-			if err != nil {
-				return err
-			}
-			defer func() {
-				if err := c.Close(); err != nil {
-					logrus.Warnf("failed to close server connection %v", err)
-				}
-			}()
-			con := console.Current()
-			if err := con.SetRaw(); err != nil {
-				return errors.Errorf("failed to configure terminal: %v", err)
-			}
-
-			_, err = monitor.RunMonitor(ctx, "", nil, controllerapi.InvokeConfig{
-				Tty: true,
-			}, c, dockerCli.In(), os.Stdout, os.Stderr, printer)
-			con.Reset()
-			return err
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVar(&options.InvokeFlag, "invoke", "", "Launch a monitor with executing specified command")
-	flags.SetAnnotation("invoke", "experimentalCLI", nil)
-	flags.StringVar(&options.OnFlag, "on", "error", "When to launch the monitor ([always, error])")
-	flags.SetAnnotation("on", "experimentalCLI", nil)
-
-	flags.StringVar(&controlOptions.Root, "root", "", "Specify root directory of server to connect for the monitor")
-	flags.SetAnnotation("root", "experimentalCLI", nil)
-	flags.BoolVar(&controlOptions.Detach, "detach", runtime.GOOS == "linux", "Detach buildx server for the monitor (supported only on linux)")
-	flags.SetAnnotation("detach", "experimentalCLI", nil)
-	flags.StringVar(&controlOptions.ServerConfig, "server-config", "", "Specify buildx server config file for the monitor (used only when launching new server)")
-	flags.SetAnnotation("server-config", "experimentalCLI", nil)
-	flags.StringVar(&progressMode, "progress", "auto", `Set type of progress output ("auto", "plain", "tty") for the monitor. Use plain to show container output`)
-
-	for _, c := range children {
-		cmd.AddCommand(c.NewDebugger(&options))
-	}
-
-	return cmd
-}
--- a/commands/diskusage.go
+++ b/commands/diskusage.go
@@ -9,7 +9,6 @@ import (
 	"time"

 	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/opts"
@@ -39,7 +38,7 @@ func runDiskUsage(dockerCli command.Cli, opts duOptions) error {
 		return err
 	}

-	nodes, err := b.LoadNodes(ctx)
+	nodes, err := b.LoadNodes(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -116,7 +115,6 @@ func duCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			options.builder = rootOpts.builder
 			return runDiskUsage(dockerCli, options)
 		},
-		ValidArgsFunction: completion.Disable,
 	}

 	flags := cmd.Flags()
--- a/commands/imagetools/create.go
+++ b/commands/imagetools/create.go
@@ -7,14 +7,12 @@ import (
 	"os"
 	"strings"

-	"github.com/distribution/reference"
 	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/command"
+	"github.com/docker/distribution/reference"
 	"github.com/moby/buildkit/util/appcontext"
-	"github.com/moby/buildkit/util/progress/progressui"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
@@ -26,7 +24,6 @@ type createOptions struct {
 	builder      string
 	files        []string
 	tags         []string
-	annotations  []string
 	dryrun       bool
 	actionAppend bool
 	progress     string
@@ -156,7 +153,7 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 		}
 	}

-	dt, desc, err := r.Combine(ctx, srcs, in.annotations)
+	dt, desc, err := r.Combine(ctx, srcs)
 	if err != nil {
 		return err
 	}
@@ -171,7 +168,7 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {

 	ctx2, cancel := context.WithCancel(context.TODO())
 	defer cancel()
-	printer, err := progress.NewPrinter(ctx2, os.Stderr, progressui.DisplayMode(in.progress))
+	printer, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, in.progress)
 	if err != nil {
 		return err
 	}
@@ -276,7 +273,6 @@ func createCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
 			options.builder = *opts.Builder
 			return runCreate(dockerCli, options, args)
 		},
-		ValidArgsFunction: completion.Disable,
 	}

 	flags := cmd.Flags()
@@ -285,7 +281,6 @@ func createCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
 	flags.BoolVar(&options.dryrun, "dry-run", false, "Show final image instead of pushing")
 	flags.BoolVar(&options.actionAppend, "append", false, "Append to existing manifest")
 	flags.StringVar(&options.progress, "progress", "auto", `Set type of progress output ("auto", "plain", "tty"). Use plain to show container output`)
-	flags.StringArrayVarP(&options.annotations, "annotation", "", []string{}, "Add annotation to the image")

 	return cmd
 }
--- a/commands/imagetools/inspect.go
+++ b/commands/imagetools/inspect.go
@@ -2,7 +2,6 @@ package commands

 import (
 	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/cli-docs-tool/annotation"
 	"github.com/docker/cli/cli"
@@ -53,7 +52,6 @@ func inspectCmd(dockerCli command.Cli, rootOpts RootOptions) *cobra.Command {
 			options.builder = *rootOpts.Builder
 			return runInspect(dockerCli, options, args[0])
 		},
-		ValidArgsFunction: completion.Disable,
 	}

 	flags := cmd.Flags()
--- a/commands/imagetools/root.go
+++ b/commands/imagetools/root.go
@@ -1,7 +1,6 @@
 package commands

 import (
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 )
@@ -12,9 +11,8 @@ type RootOptions struct {

 func RootCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:               "imagetools",
-		Short:             "Commands to work on images in registry",
-		ValidArgsFunction: completion.Disable,
+		Use:   "imagetools",
+		Short: "Commands to work on images in registry",
 	}

 	cmd.AddCommand(
--- a/commands/inspect.go
+++ b/commands/inspect.go
@@ -4,19 +4,14 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"sort"
 	"strings"
 	"text/tabwriter"
 	"time"

 	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/driver"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/util/platformutil"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/debug"
-	"github.com/docker/go-units"
 	"github.com/moby/buildkit/util/appcontext"
 	"github.com/spf13/cobra"
 )
@@ -40,7 +35,7 @@ func runInspect(dockerCli command.Cli, in inspectOptions) error {
 	timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
 	defer cancel()

-	nodes, err := b.LoadNodes(timeoutCtx, builder.WithData())
+	nodes, err := b.LoadNodes(timeoutCtx, true)
 	if in.bootstrap {
 		var ok bool
 		ok, err = b.Boot(ctx)
@@ -48,7 +43,7 @@ func runInspect(dockerCli command.Cli, in inspectOptions) error {
 			return err
 		}
 		if ok {
-			nodes, err = b.LoadNodes(timeoutCtx, builder.WithData())
+			nodes, err = b.LoadNodes(timeoutCtx, true)
 		}
 	}

@@ -93,42 +88,7 @@ func runInspect(dockerCli command.Cli, in inspectOptions) error {
 				if nodes[i].Version != "" {
 					fmt.Fprintf(w, "Buildkit:\t%s\n", nodes[i].Version)
 				}
-				platforms := platformutil.FormatInGroups(n.Node.Platforms, n.Platforms)
-				if len(platforms) > 0 {
-					fmt.Fprintf(w, "Platforms:\t%s\n", strings.Join(platforms, ", "))
-				}
-				if debug.IsEnabled() {
-					fmt.Fprintf(w, "Features:\n")
-					features := nodes[i].Driver.Features(ctx)
-					featKeys := make([]string, 0, len(features))
-					for k := range features {
-						featKeys = append(featKeys, string(k))
-					}
-					sort.Strings(featKeys)
-					for _, k := range featKeys {
-						fmt.Fprintf(w, "\t%s:\t%t\n", k, features[driver.Feature(k)])
-					}
-				}
-				if len(nodes[i].Labels) > 0 {
-					fmt.Fprintf(w, "Labels:\n")
-					for _, k := range sortedKeys(nodes[i].Labels) {
-						v := nodes[i].Labels[k]
-						fmt.Fprintf(w, "\t%s:\t%s\n", k, v)
-					}
-				}
-				for ri, rule := range nodes[i].GCPolicy {
-					fmt.Fprintf(w, "GC Policy rule#%d:\n", ri)
-					fmt.Fprintf(w, "\tAll:\t%v\n", rule.All)
-					if len(rule.Filter) > 0 {
-						fmt.Fprintf(w, "\tFilters:\t%s\n", strings.Join(rule.Filter, " "))
-					}
-					if rule.KeepDuration > 0 {
-						fmt.Fprintf(w, "\tKeep Duration:\t%v\n", rule.KeepDuration.String())
-					}
-					if rule.KeepBytes > 0 {
-						fmt.Fprintf(w, "\tKeep Bytes:\t%s\n", units.BytesSize(float64(rule.KeepBytes)))
-					}
-				}
+				fmt.Fprintf(w, "Platforms:\t%s\n", strings.Join(platformutil.FormatInGroups(n.Node.Platforms, n.Platforms), ", "))
 			}
 		}
 	}
@@ -152,7 +112,6 @@ func inspectCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			}
 			return runInspect(dockerCli, options)
 		},
-		ValidArgsFunction: completion.BuilderNames(dockerCli),
 	}

 	flags := cmd.Flags()
@@ -160,14 +119,3 @@ func inspectCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {

 	return cmd
 }
-
-func sortedKeys(m map[string]string) []string {
-	s := make([]string, len(m))
-	i := 0
-	for k := range m {
-		s[i] = k
-		i++
-	}
-	sort.Strings(s)
-	return s
-}
--- a/commands/install.go
+++ b/commands/install.go
@@ -4,7 +4,6 @@ import (
 	"os"

 	"github.com/docker/buildx/util/cobrautil"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/config"
@@ -47,8 +46,7 @@ func installCmd(dockerCli command.Cli) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runInstall(dockerCli, options)
 		},
-		Hidden:            true,
-		ValidArgsFunction: completion.Disable,
+		Hidden: true,
 	}

 	// hide builder persistent flag for this command
--- a/commands/ls.go
+++ b/commands/ls.go
@@ -11,7 +11,6 @@ import (
 	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/cobrautil"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/util/platformutil"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
@@ -49,7 +48,7 @@ func runLs(dockerCli command.Cli, in lsOptions) error {
 	for _, b := range builders {
 		func(b *builder.Builder) {
 			eg.Go(func() error {
-				_, _ = b.LoadNodes(timeoutCtx, builder.WithData())
+				_, _ = b.LoadNodes(timeoutCtx, true)
 				return nil
 			})
 		}(b)
@@ -127,7 +126,6 @@ func lsCmd(dockerCli command.Cli) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runLs(dockerCli, options)
 		},
-		ValidArgsFunction: completion.Disable,
 	}

 	// hide builder persistent flag for this command
--- a/commands/print.go
+++ b/commands/print.go
@@ -0,0 +1,48 @@
+package commands
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"os"
+
+	"github.com/docker/buildx/build"
+	"github.com/docker/docker/api/types/versions"
+	"github.com/moby/buildkit/frontend/subrequests"
+	"github.com/moby/buildkit/frontend/subrequests/outline"
+	"github.com/moby/buildkit/frontend/subrequests/targets"
+)
+
+func printResult(f *build.PrintFunc, res map[string]string) error {
+	switch f.Name {
+	case "outline":
+		return printValue(outline.PrintOutline, outline.SubrequestsOutlineDefinition.Version, f.Format, res)
+	case "targets":
+		return printValue(targets.PrintTargets, targets.SubrequestsTargetsDefinition.Version, f.Format, res)
+	case "subrequests.describe":
+		return printValue(subrequests.PrintDescribe, subrequests.SubrequestsDescribeDefinition.Version, f.Format, res)
+	default:
+		if dt, ok := res["result.txt"]; ok {
+			fmt.Print(dt)
+		} else {
+			log.Printf("%s %+v", f, res)
+		}
+	}
+	return nil
+}
+
+type printFunc func([]byte, io.Writer) error
+
+func printValue(printer printFunc, version string, format string, res map[string]string) error {
+	if format == "json" {
+		fmt.Fprintln(os.Stdout, res["result.json"])
+		return nil
+	}
+
+	if res["version"] != "" && versions.LessThan(version, res["version"]) && res["result.txt"] != "" {
+		// structure is too new and we don't know how to print it
+		fmt.Fprint(os.Stdout, res["result.txt"])
+		return nil
+	}
+	return printer([]byte(res["result.json"]), os.Stdout)
+}
--- a/commands/prune.go
+++ b/commands/prune.go
@@ -8,7 +8,6 @@ import (
 	"time"

 	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/opts"
@@ -60,7 +59,7 @@ func runPrune(dockerCli command.Cli, opts pruneOptions) error {
 		return err
 	}

-	nodes, err := b.LoadNodes(ctx)
+	nodes, err := b.LoadNodes(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -140,7 +139,6 @@ func pruneCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			options.builder = rootOpts.builder
 			return runPrune(dockerCli, options)
 		},
-		ValidArgsFunction: completion.Disable,
 	}

 	flags := cmd.Flags()
--- a/commands/rm.go
+++ b/commands/rm.go
@@ -8,7 +8,6 @@ import (
 	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/store"
 	"github.com/docker/buildx/store/storeutil"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/appcontext"
@@ -55,7 +54,7 @@ func runRm(dockerCli command.Cli, in rmOptions) error {
 		return err
 	}

-	nodes, err := b.LoadNodes(ctx)
+	nodes, err := b.LoadNodes(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -93,7 +92,6 @@ func rmCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			}
 			return runRm(dockerCli, options)
 		},
-		ValidArgsFunction: completion.BuilderNames(dockerCli),
 	}

 	flags := cmd.Flags()
@@ -139,7 +137,7 @@ func rmAllInactive(ctx context.Context, txn *store.Txn, dockerCli command.Cli, i
 	for _, b := range builders {
 		func(b *builder.Builder) {
 			eg.Go(func() error {
-				nodes, err := b.LoadNodes(timeoutCtx, builder.WithData())
+				nodes, err := b.LoadNodes(timeoutCtx, true)
 				if err != nil {
 					return errors.Wrapf(err, "cannot load %s", b.Name)
 				}
--- a/commands/root.go
+++ b/commands/root.go
@@ -3,16 +3,12 @@ package commands
 import (
 	"os"

-	debugcmd "github.com/docker/buildx/commands/debug"
 	imagetoolscmd "github.com/docker/buildx/commands/imagetools"
-	"github.com/docker/buildx/controller/remote"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/util/logutil"
 	"github.com/docker/cli-docs-tool/annotation"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli-plugins/plugin"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/debug"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -26,9 +22,6 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
 		Annotations: map[string]string{
 			annotation.CodeDelimiter: `"`,
 		},
-		CompletionOptions: cobra.CompletionOptions{
-			HiddenDefaultCmd: true,
-		},
 	}
 	if isPlugin {
 		cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
@@ -42,11 +35,6 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
 		cmd.TraverseChildren = true
 		cmd.DisableFlagsInUseLine = true
 		cli.DisableFlagsInUseLine(cmd)
-
-		// DEBUG=1 should perform the same as --debug at the docker root level
-		if debug.IsEnabled() {
-			debug.Enable()
-		}
 	}

 	logrus.SetFormatter(&logutil.Formatter{})
@@ -59,6 +47,17 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
 		"using default config store",
 	))

+	// filter out useless commandConn.CloseWrite warning message that can occur
+	// when listing builder instances with "buildx ls" for those that are
+	// unreachable: "commandConn.CloseWrite: commandconn: failed to wait: signal: killed"
+	// https://github.com/docker/cli/blob/3fb4fb83dfb5db0c0753a8316f21aea54dab32c5/cli/connhelper/commandconn/commandconn.go#L203-L214
+	logrus.AddHook(logutil.NewFilter([]logrus.Level{
+		logrus.WarnLevel,
+	},
+		"commandConn.CloseWrite:",
+		"commandConn.CloseRead:",
+	))
+
 	addCommands(cmd, dockerCli)
 	return cmd
 }
@@ -72,7 +71,7 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 	rootFlags(opts, cmd.PersistentFlags())

 	cmd.AddCommand(
-		buildCmd(dockerCli, opts, nil),
+		buildCmd(dockerCli, opts),
 		bakeCmd(dockerCli, opts),
 		createCmd(dockerCli),
 		rmCmd(dockerCli, opts),
@@ -87,17 +86,6 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		duCmd(dockerCli, opts),
 		imagetoolscmd.RootCmd(dockerCli, imagetoolscmd.RootOptions{Builder: &opts.builder}),
 	)
-	if isExperimental() {
-		cmd.AddCommand(debugcmd.RootCmd(dockerCli,
-			newDebuggableBuild(dockerCli, opts),
-		))
-		remote.AddControllerCommands(cmd, dockerCli)
-	}
-
-	cmd.RegisterFlagCompletionFunc( //nolint:errcheck
-		"builder",
-		completion.BuilderNames(dockerCli),
-	)
 }

 func rootFlags(options *rootOptions, flags *pflag.FlagSet) {
--- a/commands/stop.go
+++ b/commands/stop.go
@@ -4,7 +4,6 @@ import (
 	"context"

 	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/appcontext"
@@ -25,7 +24,7 @@ func runStop(dockerCli command.Cli, in stopOptions) error {
 	if err != nil {
 		return err
 	}
-	nodes, err := b.LoadNodes(ctx)
+	nodes, err := b.LoadNodes(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -47,7 +46,6 @@ func stopCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			}
 			return runStop(dockerCli, options)
 		},
-		ValidArgsFunction: completion.BuilderNames(dockerCli),
 	}

 	return cmd
--- a/commands/uninstall.go
+++ b/commands/uninstall.go
@@ -4,7 +4,6 @@ import (
 	"os"

 	"github.com/docker/buildx/util/cobrautil"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/config"
@@ -53,8 +52,7 @@ func uninstallCmd(dockerCli command.Cli) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runUninstall(dockerCli, options)
 		},
-		Hidden:            true,
-		ValidArgsFunction: completion.Disable,
+		Hidden: true,
 	}

 	// hide builder persistent flag for this command
--- a/commands/use.go
+++ b/commands/use.go
@@ -4,7 +4,6 @@ import (
 	"os"

 	"github.com/docker/buildx/store/storeutil"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
@@ -35,7 +34,10 @@ func runUse(dockerCli command.Cli, in useOptions) error {
 				if err != nil {
 					return err
 				}
-				return txn.SetCurrent(ep, "", false, false)
+				if err := txn.SetCurrent(ep, "", false, false); err != nil {
+					return err
+				}
+				return nil
 			}
 			list, err := dockerCli.ContextStore().List()
 			if err != nil {
@@ -55,7 +57,11 @@ func runUse(dockerCli command.Cli, in useOptions) error {
 	if err != nil {
 		return err
 	}
-	return txn.SetCurrent(ep, in.builder, in.isGlobal, in.isDefault)
+	if err := txn.SetCurrent(ep, in.builder, in.isGlobal, in.isDefault); err != nil {
+		return err
+	}
+
+	return nil
 }

 func useCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
@@ -72,7 +78,6 @@ func useCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			}
 			return runUse(dockerCli, options)
 		},
-		ValidArgsFunction: completion.BuilderNames(dockerCli),
 	}

 	flags := cmd.Flags()
--- a/commands/version.go
+++ b/commands/version.go
@@ -4,7 +4,6 @@ import (
 	"fmt"

 	"github.com/docker/buildx/util/cobrautil"
-	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/version"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
@@ -24,7 +23,6 @@ func versionCmd(dockerCli command.Cli) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runVersion(dockerCli)
 		},
-		ValidArgsFunction: completion.Disable,
 	}

 	// hide builder persistent flag for this command
--- a/controller/build/build.go
+++ b/controller/build/build.go
@@ -1,280 +0,0 @@
-package build
-
-import (
-	"context"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-
-	"github.com/docker/buildx/build"
-	"github.com/docker/buildx/builder"
-	controllerapi "github.com/docker/buildx/controller/pb"
-	"github.com/docker/buildx/store"
-	"github.com/docker/buildx/store/storeutil"
-	"github.com/docker/buildx/util/buildflags"
-	"github.com/docker/buildx/util/confutil"
-	"github.com/docker/buildx/util/dockerutil"
-	"github.com/docker/buildx/util/platformutil"
-	"github.com/docker/buildx/util/progress"
-	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/config"
-	dockeropts "github.com/docker/cli/opts"
-	"github.com/docker/go-units"
-	"github.com/moby/buildkit/client"
-	"github.com/moby/buildkit/session/auth/authprovider"
-	"github.com/moby/buildkit/util/grpcerrors"
-	"github.com/pkg/errors"
-	"google.golang.org/grpc/codes"
-)
-
-const defaultTargetName = "default"
-
-// RunBuild runs the specified build and returns the result.
-//
-// NOTE: When an error happens during the build and this function acquires the debuggable *build.ResultHandle,
-// this function returns it in addition to the error (i.e. it does "return nil, res, err"). The caller can
-// inspect the result and debug the cause of that error.
-func RunBuild(ctx context.Context, dockerCli command.Cli, in controllerapi.BuildOptions, inStream io.Reader, progress progress.Writer, generateResult bool) (*client.SolveResponse, *build.ResultHandle, error) {
-	if in.NoCache && len(in.NoCacheFilter) > 0 {
-		return nil, nil, errors.Errorf("--no-cache and --no-cache-filter cannot currently be used together")
-	}
-
-	contexts := map[string]build.NamedContext{}
-	for name, path := range in.NamedContexts {
-		contexts[name] = build.NamedContext{Path: path}
-	}
-
-	opts := build.Options{
-		Inputs: build.Inputs{
-			ContextPath:    in.ContextPath,
-			DockerfilePath: in.DockerfileName,
-			InStream:       inStream,
-			NamedContexts:  contexts,
-		},
-		Ref:           in.Ref,
-		BuildArgs:     in.BuildArgs,
-		CgroupParent:  in.CgroupParent,
-		ExtraHosts:    in.ExtraHosts,
-		Labels:        in.Labels,
-		NetworkMode:   in.NetworkMode,
-		NoCache:       in.NoCache,
-		NoCacheFilter: in.NoCacheFilter,
-		Pull:          in.Pull,
-		ShmSize:       dockeropts.MemBytes(in.ShmSize),
-		Tags:          in.Tags,
-		Target:        in.Target,
-		Ulimits:       controllerUlimitOpt2DockerUlimit(in.Ulimits),
-		GroupRef:      in.GroupRef,
-	}
-
-	platforms, err := platformutil.Parse(in.Platforms)
-	if err != nil {
-		return nil, nil, err
-	}
-	opts.Platforms = platforms
-
-	dockerConfig := config.LoadDefaultConfigFile(os.Stderr)
-	opts.Session = append(opts.Session, authprovider.NewDockerAuthProvider(dockerConfig, nil))
-
-	secrets, err := controllerapi.CreateSecrets(in.Secrets)
-	if err != nil {
-		return nil, nil, err
-	}
-	opts.Session = append(opts.Session, secrets)
-
-	sshSpecs := in.SSH
-	if len(sshSpecs) == 0 && buildflags.IsGitSSH(in.ContextPath) {
-		sshSpecs = append(sshSpecs, &controllerapi.SSH{ID: "default"})
-	}
-	ssh, err := controllerapi.CreateSSH(sshSpecs)
-	if err != nil {
-		return nil, nil, err
-	}
-	opts.Session = append(opts.Session, ssh)
-
-	outputs, err := controllerapi.CreateExports(in.Exports)
-	if err != nil {
-		return nil, nil, err
-	}
-	if in.ExportPush {
-		if in.ExportLoad {
-			return nil, nil, errors.Errorf("push and load may not be set together at the moment")
-		}
-		if len(outputs) == 0 {
-			outputs = []client.ExportEntry{{
-				Type: "image",
-				Attrs: map[string]string{
-					"push": "true",
-				},
-			}}
-		} else {
-			switch outputs[0].Type {
-			case "image":
-				outputs[0].Attrs["push"] = "true"
-			default:
-				return nil, nil, errors.Errorf("push and %q output can't be used together", outputs[0].Type)
-			}
-		}
-	}
-	if in.ExportLoad {
-		if len(outputs) == 0 {
-			outputs = []client.ExportEntry{{
-				Type:  "docker",
-				Attrs: map[string]string{},
-			}}
-		} else {
-			switch outputs[0].Type {
-			case "docker":
-			default:
-				return nil, nil, errors.Errorf("load and %q output can't be used together", outputs[0].Type)
-			}
-		}
-	}
-
-	annotations, err := buildflags.ParseAnnotations(in.Annotations)
-	if err != nil {
-		return nil, nil, err
-	}
-	for _, o := range outputs {
-		for k, v := range annotations {
-			o.Attrs[k.String()] = v
-		}
-	}
-
-	opts.Exports = outputs
-
-	opts.CacheFrom = controllerapi.CreateCaches(in.CacheFrom)
-	opts.CacheTo = controllerapi.CreateCaches(in.CacheTo)
-
-	opts.Attests = controllerapi.CreateAttestations(in.Attests)
-
-	opts.SourcePolicy = in.SourcePolicy
-
-	allow, err := buildflags.ParseEntitlements(in.Allow)
-	if err != nil {
-		return nil, nil, err
-	}
-	opts.Allow = allow
-
-	if in.PrintFunc != nil {
-		opts.PrintFunc = &build.PrintFunc{
-			Name:   in.PrintFunc.Name,
-			Format: in.PrintFunc.Format,
-		}
-	}
-
-	// key string used for kubernetes "sticky" mode
-	contextPathHash, err := filepath.Abs(in.ContextPath)
-	if err != nil {
-		contextPathHash = in.ContextPath
-	}
-
-	// TODO: this should not be loaded this side of the controller api
-	b, err := builder.New(dockerCli,
-		builder.WithName(in.Builder),
-		builder.WithContextPathHash(contextPathHash),
-	)
-	if err != nil {
-		return nil, nil, err
-	}
-	if err = updateLastActivity(dockerCli, b.NodeGroup); err != nil {
-		return nil, nil, errors.Wrapf(err, "failed to update builder last activity time")
-	}
-	nodes, err := b.LoadNodes(ctx)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	resp, res, err := buildTargets(ctx, dockerCli, b.NodeGroup, nodes, map[string]build.Options{defaultTargetName: opts}, progress, generateResult)
-	err = wrapBuildError(err, false)
-	if err != nil {
-		// NOTE: buildTargets can return *build.ResultHandle even on error.
-		return nil, res, err
-	}
-	return resp, res, nil
-}
-
-// buildTargets runs the specified build and returns the result.
-//
-// NOTE: When an error happens during the build and this function acquires the debuggable *build.ResultHandle,
-// this function returns it in addition to the error (i.e. it does "return nil, res, err"). The caller can
-// inspect the result and debug the cause of that error.
-func buildTargets(ctx context.Context, dockerCli command.Cli, ng *store.NodeGroup, nodes []builder.Node, opts map[string]build.Options, progress progress.Writer, generateResult bool) (*client.SolveResponse, *build.ResultHandle, error) {
-	var res *build.ResultHandle
-	var resp map[string]*client.SolveResponse
-	var err error
-	if generateResult {
-		var mu sync.Mutex
-		var idx int
-		resp, err = build.BuildWithResultHandler(ctx, nodes, opts, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), progress, func(driverIndex int, gotRes *build.ResultHandle) {
-			mu.Lock()
-			defer mu.Unlock()
-			if res == nil || driverIndex < idx {
-				idx, res = driverIndex, gotRes
-			}
-		})
-	} else {
-		resp, err = build.Build(ctx, nodes, opts, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), progress)
-	}
-	if err != nil {
-		return nil, res, err
-	}
-	return resp[defaultTargetName], res, err
-}
-
-func wrapBuildError(err error, bake bool) error {
-	if err == nil {
-		return nil
-	}
-	st, ok := grpcerrors.AsGRPCStatus(err)
-	if ok {
-		if st.Code() == codes.Unimplemented && strings.Contains(st.Message(), "unsupported frontend capability moby.buildkit.frontend.contexts") {
-			msg := "current frontend does not support --build-context."
-			if bake {
-				msg = "current frontend does not support defining additional contexts for targets."
-			}
-			msg += " Named contexts are supported since Dockerfile v1.4. Use #syntax directive in Dockerfile or update to latest BuildKit."
-			return &wrapped{err, msg}
-		}
-	}
-	return err
-}
-
-type wrapped struct {
-	err error
-	msg string
-}
-
-func (w *wrapped) Error() string {
-	return w.msg
-}
-
-func (w *wrapped) Unwrap() error {
-	return w.err
-}
-
-func updateLastActivity(dockerCli command.Cli, ng *store.NodeGroup) error {
-	txn, release, err := storeutil.GetStore(dockerCli)
-	if err != nil {
-		return err
-	}
-	defer release()
-	return txn.UpdateLastActivity(ng)
-}
-
-func controllerUlimitOpt2DockerUlimit(u *controllerapi.UlimitOpt) *dockeropts.UlimitOpt {
-	if u == nil {
-		return nil
-	}
-	values := make(map[string]*units.Ulimit)
-	for k, v := range u.Values {
-		values[k] = &units.Ulimit{
-			Name: v.Name,
-			Hard: v.Hard,
-			Soft: v.Soft,
-		}
-	}
-	return dockeropts.NewUlimitOpt(&values)
-}
--- a/controller/control/controller.go
+++ b/controller/control/controller.go
@@ -1,32 +0,0 @@
-package control
-
-import (
-	"context"
-	"io"
-
-	controllerapi "github.com/docker/buildx/controller/pb"
-	"github.com/docker/buildx/util/progress"
-	"github.com/moby/buildkit/client"
-)
-
-type BuildxController interface {
-	Build(ctx context.Context, options controllerapi.BuildOptions, in io.ReadCloser, progress progress.Writer) (ref string, resp *client.SolveResponse, err error)
-	// Invoke starts an IO session into the specified process.
-	// If pid doesn't matche to any running processes, it starts a new process with the specified config.
-	// If there is no container running or InvokeConfig.Rollback is speicfied, the process will start in a newly created container.
-	// NOTE: If needed, in the future, we can split this API into three APIs (NewContainer, NewProcess and Attach).
-	Invoke(ctx context.Context, ref, pid string, options controllerapi.InvokeConfig, ioIn io.ReadCloser, ioOut io.WriteCloser, ioErr io.WriteCloser) error
-	Kill(ctx context.Context) error
-	Close() error
-	List(ctx context.Context) (refs []string, _ error)
-	Disconnect(ctx context.Context, ref string) error
-	ListProcesses(ctx context.Context, ref string) (infos []*controllerapi.ProcessInfo, retErr error)
-	DisconnectProcess(ctx context.Context, ref, pid string) error
-	Inspect(ctx context.Context, ref string) (*controllerapi.InspectResponse, error)
-}
-
-type ControlOptions struct {
-	ServerConfig string
-	Root         string
-	Detach       bool
-}
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -1,36 +0,0 @@
-package controller
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/docker/buildx/controller/control"
-	"github.com/docker/buildx/controller/local"
-	"github.com/docker/buildx/controller/remote"
-	"github.com/docker/buildx/util/progress"
-	"github.com/docker/cli/cli/command"
-	"github.com/pkg/errors"
-)
-
-func NewController(ctx context.Context, opts control.ControlOptions, dockerCli command.Cli, pw progress.Writer) (control.BuildxController, error) {
-	var name string
-	if opts.Detach {
-		name = "remote"
-	} else {
-		name = "local"
-	}
-
-	var c control.BuildxController
-	err := progress.Wrap(fmt.Sprintf("[internal] connecting to %s controller", name), pw.Write, func(l progress.SubLogger) (err error) {
-		if opts.Detach {
-			c, err = remote.NewRemoteBuildxController(ctx, dockerCli, opts, l)
-		} else {
-			c = local.NewLocalBuildxController(ctx, dockerCli, l)
-		}
-		return err
-	})
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to start buildx controller")
-	}
-	return c, nil
-}
--- a/controller/errdefs/build.go
+++ b/controller/errdefs/build.go
@@ -1,34 +0,0 @@
-package errdefs
-
-import (
-	"github.com/containerd/typeurl/v2"
-	"github.com/moby/buildkit/util/grpcerrors"
-)
-
-func init() {
-	typeurl.Register((*Build)(nil), "github.com/docker/buildx", "errdefs.Build+json")
-}
-
-type BuildError struct {
-	Build
-	error
-}
-
-func (e *BuildError) Unwrap() error {
-	return e.error
-}
-
-func (e *BuildError) ToProto() grpcerrors.TypedErrorProto {
-	return &e.Build
-}
-
-func WrapBuild(err error, ref string) error {
-	if err == nil {
-		return nil
-	}
-	return &BuildError{Build: Build{Ref: ref}, error: err}
-}
-
-func (b *Build) WrapError(err error) error {
-	return &BuildError{error: err, Build: *b}
-}
--- a/controller/errdefs/errdefs.pb.go
+++ b/controller/errdefs/errdefs.pb.go
@@ -1,77 +0,0 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: errdefs.proto
-
-package errdefs
-
-import (
-	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
-	_ "github.com/moby/buildkit/solver/pb"
-	math "math"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
-
-type Build struct {
-	Ref                  string   `protobuf:"bytes,1,opt,name=Ref,proto3" json:"Ref,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Build) Reset()         { *m = Build{} }
-func (m *Build) String() string { return proto.CompactTextString(m) }
-func (*Build) ProtoMessage()    {}
-func (*Build) Descriptor() ([]byte, []int) {
-	return fileDescriptor_689dc58a5060aff5, []int{0}
-}
-func (m *Build) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Build.Unmarshal(m, b)
-}
-func (m *Build) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Build.Marshal(b, m, deterministic)
-}
-func (m *Build) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Build.Merge(m, src)
-}
-func (m *Build) XXX_Size() int {
-	return xxx_messageInfo_Build.Size(m)
-}
-func (m *Build) XXX_DiscardUnknown() {
-	xxx_messageInfo_Build.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Build proto.InternalMessageInfo
-
-func (m *Build) GetRef() string {
-	if m != nil {
-		return m.Ref
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*Build)(nil), "errdefs.Build")
-}
-
-func init() { proto.RegisterFile("errdefs.proto", fileDescriptor_689dc58a5060aff5) }
-
-var fileDescriptor_689dc58a5060aff5 = []byte{
-	// 111 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4d, 0x2d, 0x2a, 0x4a,
-	0x49, 0x4d, 0x2b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x72, 0xa5, 0x74, 0xd2,
-	0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x73, 0xf3, 0x93, 0x2a, 0xf5, 0x93,
-	0x4a, 0x33, 0x73, 0x52, 0xb2, 0x33, 0x4b, 0xf4, 0x8b, 0xf3, 0x73, 0xca, 0x52, 0x8b, 0xf4, 0x0b,
-	0x92, 0xf4, 0xf3, 0x0b, 0xa0, 0xda, 0x94, 0x24, 0xb9, 0x58, 0x9d, 0x40, 0xf2, 0x42, 0x02, 0x5c,
-	0xcc, 0x41, 0xa9, 0x69, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x20, 0x66, 0x12, 0x1b, 0x58,
-	0x85, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x56, 0x52, 0x41, 0x91, 0x69, 0x00, 0x00, 0x00,
-}
--- a/controller/errdefs/errdefs.proto
+++ b/controller/errdefs/errdefs.proto
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package errdefs;
-
-import "github.com/moby/buildkit/solver/pb/ops.proto";
-
-message Build {
-  string Ref = 1;
-}
--- a/controller/errdefs/generate.go
+++ b/controller/errdefs/generate.go
@@ -1,3 +0,0 @@
-package errdefs
-
-//go:generate protoc -I=. -I=../../vendor/ --gogo_out=plugins=grpc:. errdefs.proto
--- a/controller/local/controller.go
+++ b/controller/local/controller.go
@@ -1,146 +0,0 @@
-package local
-
-import (
-	"context"
-	"io"
-	"sync/atomic"
-
-	"github.com/docker/buildx/build"
-	cbuild "github.com/docker/buildx/controller/build"
-	"github.com/docker/buildx/controller/control"
-	controllererrors "github.com/docker/buildx/controller/errdefs"
-	controllerapi "github.com/docker/buildx/controller/pb"
-	"github.com/docker/buildx/controller/processes"
-	"github.com/docker/buildx/util/ioset"
-	"github.com/docker/buildx/util/progress"
-	"github.com/docker/cli/cli/command"
-	"github.com/moby/buildkit/client"
-	"github.com/pkg/errors"
-)
-
-func NewLocalBuildxController(ctx context.Context, dockerCli command.Cli, logger progress.SubLogger) control.BuildxController {
-	return &localController{
-		dockerCli: dockerCli,
-		ref:       "local",
-		processes: processes.NewManager(),
-	}
-}
-
-type buildConfig struct {
-	// TODO: these two structs should be merged
-	// Discussion: https://github.com/docker/buildx/pull/1640#discussion_r1113279719
-	resultCtx    *build.ResultHandle
-	buildOptions *controllerapi.BuildOptions
-}
-
-type localController struct {
-	dockerCli   command.Cli
-	ref         string
-	buildConfig buildConfig
-	processes   *processes.Manager
-
-	buildOnGoing atomic.Bool
-}
-
-func (b *localController) Build(ctx context.Context, options controllerapi.BuildOptions, in io.ReadCloser, progress progress.Writer) (string, *client.SolveResponse, error) {
-	if !b.buildOnGoing.CompareAndSwap(false, true) {
-		return "", nil, errors.New("build ongoing")
-	}
-	defer b.buildOnGoing.Store(false)
-
-	resp, res, buildErr := cbuild.RunBuild(ctx, b.dockerCli, options, in, progress, true)
-	// NOTE: RunBuild can return *build.ResultHandle even on error.
-	if res != nil {
-		b.buildConfig = buildConfig{
-			resultCtx:    res,
-			buildOptions: &options,
-		}
-		if buildErr != nil {
-			buildErr = controllererrors.WrapBuild(buildErr, b.ref)
-		}
-	}
-	if buildErr != nil {
-		return "", nil, buildErr
-	}
-	return b.ref, resp, nil
-}
-
-func (b *localController) ListProcesses(ctx context.Context, ref string) (infos []*controllerapi.ProcessInfo, retErr error) {
-	if ref != b.ref {
-		return nil, errors.Errorf("unknown ref %q", ref)
-	}
-	return b.processes.ListProcesses(), nil
-}
-
-func (b *localController) DisconnectProcess(ctx context.Context, ref, pid string) error {
-	if ref != b.ref {
-		return errors.Errorf("unknown ref %q", ref)
-	}
-	return b.processes.DeleteProcess(pid)
-}
-
-func (b *localController) cancelRunningProcesses() {
-	b.processes.CancelRunningProcesses()
-}
-
-func (b *localController) Invoke(ctx context.Context, ref string, pid string, cfg controllerapi.InvokeConfig, ioIn io.ReadCloser, ioOut io.WriteCloser, ioErr io.WriteCloser) error {
-	if ref != b.ref {
-		return errors.Errorf("unknown ref %q", ref)
-	}
-
-	proc, ok := b.processes.Get(pid)
-	if !ok {
-		// Start a new process.
-		if b.buildConfig.resultCtx == nil {
-			return errors.New("no build result is registered")
-		}
-		var err error
-		proc, err = b.processes.StartProcess(pid, b.buildConfig.resultCtx, &cfg)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Attach containerIn to this process
-	ioCancelledCh := make(chan struct{})
-	proc.ForwardIO(&ioset.In{Stdin: ioIn, Stdout: ioOut, Stderr: ioErr}, func() { close(ioCancelledCh) })
-
-	select {
-	case <-ioCancelledCh:
-		return errors.Errorf("io cancelled")
-	case err := <-proc.Done():
-		return err
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-}
-
-func (b *localController) Kill(context.Context) error {
-	b.Close()
-	return nil
-}
-
-func (b *localController) Close() error {
-	b.cancelRunningProcesses()
-	if b.buildConfig.resultCtx != nil {
-		b.buildConfig.resultCtx.Done()
-	}
-	// TODO: cancel ongoing builds?
-	return nil
-}
-
-func (b *localController) List(ctx context.Context) (res []string, _ error) {
-	return []string{b.ref}, nil
-}
-
-func (b *localController) Disconnect(ctx context.Context, key string) error {
-	b.Close()
-	return nil
-}
-
-func (b *localController) Inspect(ctx context.Context, ref string) (*controllerapi.InspectResponse, error) {
-	if ref != b.ref {
-		return nil, errors.Errorf("unknown ref %q", ref)
-	}
-	return &controllerapi.InspectResponse{Options: b.buildConfig.buildOptions}, nil
-}
--- a/controller/pb/attest.go
+++ b/controller/pb/attest.go
@@ -1,20 +0,0 @@
-package pb
-
-func CreateAttestations(attests []*Attest) map[string]*string {
-	result := map[string]*string{}
-	for _, attest := range attests {
-		// ignore duplicates
-		if _, ok := result[attest.Type]; ok {
-			continue
-		}
-
-		if attest.Disabled {
-			result[attest.Type] = nil
-			continue
-		}
-
-		attrs := attest.Attrs
-		result[attest.Type] = &attrs
-	}
-	return result
-}
--- a/controller/pb/cache.go
+++ b/controller/pb/cache.go
@@ -1,21 +0,0 @@
-package pb
-
-import "github.com/moby/buildkit/client"
-
-func CreateCaches(entries []*CacheOptionsEntry) []client.CacheOptionsEntry {
-	var outs []client.CacheOptionsEntry
-	if len(entries) == 0 {
-		return nil
-	}
-	for _, entry := range entries {
-		out := client.CacheOptionsEntry{
-			Type:  entry.Type,
-			Attrs: map[string]string{},
-		}
-		for k, v := range entry.Attrs {
-			out.Attrs[k] = v
-		}
-		outs = append(outs, out)
-	}
-	return outs
-}
--- a/controller/pb/controller.pb.go
+++ b/controller/pb/controller.pb.go
--- a/controller/pb/controller.proto
+++ b/controller/pb/controller.proto
@@ -1,248 +0,0 @@
-syntax = "proto3";
-
-package buildx.controller.v1;
-
-import "github.com/moby/buildkit/api/services/control/control.proto";
-import "github.com/moby/buildkit/sourcepolicy/pb/policy.proto";
-
-option go_package = "pb";
-
-service Controller {
-  rpc Build(BuildRequest) returns (BuildResponse);
-  rpc Inspect(InspectRequest) returns (InspectResponse);
-  rpc Status(StatusRequest) returns (stream StatusResponse);
-  rpc Input(stream InputMessage) returns (InputResponse);
-  rpc Invoke(stream Message) returns (stream Message);
-  rpc List(ListRequest) returns (ListResponse);
-  rpc Disconnect(DisconnectRequest) returns (DisconnectResponse);
-  rpc Info(InfoRequest) returns (InfoResponse);
-  rpc ListProcesses(ListProcessesRequest) returns (ListProcessesResponse);
-  rpc DisconnectProcess(DisconnectProcessRequest) returns (DisconnectProcessResponse);
-}
-
-message ListProcessesRequest {
-  string Ref = 1;
-}
-
-message ListProcessesResponse {
-  repeated ProcessInfo Infos = 1;
-}
-
-message ProcessInfo {
-  string ProcessID = 1;
-  InvokeConfig InvokeConfig = 2;
-}
-
-message DisconnectProcessRequest {
-  string Ref = 1;
-  string ProcessID = 2;
-}
-
-message DisconnectProcessResponse {
-}
-
-message BuildRequest {
-  string Ref = 1;
-  BuildOptions Options = 2;
-}
-
-message BuildOptions {
-  string ContextPath = 1;
-  string DockerfileName = 2;
-  PrintFunc PrintFunc = 3;
-  map<string, string> NamedContexts = 4;
-
-  repeated string Allow = 5;
-  repeated Attest Attests = 6;
-  map<string, string> BuildArgs = 7;
-  repeated CacheOptionsEntry CacheFrom = 8;
-  repeated CacheOptionsEntry CacheTo = 9;
-  string CgroupParent = 10;
-  repeated ExportEntry Exports = 11;
-  repeated string ExtraHosts = 12;
-  map<string, string> Labels = 13;
-  string NetworkMode = 14;
-  repeated string NoCacheFilter = 15;
-  repeated string Platforms = 16;
-  repeated Secret Secrets = 17;
-  int64 ShmSize = 18;
-  repeated SSH SSH = 19;
-  repeated string Tags = 20;
-  string Target = 21;
-  UlimitOpt Ulimits = 22;
-
-  string Builder = 23;
-  bool NoCache = 24;
-  bool Pull = 25;
-  bool ExportPush = 26;
-  bool ExportLoad = 27;
-  moby.buildkit.v1.sourcepolicy.Policy SourcePolicy = 28;
-  string Ref = 29;
-  string GroupRef = 30;
-  repeated string Annotations = 31;
-}
-
-message ExportEntry {
-  string Type = 1;
-  map<string, string> Attrs = 2;
-  string Destination = 3;
-}
-
-message CacheOptionsEntry {
-  string Type = 1;
-  map<string, string> Attrs = 2;
-}
-
-message Attest {
-  string Type = 1;
-  bool Disabled = 2;
-  string Attrs = 3;
-}
-
-message SSH {
-  string ID = 1;
-  repeated string Paths = 2;
-}
-
-message Secret {
-  string ID = 1;
-  string FilePath = 2;
-  string Env = 3;
-}
-
-message PrintFunc {
-	string Name = 1;
-	string Format = 2;
-}
-
-message InspectRequest {
-  string Ref = 1;
-}
-
-message InspectResponse {
-  BuildOptions Options = 1;
-}
-
-message UlimitOpt {
-  map<string, Ulimit> values = 1;
-}
-
-message Ulimit {
-  string Name = 1;
-  int64 Hard = 2;
-  int64 Soft = 3;
-}
-
-message BuildResponse {
-	map<string, string> ExporterResponse = 1;
-}
-
-message DisconnectRequest {
-  string Ref = 1;
-}
-
-message DisconnectResponse {}
-
-message ListRequest {
-  string Ref = 1;
-}
-
-message ListResponse {
-  repeated string keys = 1;
-}
-
-message InputMessage {
-  oneof Input {
-    InputInitMessage Init = 1;
-    DataMessage Data = 2;
-  }
-}
-
-message InputInitMessage {
-  string Ref = 1;
-}
-
-message DataMessage {
-  bool EOF = 1;    // true if eof was reached
-  bytes Data = 2;  // should be chunked smaller than 4MB:
-                   // https://pkg.go.dev/google.golang.org/grpc#MaxRecvMsgSize
-}
-
-message InputResponse {}
-
-message Message {
-  oneof Input {
-    InitMessage Init = 1;
-    // FdMessage used from client to server for input (stdin) and
-    // from server to client for output (stdout, stderr)
-    FdMessage File = 2;
-    // ResizeMessage used from client to server for terminal resize events
-    ResizeMessage Resize = 3;
-    // SignalMessage is used from client to server to send signal events
-    SignalMessage Signal = 4;
-  }
-}
-
-message InitMessage {
-  string Ref = 1;
-
-  // If ProcessID already exists in the server, it tries to connect to it
-  // instead of invoking the new one. In this case, InvokeConfig will be ignored.
-  string ProcessID = 2;
-  InvokeConfig InvokeConfig = 3;
-}
-
-message InvokeConfig {
-  repeated string Entrypoint = 1;
-  repeated string Cmd = 2;
-  bool NoCmd = 11; // Do not set cmd but use the image's default
-  repeated string Env = 3;
-  string User = 4;
-  bool NoUser = 5; // Do not set user but use the image's default
-  string Cwd = 6;
-  bool NoCwd = 7; // Do not set cwd but use the image's default
-  bool Tty = 8;
-  bool Rollback = 9; // Kill all process in the container and recreate it.
-  bool Initial = 10; // Run container from the initial state of that stage (supported only on the failed step)
-}
-
-message FdMessage {
-  uint32 Fd = 1;   // what fd the data was from
-  bool EOF = 2;    // true if eof was reached
-  bytes Data = 3;  // should be chunked smaller than 4MB:
-                   // https://pkg.go.dev/google.golang.org/grpc#MaxRecvMsgSize
-}
-
-message ResizeMessage {
-  uint32 Rows = 1;
-  uint32 Cols = 2;
-}
-
-message SignalMessage {
-  // we only send name (ie HUP, INT) because the int values
-  // are platform dependent.
-  string Name = 1;
-}
-
-message StatusRequest {
-  string Ref = 1;
-}
-
-message StatusResponse {
-  repeated moby.buildkit.v1.Vertex vertexes = 1;
-  repeated moby.buildkit.v1.VertexStatus statuses = 2;
-  repeated moby.buildkit.v1.VertexLog logs = 3;
-  repeated moby.buildkit.v1.VertexWarning warnings = 4;
-}
-
-message InfoRequest {}
-
-message InfoResponse {
-  BuildxVersion buildxVersion = 1;
-}
-
-message BuildxVersion {
-  string package = 1;
-  string version = 2;
-  string revision = 3;
-}
--- a/controller/pb/generate.go
+++ b/controller/pb/generate.go
@@ -1,3 +0,0 @@
-package pb
-
-//go:generate protoc -I=. -I=../../vendor/ --gogo_out=plugins=grpc:. controller.proto
--- a/controller/pb/path.go
+++ b/controller/pb/path.go
@@ -1,175 +0,0 @@
-package pb
-
-import (
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/builder/remotecontext/urlutil"
-	"github.com/moby/buildkit/util/gitutil"
-)
-
-// ResolveOptionPaths resolves all paths contained in BuildOptions
-// and replaces them to absolute paths.
-func ResolveOptionPaths(options *BuildOptions) (_ *BuildOptions, err error) {
-	localContext := false
-	if options.ContextPath != "" && options.ContextPath != "-" {
-		if !isRemoteURL(options.ContextPath) {
-			localContext = true
-			options.ContextPath, err = filepath.Abs(options.ContextPath)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-	if options.DockerfileName != "" && options.DockerfileName != "-" {
-		if localContext && !urlutil.IsURL(options.DockerfileName) {
-			options.DockerfileName, err = filepath.Abs(options.DockerfileName)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	var contexts map[string]string
-	for k, v := range options.NamedContexts {
-		if isRemoteURL(v) || strings.HasPrefix(v, "docker-image://") {
-			// url prefix, this is a remote path
-		} else if strings.HasPrefix(v, "oci-layout://") {
-			// oci layout prefix, this is a local path
-			p := strings.TrimPrefix(v, "oci-layout://")
-			p, err = filepath.Abs(p)
-			if err != nil {
-				return nil, err
-			}
-			v = "oci-layout://" + p
-		} else {
-			// no prefix, assume local path
-			v, err = filepath.Abs(v)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		if contexts == nil {
-			contexts = make(map[string]string)
-		}
-		contexts[k] = v
-	}
-	options.NamedContexts = contexts
-
-	var cacheFrom []*CacheOptionsEntry
-	for _, co := range options.CacheFrom {
-		switch co.Type {
-		case "local":
-			var attrs map[string]string
-			for k, v := range co.Attrs {
-				if attrs == nil {
-					attrs = make(map[string]string)
-				}
-				switch k {
-				case "src":
-					p := v
-					if p != "" {
-						p, err = filepath.Abs(p)
-						if err != nil {
-							return nil, err
-						}
-					}
-					attrs[k] = p
-				default:
-					attrs[k] = v
-				}
-			}
-			co.Attrs = attrs
-			cacheFrom = append(cacheFrom, co)
-		default:
-			cacheFrom = append(cacheFrom, co)
-		}
-	}
-	options.CacheFrom = cacheFrom
-
-	var cacheTo []*CacheOptionsEntry
-	for _, co := range options.CacheTo {
-		switch co.Type {
-		case "local":
-			var attrs map[string]string
-			for k, v := range co.Attrs {
-				if attrs == nil {
-					attrs = make(map[string]string)
-				}
-				switch k {
-				case "dest":
-					p := v
-					if p != "" {
-						p, err = filepath.Abs(p)
-						if err != nil {
-							return nil, err
-						}
-					}
-					attrs[k] = p
-				default:
-					attrs[k] = v
-				}
-			}
-			co.Attrs = attrs
-			cacheTo = append(cacheTo, co)
-		default:
-			cacheTo = append(cacheTo, co)
-		}
-	}
-	options.CacheTo = cacheTo
-	var exports []*ExportEntry
-	for _, e := range options.Exports {
-		if e.Destination != "" && e.Destination != "-" {
-			e.Destination, err = filepath.Abs(e.Destination)
-			if err != nil {
-				return nil, err
-			}
-		}
-		exports = append(exports, e)
-	}
-	options.Exports = exports
-
-	var secrets []*Secret
-	for _, s := range options.Secrets {
-		if s.FilePath != "" {
-			s.FilePath, err = filepath.Abs(s.FilePath)
-			if err != nil {
-				return nil, err
-			}
-		}
-		secrets = append(secrets, s)
-	}
-	options.Secrets = secrets
-
-	var ssh []*SSH
-	for _, s := range options.SSH {
-		var ps []string
-		for _, pt := range s.Paths {
-			p := pt
-			if p != "" {
-				p, err = filepath.Abs(p)
-				if err != nil {
-					return nil, err
-				}
-			}
-			ps = append(ps, p)
-
-		}
-		s.Paths = ps
-		ssh = append(ssh, s)
-	}
-	options.SSH = ssh
-
-	return options, nil
-}
-
-func isRemoteURL(c string) bool {
-	if urlutil.IsURL(c) {
-		return true
-	}
-	if _, err := gitutil.ParseGitRef(c); err == nil {
-		return true
-	}
-	return false
-}
--- a/controller/pb/path_test.go
+++ b/controller/pb/path_test.go
@@ -1,248 +0,0 @@
-package pb
-
-import (
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestResolvePaths(t *testing.T) {
-	tmpwd, err := os.MkdirTemp("", "testresolvepaths")
-	require.NoError(t, err)
-	defer os.Remove(tmpwd)
-	require.NoError(t, os.Chdir(tmpwd))
-	tests := []struct {
-		name    string
-		options BuildOptions
-		want    BuildOptions
-	}{
-		{
-			name:    "contextpath",
-			options: BuildOptions{ContextPath: "test"},
-			want:    BuildOptions{ContextPath: filepath.Join(tmpwd, "test")},
-		},
-		{
-			name:    "contextpath-cwd",
-			options: BuildOptions{ContextPath: "."},
-			want:    BuildOptions{ContextPath: tmpwd},
-		},
-		{
-			name:    "contextpath-dash",
-			options: BuildOptions{ContextPath: "-"},
-			want:    BuildOptions{ContextPath: "-"},
-		},
-		{
-			name:    "contextpath-ssh",
-			options: BuildOptions{ContextPath: "git@github.com:docker/buildx.git"},
-			want:    BuildOptions{ContextPath: "git@github.com:docker/buildx.git"},
-		},
-		{
-			name:    "dockerfilename",
-			options: BuildOptions{DockerfileName: "test", ContextPath: "."},
-			want:    BuildOptions{DockerfileName: filepath.Join(tmpwd, "test"), ContextPath: tmpwd},
-		},
-		{
-			name:    "dockerfilename-dash",
-			options: BuildOptions{DockerfileName: "-", ContextPath: "."},
-			want:    BuildOptions{DockerfileName: "-", ContextPath: tmpwd},
-		},
-		{
-			name:    "dockerfilename-remote",
-			options: BuildOptions{DockerfileName: "test", ContextPath: "git@github.com:docker/buildx.git"},
-			want:    BuildOptions{DockerfileName: "test", ContextPath: "git@github.com:docker/buildx.git"},
-		},
-		{
-			name: "contexts",
-			options: BuildOptions{NamedContexts: map[string]string{"a": "test1", "b": "test2",
-				"alpine": "docker-image://alpine@sha256:0123456789", "project": "https://github.com/myuser/project.git"}},
-			want: BuildOptions{NamedContexts: map[string]string{"a": filepath.Join(tmpwd, "test1"), "b": filepath.Join(tmpwd, "test2"),
-				"alpine": "docker-image://alpine@sha256:0123456789", "project": "https://github.com/myuser/project.git"}},
-		},
-		{
-			name: "cache-from",
-			options: BuildOptions{
-				CacheFrom: []*CacheOptionsEntry{
-					{
-						Type:  "local",
-						Attrs: map[string]string{"src": "test"},
-					},
-					{
-						Type:  "registry",
-						Attrs: map[string]string{"ref": "user/app"},
-					},
-				},
-			},
-			want: BuildOptions{
-				CacheFrom: []*CacheOptionsEntry{
-					{
-						Type:  "local",
-						Attrs: map[string]string{"src": filepath.Join(tmpwd, "test")},
-					},
-					{
-						Type:  "registry",
-						Attrs: map[string]string{"ref": "user/app"},
-					},
-				},
-			},
-		},
-		{
-			name: "cache-to",
-			options: BuildOptions{
-				CacheTo: []*CacheOptionsEntry{
-					{
-						Type:  "local",
-						Attrs: map[string]string{"dest": "test"},
-					},
-					{
-						Type:  "registry",
-						Attrs: map[string]string{"ref": "user/app"},
-					},
-				},
-			},
-			want: BuildOptions{
-				CacheTo: []*CacheOptionsEntry{
-					{
-						Type:  "local",
-						Attrs: map[string]string{"dest": filepath.Join(tmpwd, "test")},
-					},
-					{
-						Type:  "registry",
-						Attrs: map[string]string{"ref": "user/app"},
-					},
-				},
-			},
-		},
-		{
-			name: "exports",
-			options: BuildOptions{
-				Exports: []*ExportEntry{
-					{
-						Type:        "local",
-						Destination: "-",
-					},
-					{
-						Type:        "local",
-						Destination: "test1",
-					},
-					{
-						Type:        "tar",
-						Destination: "test3",
-					},
-					{
-						Type:        "oci",
-						Destination: "-",
-					},
-					{
-						Type:        "docker",
-						Destination: "test4",
-					},
-					{
-						Type:  "image",
-						Attrs: map[string]string{"push": "true"},
-					},
-				},
-			},
-			want: BuildOptions{
-				Exports: []*ExportEntry{
-					{
-						Type:        "local",
-						Destination: "-",
-					},
-					{
-						Type:        "local",
-						Destination: filepath.Join(tmpwd, "test1"),
-					},
-					{
-						Type:        "tar",
-						Destination: filepath.Join(tmpwd, "test3"),
-					},
-					{
-						Type:        "oci",
-						Destination: "-",
-					},
-					{
-						Type:        "docker",
-						Destination: filepath.Join(tmpwd, "test4"),
-					},
-					{
-						Type:  "image",
-						Attrs: map[string]string{"push": "true"},
-					},
-				},
-			},
-		},
-		{
-			name: "secrets",
-			options: BuildOptions{
-				Secrets: []*Secret{
-					{
-						FilePath: "test1",
-					},
-					{
-						ID:  "val",
-						Env: "a",
-					},
-					{
-						ID:       "test",
-						FilePath: "test3",
-					},
-				},
-			},
-			want: BuildOptions{
-				Secrets: []*Secret{
-					{
-						FilePath: filepath.Join(tmpwd, "test1"),
-					},
-					{
-						ID:  "val",
-						Env: "a",
-					},
-					{
-						ID:       "test",
-						FilePath: filepath.Join(tmpwd, "test3"),
-					},
-				},
-			},
-		},
-		{
-			name: "ssh",
-			options: BuildOptions{
-				SSH: []*SSH{
-					{
-						ID:    "default",
-						Paths: []string{"test1", "test2"},
-					},
-					{
-						ID:    "a",
-						Paths: []string{"test3"},
-					},
-				},
-			},
-			want: BuildOptions{
-				SSH: []*SSH{
-					{
-						ID:    "default",
-						Paths: []string{filepath.Join(tmpwd, "test1"), filepath.Join(tmpwd, "test2")},
-					},
-					{
-						ID:    "a",
-						Paths: []string{filepath.Join(tmpwd, "test3")},
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := ResolveOptionPaths(&tt.options)
-			require.NoError(t, err)
-			if !reflect.DeepEqual(tt.want, *got) {
-				t.Fatalf("expected %#v, got %#v", tt.want, *got)
-			}
-		})
-	}
-}
--- a/controller/pb/progress.go
+++ b/controller/pb/progress.go
@@ -1,126 +0,0 @@
-package pb
-
-import (
-	"github.com/docker/buildx/util/progress"
-	control "github.com/moby/buildkit/api/services/control"
-	"github.com/moby/buildkit/client"
-	"github.com/opencontainers/go-digest"
-)
-
-type writer struct {
-	ch chan<- *StatusResponse
-}
-
-func NewProgressWriter(ch chan<- *StatusResponse) progress.Writer {
-	return &writer{ch: ch}
-}
-
-func (w *writer) Write(status *client.SolveStatus) {
-	w.ch <- ToControlStatus(status)
-}
-
-func (w *writer) WriteBuildRef(target string, ref string) {
-	return
-}
-
-func (w *writer) ValidateLogSource(digest.Digest, interface{}) bool {
-	return true
-}
-
-func (w *writer) ClearLogSource(interface{}) {}
-
-func ToControlStatus(s *client.SolveStatus) *StatusResponse {
-	resp := StatusResponse{}
-	for _, v := range s.Vertexes {
-		resp.Vertexes = append(resp.Vertexes, &control.Vertex{
-			Digest:        v.Digest,
-			Inputs:        v.Inputs,
-			Name:          v.Name,
-			Started:       v.Started,
-			Completed:     v.Completed,
-			Error:         v.Error,
-			Cached:        v.Cached,
-			ProgressGroup: v.ProgressGroup,
-		})
-	}
-	for _, v := range s.Statuses {
-		resp.Statuses = append(resp.Statuses, &control.VertexStatus{
-			ID:        v.ID,
-			Vertex:    v.Vertex,
-			Name:      v.Name,
-			Total:     v.Total,
-			Current:   v.Current,
-			Timestamp: v.Timestamp,
-			Started:   v.Started,
-			Completed: v.Completed,
-		})
-	}
-	for _, v := range s.Logs {
-		resp.Logs = append(resp.Logs, &control.VertexLog{
-			Vertex:    v.Vertex,
-			Stream:    int64(v.Stream),
-			Msg:       v.Data,
-			Timestamp: v.Timestamp,
-		})
-	}
-	for _, v := range s.Warnings {
-		resp.Warnings = append(resp.Warnings, &control.VertexWarning{
-			Vertex: v.Vertex,
-			Level:  int64(v.Level),
-			Short:  v.Short,
-			Detail: v.Detail,
-			Url:    v.URL,
-			Info:   v.SourceInfo,
-			Ranges: v.Range,
-		})
-	}
-	return &resp
-}
-
-func FromControlStatus(resp *StatusResponse) *client.SolveStatus {
-	s := client.SolveStatus{}
-	for _, v := range resp.Vertexes {
-		s.Vertexes = append(s.Vertexes, &client.Vertex{
-			Digest:        v.Digest,
-			Inputs:        v.Inputs,
-			Name:          v.Name,
-			Started:       v.Started,
-			Completed:     v.Completed,
-			Error:         v.Error,
-			Cached:        v.Cached,
-			ProgressGroup: v.ProgressGroup,
-		})
-	}
-	for _, v := range resp.Statuses {
-		s.Statuses = append(s.Statuses, &client.VertexStatus{
-			ID:        v.ID,
-			Vertex:    v.Vertex,
-			Name:      v.Name,
-			Total:     v.Total,
-			Current:   v.Current,
-			Timestamp: v.Timestamp,
-			Started:   v.Started,
-			Completed: v.Completed,
-		})
-	}
-	for _, v := range resp.Logs {
-		s.Logs = append(s.Logs, &client.VertexLog{
-			Vertex:    v.Vertex,
-			Stream:    int(v.Stream),
-			Data:      v.Msg,
-			Timestamp: v.Timestamp,
-		})
-	}
-	for _, v := range resp.Warnings {
-		s.Warnings = append(s.Warnings, &client.VertexWarning{
-			Vertex:     v.Vertex,
-			Level:      int(v.Level),
-			Short:      v.Short,
-			Detail:     v.Detail,
-			URL:        v.Url,
-			SourceInfo: v.Info,
-			Range:      v.Ranges,
-		})
-	}
-	return &s
-}
--- a/controller/pb/secrets.go
+++ b/controller/pb/secrets.go
@@ -1,22 +0,0 @@
-package pb
-
-import (
-	"github.com/moby/buildkit/session"
-	"github.com/moby/buildkit/session/secrets/secretsprovider"
-)
-
-func CreateSecrets(secrets []*Secret) (session.Attachable, error) {
-	fs := make([]secretsprovider.Source, 0, len(secrets))
-	for _, secret := range secrets {
-		fs = append(fs, secretsprovider.Source{
-			ID:       secret.ID,
-			FilePath: secret.FilePath,
-			Env:      secret.Env,
-		})
-	}
-	store, err := secretsprovider.NewStore(fs)
-	if err != nil {
-		return nil, err
-	}
-	return secretsprovider.NewSecretProvider(store), nil
-}
--- a/controller/pb/ssh.go
+++ b/controller/pb/ssh.go
@@ -1,18 +0,0 @@
-package pb
-
-import (
-	"github.com/moby/buildkit/session"
-	"github.com/moby/buildkit/session/sshforward/sshprovider"
-)
-
-func CreateSSH(ssh []*SSH) (session.Attachable, error) {
-	configs := make([]sshprovider.AgentConfig, 0, len(ssh))
-	for _, ssh := range ssh {
-		cfg := sshprovider.AgentConfig{
-			ID:    ssh.ID,
-			Paths: append([]string{}, ssh.Paths...),
-		}
-		configs = append(configs, cfg)
-	}
-	return sshprovider.NewSSHAgentProvider(configs)
-}
--- a/controller/processes/processes.go
+++ b/controller/processes/processes.go
@@ -1,149 +0,0 @@
-package processes
-
-import (
-	"context"
-	"sync"
-	"sync/atomic"
-
-	"github.com/docker/buildx/build"
-	"github.com/docker/buildx/controller/pb"
-	"github.com/docker/buildx/util/ioset"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-)
-
-// Process provides methods to control a process.
-type Process struct {
-	inEnd         *ioset.Forwarder
-	invokeConfig  *pb.InvokeConfig
-	errCh         chan error
-	processCancel func()
-	serveIOCancel func()
-}
-
-// ForwardIO forwards process's io to the specified reader/writer.
-// Optionally specify ioCancelCallback which will be called when
-// the process closes the specified IO. This will be useful for additional cleanup.
-func (p *Process) ForwardIO(in *ioset.In, ioCancelCallback func()) {
-	p.inEnd.SetIn(in)
-	if f := p.serveIOCancel; f != nil {
-		f()
-	}
-	p.serveIOCancel = ioCancelCallback
-}
-
-// Done returns a channel where error or nil will be sent
-// when the process exits.
-// TODO: change this to Wait()
-func (p *Process) Done() <-chan error {
-	return p.errCh
-}
-
-// Manager manages a set of proceses.
-type Manager struct {
-	container atomic.Value
-	processes sync.Map
-}
-
-// NewManager creates and returns a Manager.
-func NewManager() *Manager {
-	return &Manager{}
-}
-
-// Get returns the specified process.
-func (m *Manager) Get(id string) (*Process, bool) {
-	v, ok := m.processes.Load(id)
-	if !ok {
-		return nil, false
-	}
-	return v.(*Process), true
-}
-
-// CancelRunningProcesses cancels execution of all running processes.
-func (m *Manager) CancelRunningProcesses() {
-	var funcs []func()
-	m.processes.Range(func(key, value any) bool {
-		funcs = append(funcs, value.(*Process).processCancel)
-		m.processes.Delete(key)
-		return true
-	})
-	for _, f := range funcs {
-		f()
-	}
-}
-
-// ListProcesses lists all running processes.
-func (m *Manager) ListProcesses() (res []*pb.ProcessInfo) {
-	m.processes.Range(func(key, value any) bool {
-		res = append(res, &pb.ProcessInfo{
-			ProcessID:    key.(string),
-			InvokeConfig: value.(*Process).invokeConfig,
-		})
-		return true
-	})
-	return res
-}
-
-// DeleteProcess deletes the specified process.
-func (m *Manager) DeleteProcess(id string) error {
-	p, ok := m.processes.LoadAndDelete(id)
-	if !ok {
-		return errors.Errorf("unknown process %q", id)
-	}
-	p.(*Process).processCancel()
-	return nil
-}
-
-// StartProcess starts a process in the container.
-// When a container isn't available (i.e. first time invoking or the container has exited) or cfg.Rollback is set,
-// this method will start a new container and run the process in it. Otherwise, this method starts a new process in the
-// existing container.
-func (m *Manager) StartProcess(pid string, resultCtx *build.ResultHandle, cfg *pb.InvokeConfig) (*Process, error) {
-	// Get the target result to invoke a container from
-	var ctr *build.Container
-	if a := m.container.Load(); a != nil {
-		ctr = a.(*build.Container)
-	}
-	if cfg.Rollback || ctr == nil || ctr.IsUnavailable() {
-		go m.CancelRunningProcesses()
-		// (Re)create a new container if this is rollback or first time to invoke a process.
-		if ctr != nil {
-			go ctr.Cancel() // Finish the existing container
-		}
-		var err error
-		ctr, err = build.NewContainer(context.TODO(), resultCtx, cfg)
-		if err != nil {
-			return nil, errors.Errorf("failed to create container %v", err)
-		}
-		m.container.Store(ctr)
-	}
-	// [client(ForwardIO)] <-forwarder(switchable)-> [out] <-pipe-> [in] <- [process]
-	in, out := ioset.Pipe()
-	f := ioset.NewForwarder()
-	f.PropagateStdinClose = false
-	f.SetOut(&out)
-
-	// Register process
-	ctx, cancel := context.WithCancel(context.TODO())
-	var cancelOnce sync.Once
-	processCancelFunc := func() { cancelOnce.Do(func() { cancel(); f.Close(); in.Close(); out.Close() }) }
-	p := &Process{
-		inEnd:         f,
-		invokeConfig:  cfg,
-		processCancel: processCancelFunc,
-		errCh:         make(chan error),
-	}
-	m.processes.Store(pid, p)
-	go func() {
-		var err error
-		if err = ctr.Exec(ctx, cfg, in.Stdin, in.Stdout, in.Stderr); err != nil {
-			logrus.Debugf("process error: %v", err)
-		}
-		logrus.Debugf("finished process %s %v", pid, cfg.Entrypoint)
-		m.processes.Delete(pid)
-		processCancelFunc()
-		p.errCh <- err
-	}()
-
-	return p, nil
-}
--- a/controller/remote/client.go
+++ b/controller/remote/client.go
@@ -1,240 +0,0 @@
-package remote
-
-import (
-	"context"
-	"io"
-	"sync"
-	"time"
-
-	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/pkg/dialer"
-	"github.com/docker/buildx/controller/pb"
-	"github.com/docker/buildx/util/progress"
-	"github.com/moby/buildkit/client"
-	"github.com/moby/buildkit/identity"
-	"github.com/moby/buildkit/util/grpcerrors"
-	"github.com/pkg/errors"
-	"golang.org/x/sync/errgroup"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/backoff"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-func NewClient(ctx context.Context, addr string) (*Client, error) {
-	backoffConfig := backoff.DefaultConfig
-	backoffConfig.MaxDelay = 3 * time.Second
-	connParams := grpc.ConnectParams{
-		Backoff: backoffConfig,
-	}
-	gopts := []grpc.DialOption{
-		grpc.WithBlock(),
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-		grpc.WithConnectParams(connParams),
-		grpc.WithContextDialer(dialer.ContextDialer),
-		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(defaults.DefaultMaxRecvMsgSize)),
-		grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(defaults.DefaultMaxSendMsgSize)),
-		grpc.WithUnaryInterceptor(grpcerrors.UnaryClientInterceptor),
-		grpc.WithStreamInterceptor(grpcerrors.StreamClientInterceptor),
-	}
-	conn, err := grpc.DialContext(ctx, dialer.DialAddress(addr), gopts...)
-	if err != nil {
-		return nil, err
-	}
-	return &Client{conn: conn}, nil
-}
-
-type Client struct {
-	conn      *grpc.ClientConn
-	closeOnce sync.Once
-}
-
-func (c *Client) Close() (err error) {
-	c.closeOnce.Do(func() {
-		err = c.conn.Close()
-	})
-	return
-}
-
-func (c *Client) Version(ctx context.Context) (string, string, string, error) {
-	res, err := c.client().Info(ctx, &pb.InfoRequest{})
-	if err != nil {
-		return "", "", "", err
-	}
-	v := res.BuildxVersion
-	return v.Package, v.Version, v.Revision, nil
-}
-
-func (c *Client) List(ctx context.Context) (keys []string, retErr error) {
-	res, err := c.client().List(ctx, &pb.ListRequest{})
-	if err != nil {
-		return nil, err
-	}
-	return res.Keys, nil
-}
-
-func (c *Client) Disconnect(ctx context.Context, key string) error {
-	if key == "" {
-		return nil
-	}
-	_, err := c.client().Disconnect(ctx, &pb.DisconnectRequest{Ref: key})
-	return err
-}
-
-func (c *Client) ListProcesses(ctx context.Context, ref string) (infos []*pb.ProcessInfo, retErr error) {
-	res, err := c.client().ListProcesses(ctx, &pb.ListProcessesRequest{Ref: ref})
-	if err != nil {
-		return nil, err
-	}
-	return res.Infos, nil
-}
-
-func (c *Client) DisconnectProcess(ctx context.Context, ref, pid string) error {
-	_, err := c.client().DisconnectProcess(ctx, &pb.DisconnectProcessRequest{Ref: ref, ProcessID: pid})
-	return err
-}
-
-func (c *Client) Invoke(ctx context.Context, ref string, pid string, invokeConfig pb.InvokeConfig, in io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) error {
-	if ref == "" || pid == "" {
-		return errors.New("build reference must be specified")
-	}
-	stream, err := c.client().Invoke(ctx)
-	if err != nil {
-		return err
-	}
-	return attachIO(ctx, stream, &pb.InitMessage{Ref: ref, ProcessID: pid, InvokeConfig: &invokeConfig}, ioAttachConfig{
-		stdin:  in,
-		stdout: stdout,
-		stderr: stderr,
-		// TODO: Signal, Resize
-	})
-}
-
-func (c *Client) Inspect(ctx context.Context, ref string) (*pb.InspectResponse, error) {
-	return c.client().Inspect(ctx, &pb.InspectRequest{Ref: ref})
-}
-
-func (c *Client) Build(ctx context.Context, options pb.BuildOptions, in io.ReadCloser, progress progress.Writer) (string, *client.SolveResponse, error) {
-	ref := identity.NewID()
-	statusChan := make(chan *client.SolveStatus)
-	eg, egCtx := errgroup.WithContext(ctx)
-	var resp *client.SolveResponse
-	eg.Go(func() error {
-		defer close(statusChan)
-		var err error
-		resp, err = c.build(egCtx, ref, options, in, statusChan)
-		return err
-	})
-	eg.Go(func() error {
-		for s := range statusChan {
-			st := s
-			progress.Write(st)
-		}
-		return nil
-	})
-	return ref, resp, eg.Wait()
-}
-
-func (c *Client) build(ctx context.Context, ref string, options pb.BuildOptions, in io.ReadCloser, statusChan chan *client.SolveStatus) (*client.SolveResponse, error) {
-	eg, egCtx := errgroup.WithContext(ctx)
-	done := make(chan struct{})
-
-	var resp *client.SolveResponse
-
-	eg.Go(func() error {
-		defer close(done)
-		pbResp, err := c.client().Build(egCtx, &pb.BuildRequest{
-			Ref:     ref,
-			Options: &options,
-		})
-		if err != nil {
-			return err
-		}
-		resp = &client.SolveResponse{
-			ExporterResponse: pbResp.ExporterResponse,
-		}
-		return nil
-	})
-	eg.Go(func() error {
-		stream, err := c.client().Status(egCtx, &pb.StatusRequest{
-			Ref: ref,
-		})
-		if err != nil {
-			return err
-		}
-		for {
-			resp, err := stream.Recv()
-			if err != nil {
-				if err == io.EOF {
-					return nil
-				}
-				return errors.Wrap(err, "failed to receive status")
-			}
-			statusChan <- pb.FromControlStatus(resp)
-		}
-	})
-	if in != nil {
-		eg.Go(func() error {
-			stream, err := c.client().Input(egCtx)
-			if err != nil {
-				return err
-			}
-			if err := stream.Send(&pb.InputMessage{
-				Input: &pb.InputMessage_Init{
-					Init: &pb.InputInitMessage{
-						Ref: ref,
-					},
-				},
-			}); err != nil {
-				return errors.Wrap(err, "failed to init input")
-			}
-
-			inReader, inWriter := io.Pipe()
-			eg2, _ := errgroup.WithContext(ctx)
-			eg2.Go(func() error {
-				<-done
-				return inWriter.Close()
-			})
-			go func() {
-				// do not wait for read completion but return here and let the caller send EOF
-				// this allows us to return on ctx.Done() without being blocked by this reader.
-				io.Copy(inWriter, in)
-				inWriter.Close()
-			}()
-			eg2.Go(func() error {
-				for {
-					buf := make([]byte, 32*1024)
-					n, err := inReader.Read(buf)
-					if err != nil {
-						if err == io.EOF {
-							break // break loop and send EOF
-						}
-						return err
-					} else if n > 0 {
-						if stream.Send(&pb.InputMessage{
-							Input: &pb.InputMessage_Data{
-								Data: &pb.DataMessage{
-									Data: buf[:n],
-								},
-							},
-						}); err != nil {
-							return err
-						}
-					}
-				}
-				return stream.Send(&pb.InputMessage{
-					Input: &pb.InputMessage_Data{
-						Data: &pb.DataMessage{
-							EOF: true,
-						},
-					},
-				})
-			})
-			return eg2.Wait()
-		})
-	}
-	return resp, eg.Wait()
-}
-
-func (c *Client) client() pb.ControllerClient {
-	return pb.NewControllerClient(c.conn)
-}
--- a/controller/remote/controller.go
+++ b/controller/remote/controller.go
@@ -1,333 +0,0 @@
-//go:build linux
-
-package remote
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"os/exec"
-	"os/signal"
-	"path/filepath"
-	"strconv"
-	"syscall"
-	"time"
-
-	"github.com/containerd/log"
-	"github.com/docker/buildx/build"
-	cbuild "github.com/docker/buildx/controller/build"
-	"github.com/docker/buildx/controller/control"
-	controllerapi "github.com/docker/buildx/controller/pb"
-	"github.com/docker/buildx/util/confutil"
-	"github.com/docker/buildx/util/progress"
-	"github.com/docker/buildx/version"
-	"github.com/docker/cli/cli/command"
-	"github.com/moby/buildkit/client"
-	"github.com/moby/buildkit/util/grpcerrors"
-	"github.com/pelletier/go-toml"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"google.golang.org/grpc"
-)
-
-const (
-	serveCommandName = "_INTERNAL_SERVE"
-)
-
-var (
-	defaultLogFilename    = fmt.Sprintf("buildx.%s.log", version.Revision)
-	defaultSocketFilename = fmt.Sprintf("buildx.%s.sock", version.Revision)
-	defaultPIDFilename    = fmt.Sprintf("buildx.%s.pid", version.Revision)
-)
-
-type serverConfig struct {
-	// Specify buildx server root
-	Root string `toml:"root"`
-
-	// LogLevel sets the logging level [trace, debug, info, warn, error, fatal, panic]
-	LogLevel string `toml:"log_level"`
-
-	// Specify file to output buildx server log
-	LogFile string `toml:"log_file"`
-}
-
-func NewRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts control.ControlOptions, logger progress.SubLogger) (control.BuildxController, error) {
-	rootDir := opts.Root
-	if rootDir == "" {
-		rootDir = rootDataDir(dockerCli)
-	}
-	serverRoot := filepath.Join(rootDir, "shared")
-
-	// connect to buildx server if it is already running
-	ctx2, cancel := context.WithTimeout(ctx, 1*time.Second)
-	c, err := newBuildxClientAndCheck(ctx2, filepath.Join(serverRoot, defaultSocketFilename))
-	cancel()
-	if err != nil {
-		if !errors.Is(err, context.DeadlineExceeded) {
-			return nil, errors.Wrap(err, "cannot connect to the buildx server")
-		}
-	} else {
-		return &buildxController{c, serverRoot}, nil
-	}
-
-	// start buildx server via subcommand
-	err = logger.Wrap("no buildx server found; launching...", func() error {
-		launchFlags := []string{}
-		if opts.ServerConfig != "" {
-			launchFlags = append(launchFlags, "--config", opts.ServerConfig)
-		}
-		logFile, err := getLogFilePath(dockerCli, opts.ServerConfig)
-		if err != nil {
-			return err
-		}
-		wait, err := launch(ctx, logFile, append([]string{serveCommandName}, launchFlags...)...)
-		if err != nil {
-			return err
-		}
-		go wait()
-
-		// wait for buildx server to be ready
-		ctx2, cancel = context.WithTimeout(ctx, 10*time.Second)
-		c, err = newBuildxClientAndCheck(ctx2, filepath.Join(serverRoot, defaultSocketFilename))
-		cancel()
-		if err != nil {
-			return errors.Wrap(err, "cannot connect to the buildx server")
-		}
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &buildxController{c, serverRoot}, nil
-}
-
-func AddControllerCommands(cmd *cobra.Command, dockerCli command.Cli) {
-	cmd.AddCommand(
-		serveCmd(dockerCli),
-	)
-}
-
-func serveCmd(dockerCli command.Cli) *cobra.Command {
-	var serverConfigPath string
-	cmd := &cobra.Command{
-		Use:    fmt.Sprintf("%s [OPTIONS]", serveCommandName),
-		Hidden: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			// Parse config
-			config, err := getConfig(dockerCli, serverConfigPath)
-			if err != nil {
-				return err
-			}
-			if config.LogLevel == "" {
-				logrus.SetLevel(logrus.InfoLevel)
-			} else {
-				lvl, err := logrus.ParseLevel(config.LogLevel)
-				if err != nil {
-					return errors.Wrap(err, "failed to prepare logger")
-				}
-				logrus.SetLevel(lvl)
-			}
-			logrus.SetFormatter(&logrus.JSONFormatter{
-				TimestampFormat: log.RFC3339NanoFixed,
-			})
-			root, err := prepareRootDir(dockerCli, config)
-			if err != nil {
-				return err
-			}
-			pidF := filepath.Join(root, defaultPIDFilename)
-			if err := os.WriteFile(pidF, []byte(fmt.Sprintf("%d", os.Getpid())), 0600); err != nil {
-				return err
-			}
-			defer func() {
-				if err := os.Remove(pidF); err != nil {
-					logrus.Errorf("failed to clean up info file %q: %v", pidF, err)
-				}
-			}()
-
-			// prepare server
-			b := NewServer(func(ctx context.Context, options *controllerapi.BuildOptions, stdin io.Reader, progress progress.Writer) (*client.SolveResponse, *build.ResultHandle, error) {
-				return cbuild.RunBuild(ctx, dockerCli, *options, stdin, progress, true)
-			})
-			defer b.Close()
-
-			// serve server
-			addr := filepath.Join(root, defaultSocketFilename)
-			if err := os.Remove(addr); err != nil && !os.IsNotExist(err) { // avoid EADDRINUSE
-				return err
-			}
-			defer func() {
-				if err := os.Remove(addr); err != nil {
-					logrus.Errorf("failed to clean up socket %q: %v", addr, err)
-				}
-			}()
-			logrus.Infof("starting server at %q", addr)
-			l, err := net.Listen("unix", addr)
-			if err != nil {
-				return err
-			}
-			rpc := grpc.NewServer(
-				grpc.UnaryInterceptor(grpcerrors.UnaryServerInterceptor),
-				grpc.StreamInterceptor(grpcerrors.StreamServerInterceptor),
-			)
-			controllerapi.RegisterControllerServer(rpc, b)
-			doneCh := make(chan struct{})
-			errCh := make(chan error, 1)
-			go func() {
-				defer close(doneCh)
-				if err := rpc.Serve(l); err != nil {
-					errCh <- errors.Wrapf(err, "error on serving via socket %q", addr)
-				}
-			}()
-
-			var s os.Signal
-			sigCh := make(chan os.Signal, 1)
-			signal.Notify(sigCh, syscall.SIGINT)
-			signal.Notify(sigCh, syscall.SIGTERM)
-			select {
-			case err := <-errCh:
-				logrus.Errorf("got error %s, exiting", err)
-				return err
-			case s = <-sigCh:
-				logrus.Infof("got signal %s, exiting", s)
-				return nil
-			case <-doneCh:
-				logrus.Infof("rpc server done, exiting")
-				return nil
-			}
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVar(&serverConfigPath, "config", "", "Specify buildx server config file")
-	return cmd
-}
-
-func getLogFilePath(dockerCli command.Cli, configPath string) (string, error) {
-	config, err := getConfig(dockerCli, configPath)
-	if err != nil {
-		return "", err
-	}
-	if config.LogFile == "" {
-		root, err := prepareRootDir(dockerCli, config)
-		if err != nil {
-			return "", err
-		}
-		return filepath.Join(root, defaultLogFilename), nil
-	}
-	return config.LogFile, nil
-}
-
-func getConfig(dockerCli command.Cli, configPath string) (*serverConfig, error) {
-	var defaultConfigPath bool
-	if configPath == "" {
-		defaultRoot := rootDataDir(dockerCli)
-		configPath = filepath.Join(defaultRoot, "config.toml")
-		defaultConfigPath = true
-	}
-	var config serverConfig
-	tree, err := toml.LoadFile(configPath)
-	if err != nil && !(os.IsNotExist(err) && defaultConfigPath) {
-		return nil, errors.Wrapf(err, "failed to read config %q", configPath)
-	} else if err == nil {
-		if err := tree.Unmarshal(&config); err != nil {
-			return nil, errors.Wrapf(err, "failed to unmarshal config %q", configPath)
-		}
-	}
-	return &config, nil
-}
-
-func prepareRootDir(dockerCli command.Cli, config *serverConfig) (string, error) {
-	rootDir := config.Root
-	if rootDir == "" {
-		rootDir = rootDataDir(dockerCli)
-	}
-	if rootDir == "" {
-		return "", errors.New("buildx root dir must be determined")
-	}
-	if err := os.MkdirAll(rootDir, 0700); err != nil {
-		return "", err
-	}
-	serverRoot := filepath.Join(rootDir, "shared")
-	if err := os.MkdirAll(serverRoot, 0700); err != nil {
-		return "", err
-	}
-	return serverRoot, nil
-}
-
-func rootDataDir(dockerCli command.Cli) string {
-	return filepath.Join(confutil.ConfigDir(dockerCli), "controller")
-}
-
-func newBuildxClientAndCheck(ctx context.Context, addr string) (*Client, error) {
-	c, err := NewClient(ctx, addr)
-	if err != nil {
-		return nil, err
-	}
-	p, v, r, err := c.Version(ctx)
-	if err != nil {
-		return nil, err
-	}
-	logrus.Debugf("connected to server (\"%v %v %v\")", p, v, r)
-	if !(p == version.Package && v == version.Version && r == version.Revision) {
-		return nil, errors.Errorf("version mismatch (client: \"%v %v %v\", server: \"%v %v %v\")", version.Package, version.Version, version.Revision, p, v, r)
-	}
-	return c, nil
-}
-
-type buildxController struct {
-	*Client
-	serverRoot string
-}
-
-func (c *buildxController) Kill(ctx context.Context) error {
-	pidB, err := os.ReadFile(filepath.Join(c.serverRoot, defaultPIDFilename))
-	if err != nil {
-		return err
-	}
-	pid, err := strconv.ParseInt(string(pidB), 10, 64)
-	if err != nil {
-		return err
-	}
-	if pid <= 0 {
-		return errors.New("no PID is recorded for buildx server")
-	}
-	p, err := os.FindProcess(int(pid))
-	if err != nil {
-		return err
-	}
-	if err := p.Signal(syscall.SIGINT); err != nil {
-		return err
-	}
-	// TODO: Should we send SIGKILL if process doesn't finish?
-	return nil
-}
-
-func launch(ctx context.Context, logFile string, args ...string) (func() error, error) {
-	// set absolute path of binary, since we set the working directory to the root
-	pathname, err := os.Executable()
-	if err != nil {
-		return nil, err
-	}
-	bCmd := exec.CommandContext(ctx, pathname, args...)
-	if logFile != "" {
-		f, err := os.OpenFile(logFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-		if err != nil {
-			return nil, err
-		}
-		defer f.Close()
-		bCmd.Stdout = f
-		bCmd.Stderr = f
-	}
-	bCmd.Stdin = nil
-	bCmd.Dir = "/"
-	bCmd.SysProcAttr = &syscall.SysProcAttr{
-		Setsid: true,
-	}
-	if err := bCmd.Start(); err != nil {
-		return nil, err
-	}
-	return bCmd.Wait, nil
-}
--- a/controller/remote/controller_nolinux.go
+++ b/controller/remote/controller_nolinux.go
@@ -1,19 +0,0 @@
-//go:build !linux
-
-package remote
-
-import (
-	"context"
-
-	"github.com/docker/buildx/controller/control"
-	"github.com/docker/buildx/util/progress"
-	"github.com/docker/cli/cli/command"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-)
-
-func NewRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts control.ControlOptions, logger progress.SubLogger) (control.BuildxController, error) {
-	return nil, errors.New("remote buildx unsupported")
-}
-
-func AddControllerCommands(cmd *cobra.Command, dockerCli command.Cli) {}
--- a/controller/remote/io.go
+++ b/controller/remote/io.go
@@ -1,430 +0,0 @@
-package remote
-
-import (
-	"context"
-	"io"
-	"syscall"
-	"time"
-
-	"github.com/docker/buildx/controller/pb"
-	"github.com/moby/sys/signal"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"golang.org/x/sync/errgroup"
-)
-
-type msgStream interface {
-	Send(*pb.Message) error
-	Recv() (*pb.Message, error)
-}
-
-type ioServerConfig struct {
-	stdin          io.WriteCloser
-	stdout, stderr io.ReadCloser
-
-	// signalFn is a callback function called when a signal is reached to the client.
-	signalFn func(context.Context, syscall.Signal) error
-
-	// resizeFn is a callback function called when a resize event is reached to the client.
-	resizeFn func(context.Context, winSize) error
-}
-
-func serveIO(attachCtx context.Context, srv msgStream, initFn func(*pb.InitMessage) error, ioConfig *ioServerConfig) (err error) {
-	stdin, stdout, stderr := ioConfig.stdin, ioConfig.stdout, ioConfig.stderr
-	stream := &debugStream{srv, "server=" + time.Now().String()}
-	eg, ctx := errgroup.WithContext(attachCtx)
-	done := make(chan struct{})
-
-	msg, err := receive(ctx, stream)
-	if err != nil {
-		return err
-	}
-	init := msg.GetInit()
-	if init == nil {
-		return errors.Errorf("unexpected message: %T; wanted init", msg.GetInput())
-	}
-	ref := init.Ref
-	if ref == "" {
-		return errors.New("no ref is provided")
-	}
-	if err := initFn(init); err != nil {
-		return errors.Wrap(err, "failed to initialize IO server")
-	}
-
-	if stdout != nil {
-		stdoutReader, stdoutWriter := io.Pipe()
-		eg.Go(func() error {
-			<-done
-			return stdoutWriter.Close()
-		})
-
-		go func() {
-			// do not wait for read completion but return here and let the caller send EOF
-			// this allows us to return on ctx.Done() without being blocked by this reader.
-			io.Copy(stdoutWriter, stdout)
-			stdoutWriter.Close()
-		}()
-
-		eg.Go(func() error {
-			defer stdoutReader.Close()
-			return copyToStream(1, stream, stdoutReader)
-		})
-	}
-
-	if stderr != nil {
-		stderrReader, stderrWriter := io.Pipe()
-		eg.Go(func() error {
-			<-done
-			return stderrWriter.Close()
-		})
-
-		go func() {
-			// do not wait for read completion but return here and let the caller send EOF
-			// this allows us to return on ctx.Done() without being blocked by this reader.
-			io.Copy(stderrWriter, stderr)
-			stderrWriter.Close()
-		}()
-
-		eg.Go(func() error {
-			defer stderrReader.Close()
-			return copyToStream(2, stream, stderrReader)
-		})
-	}
-
-	msgCh := make(chan *pb.Message)
-	eg.Go(func() error {
-		defer close(msgCh)
-		for {
-			msg, err := receive(ctx, stream)
-			if err != nil {
-				return err
-			}
-			select {
-			case msgCh <- msg:
-			case <-done:
-				return nil
-			case <-ctx.Done():
-				return nil
-			}
-		}
-	})
-
-	eg.Go(func() error {
-		defer close(done)
-		for {
-			var msg *pb.Message
-			select {
-			case msg = <-msgCh:
-			case <-ctx.Done():
-				return nil
-			}
-			if msg == nil {
-				return nil
-			}
-			if file := msg.GetFile(); file != nil {
-				if file.Fd != 0 {
-					return errors.Errorf("unexpected fd: %v", file.Fd)
-				}
-				if stdin == nil {
-					continue // no stdin destination is specified so ignore the data
-				}
-				if len(file.Data) > 0 {
-					_, err := stdin.Write(file.Data)
-					if err != nil {
-						return err
-					}
-				}
-				if file.EOF {
-					stdin.Close()
-				}
-			} else if resize := msg.GetResize(); resize != nil {
-				if ioConfig.resizeFn != nil {
-					ioConfig.resizeFn(ctx, winSize{
-						cols: resize.Cols,
-						rows: resize.Rows,
-					})
-				}
-			} else if sig := msg.GetSignal(); sig != nil {
-				if ioConfig.signalFn != nil {
-					syscallSignal, ok := signal.SignalMap[sig.Name]
-					if !ok {
-						continue
-					}
-					ioConfig.signalFn(ctx, syscallSignal)
-				}
-			} else {
-				return errors.Errorf("unexpected message: %T", msg.GetInput())
-			}
-		}
-	})
-
-	return eg.Wait()
-}
-
-type ioAttachConfig struct {
-	stdin          io.ReadCloser
-	stdout, stderr io.WriteCloser
-	signal         <-chan syscall.Signal
-	resize         <-chan winSize
-}
-
-type winSize struct {
-	rows uint32
-	cols uint32
-}
-
-func attachIO(ctx context.Context, stream msgStream, initMessage *pb.InitMessage, cfg ioAttachConfig) (retErr error) {
-	eg, ctx := errgroup.WithContext(ctx)
-	done := make(chan struct{})
-
-	if err := stream.Send(&pb.Message{
-		Input: &pb.Message_Init{
-			Init: initMessage,
-		},
-	}); err != nil {
-		return errors.Wrap(err, "failed to init")
-	}
-
-	if cfg.stdin != nil {
-		stdinReader, stdinWriter := io.Pipe()
-		eg.Go(func() error {
-			<-done
-			return stdinWriter.Close()
-		})
-
-		go func() {
-			// do not wait for read completion but return here and let the caller send EOF
-			// this allows us to return on ctx.Done() without being blocked by this reader.
-			io.Copy(stdinWriter, cfg.stdin)
-			stdinWriter.Close()
-		}()
-
-		eg.Go(func() error {
-			defer stdinReader.Close()
-			return copyToStream(0, stream, stdinReader)
-		})
-	}
-
-	if cfg.signal != nil {
-		eg.Go(func() error {
-			for {
-				var sig syscall.Signal
-				select {
-				case sig = <-cfg.signal:
-				case <-done:
-					return nil
-				case <-ctx.Done():
-					return nil
-				}
-				name := sigToName[sig]
-				if name == "" {
-					continue
-				}
-				if err := stream.Send(&pb.Message{
-					Input: &pb.Message_Signal{
-						Signal: &pb.SignalMessage{
-							Name: name,
-						},
-					},
-				}); err != nil {
-					return errors.Wrap(err, "failed to send signal")
-				}
-			}
-		})
-	}
-
-	if cfg.resize != nil {
-		eg.Go(func() error {
-			for {
-				var win winSize
-				select {
-				case win = <-cfg.resize:
-				case <-done:
-					return nil
-				case <-ctx.Done():
-					return nil
-				}
-				if err := stream.Send(&pb.Message{
-					Input: &pb.Message_Resize{
-						Resize: &pb.ResizeMessage{
-							Rows: win.rows,
-							Cols: win.cols,
-						},
-					},
-				}); err != nil {
-					return errors.Wrap(err, "failed to send resize")
-				}
-			}
-		})
-	}
-
-	msgCh := make(chan *pb.Message)
-	eg.Go(func() error {
-		defer close(msgCh)
-		for {
-			msg, err := receive(ctx, stream)
-			if err != nil {
-				return err
-			}
-			select {
-			case msgCh <- msg:
-			case <-done:
-				return nil
-			case <-ctx.Done():
-				return nil
-			}
-		}
-	})
-
-	eg.Go(func() error {
-		eofs := make(map[uint32]struct{})
-		defer close(done)
-		for {
-			var msg *pb.Message
-			select {
-			case msg = <-msgCh:
-			case <-ctx.Done():
-				return nil
-			}
-			if msg == nil {
-				return nil
-			}
-			if file := msg.GetFile(); file != nil {
-				if _, ok := eofs[file.Fd]; ok {
-					continue
-				}
-				var out io.WriteCloser
-				switch file.Fd {
-				case 1:
-					out = cfg.stdout
-				case 2:
-					out = cfg.stderr
-				default:
-					return errors.Errorf("unsupported fd %d", file.Fd)
-
-				}
-				if out == nil {
-					logrus.Warnf("attachIO: no writer for fd %d", file.Fd)
-					continue
-				}
-				if len(file.Data) > 0 {
-					if _, err := out.Write(file.Data); err != nil {
-						return err
-					}
-				}
-				if file.EOF {
-					eofs[file.Fd] = struct{}{}
-				}
-			} else {
-				return errors.Errorf("unexpected message: %T", msg.GetInput())
-			}
-		}
-	})
-
-	return eg.Wait()
-}
-
-func receive(ctx context.Context, stream msgStream) (*pb.Message, error) {
-	msgCh := make(chan *pb.Message)
-	errCh := make(chan error)
-	go func() {
-		msg, err := stream.Recv()
-		if err != nil {
-			if errors.Is(err, io.EOF) {
-				return
-			}
-			errCh <- err
-			return
-		}
-		msgCh <- msg
-	}()
-	select {
-	case msg := <-msgCh:
-		return msg, nil
-	case err := <-errCh:
-		return nil, err
-	case <-ctx.Done():
-		return nil, ctx.Err()
-	}
-}
-
-func copyToStream(fd uint32, snd msgStream, r io.Reader) error {
-	for {
-		buf := make([]byte, 32*1024)
-		n, err := r.Read(buf)
-		if err != nil {
-			if err == io.EOF {
-				break // break loop and send EOF
-			}
-			return err
-		} else if n > 0 {
-			if snd.Send(&pb.Message{
-				Input: &pb.Message_File{
-					File: &pb.FdMessage{
-						Fd:   fd,
-						Data: buf[:n],
-					},
-				},
-			}); err != nil {
-				return err
-			}
-		}
-	}
-	return snd.Send(&pb.Message{
-		Input: &pb.Message_File{
-			File: &pb.FdMessage{
-				Fd:  fd,
-				EOF: true,
-			},
-		},
-	})
-}
-
-var sigToName = map[syscall.Signal]string{}
-
-func init() {
-	for name, value := range signal.SignalMap {
-		sigToName[value] = name
-	}
-}
-
-type debugStream struct {
-	msgStream
-	prefix string
-}
-
-func (s *debugStream) Send(msg *pb.Message) error {
-	switch m := msg.GetInput().(type) {
-	case *pb.Message_File:
-		if m.File.EOF {
-			logrus.Debugf("|---> File Message (sender:%v) fd=%d, EOF", s.prefix, m.File.Fd)
-		} else {
-			logrus.Debugf("|---> File Message (sender:%v) fd=%d, %d bytes", s.prefix, m.File.Fd, len(m.File.Data))
-		}
-	case *pb.Message_Resize:
-		logrus.Debugf("|---> Resize Message (sender:%v): %+v", s.prefix, m.Resize)
-	case *pb.Message_Signal:
-		logrus.Debugf("|---> Signal Message (sender:%v): %s", s.prefix, m.Signal.Name)
-	}
-	return s.msgStream.Send(msg)
-}
-
-func (s *debugStream) Recv() (*pb.Message, error) {
-	msg, err := s.msgStream.Recv()
-	if err != nil {
-		return nil, err
-	}
-	switch m := msg.GetInput().(type) {
-	case *pb.Message_File:
-		if m.File.EOF {
-			logrus.Debugf("|<--- File Message (receiver:%v) fd=%d, EOF", s.prefix, m.File.Fd)
-		} else {
-			logrus.Debugf("|<--- File Message (receiver:%v) fd=%d, %d bytes", s.prefix, m.File.Fd, len(m.File.Data))
-		}
-	case *pb.Message_Resize:
-		logrus.Debugf("|<--- Resize Message (receiver:%v): %+v", s.prefix, m.Resize)
-	case *pb.Message_Signal:
-		logrus.Debugf("|<--- Signal Message (receiver:%v): %s", s.prefix, m.Signal.Name)
-	}
-	return msg, nil
-}
--- a/controller/remote/server.go
+++ b/controller/remote/server.go
@@ -1,439 +0,0 @@
-package remote
-
-import (
-	"context"
-	"io"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/docker/buildx/build"
-	controllererrors "github.com/docker/buildx/controller/errdefs"
-	"github.com/docker/buildx/controller/pb"
-	"github.com/docker/buildx/controller/processes"
-	"github.com/docker/buildx/util/ioset"
-	"github.com/docker/buildx/util/progress"
-	"github.com/docker/buildx/version"
-	"github.com/moby/buildkit/client"
-	"github.com/pkg/errors"
-	"golang.org/x/sync/errgroup"
-)
-
-type BuildFunc func(ctx context.Context, options *pb.BuildOptions, stdin io.Reader, progress progress.Writer) (resp *client.SolveResponse, res *build.ResultHandle, err error)
-
-func NewServer(buildFunc BuildFunc) *Server {
-	return &Server{
-		buildFunc: buildFunc,
-	}
-}
-
-type Server struct {
-	buildFunc BuildFunc
-	session   map[string]*session
-	sessionMu sync.Mutex
-}
-
-type session struct {
-	buildOnGoing atomic.Bool
-	statusChan   chan *pb.StatusResponse
-	cancelBuild  func()
-	buildOptions *pb.BuildOptions
-	inputPipe    *io.PipeWriter
-
-	result *build.ResultHandle
-
-	processes *processes.Manager
-}
-
-func (s *session) cancelRunningProcesses() {
-	s.processes.CancelRunningProcesses()
-}
-
-func (m *Server) ListProcesses(ctx context.Context, req *pb.ListProcessesRequest) (res *pb.ListProcessesResponse, err error) {
-	m.sessionMu.Lock()
-	defer m.sessionMu.Unlock()
-	s, ok := m.session[req.Ref]
-	if !ok {
-		return nil, errors.Errorf("unknown ref %q", req.Ref)
-	}
-	res = new(pb.ListProcessesResponse)
-	res.Infos = append(res.Infos, s.processes.ListProcesses()...)
-	return res, nil
-}
-
-func (m *Server) DisconnectProcess(ctx context.Context, req *pb.DisconnectProcessRequest) (res *pb.DisconnectProcessResponse, err error) {
-	m.sessionMu.Lock()
-	defer m.sessionMu.Unlock()
-	s, ok := m.session[req.Ref]
-	if !ok {
-		return nil, errors.Errorf("unknown ref %q", req.Ref)
-	}
-	return res, s.processes.DeleteProcess(req.ProcessID)
-}
-
-func (m *Server) Info(ctx context.Context, req *pb.InfoRequest) (res *pb.InfoResponse, err error) {
-	return &pb.InfoResponse{
-		BuildxVersion: &pb.BuildxVersion{
-			Package:  version.Package,
-			Version:  version.Version,
-			Revision: version.Revision,
-		},
-	}, nil
-}
-
-func (m *Server) List(ctx context.Context, req *pb.ListRequest) (res *pb.ListResponse, err error) {
-	keys := make(map[string]struct{})
-
-	m.sessionMu.Lock()
-	for k := range m.session {
-		keys[k] = struct{}{}
-	}
-	m.sessionMu.Unlock()
-
-	var keysL []string
-	for k := range keys {
-		keysL = append(keysL, k)
-	}
-	return &pb.ListResponse{
-		Keys: keysL,
-	}, nil
-}
-
-func (m *Server) Disconnect(ctx context.Context, req *pb.DisconnectRequest) (res *pb.DisconnectResponse, err error) {
-	key := req.Ref
-	if key == "" {
-		return nil, errors.New("disconnect: empty key")
-	}
-
-	m.sessionMu.Lock()
-	if s, ok := m.session[key]; ok {
-		if s.cancelBuild != nil {
-			s.cancelBuild()
-		}
-		s.cancelRunningProcesses()
-		if s.result != nil {
-			s.result.Done()
-		}
-	}
-	delete(m.session, key)
-	m.sessionMu.Unlock()
-
-	return &pb.DisconnectResponse{}, nil
-}
-
-func (m *Server) Close() error {
-	m.sessionMu.Lock()
-	for k := range m.session {
-		if s, ok := m.session[k]; ok {
-			if s.cancelBuild != nil {
-				s.cancelBuild()
-			}
-			s.cancelRunningProcesses()
-		}
-	}
-	m.sessionMu.Unlock()
-	return nil
-}
-
-func (m *Server) Inspect(ctx context.Context, req *pb.InspectRequest) (*pb.InspectResponse, error) {
-	ref := req.Ref
-	if ref == "" {
-		return nil, errors.New("inspect: empty key")
-	}
-	var bo *pb.BuildOptions
-	m.sessionMu.Lock()
-	if s, ok := m.session[ref]; ok {
-		bo = s.buildOptions
-	} else {
-		m.sessionMu.Unlock()
-		return nil, errors.Errorf("inspect: unknown key %v", ref)
-	}
-	m.sessionMu.Unlock()
-	return &pb.InspectResponse{Options: bo}, nil
-}
-
-func (m *Server) Build(ctx context.Context, req *pb.BuildRequest) (*pb.BuildResponse, error) {
-	ref := req.Ref
-	if ref == "" {
-		return nil, errors.New("build: empty key")
-	}
-
-	// Prepare status channel and session
-	m.sessionMu.Lock()
-	if m.session == nil {
-		m.session = make(map[string]*session)
-	}
-	s, ok := m.session[ref]
-	if ok {
-		if !s.buildOnGoing.CompareAndSwap(false, true) {
-			m.sessionMu.Unlock()
-			return &pb.BuildResponse{}, errors.New("build ongoing")
-		}
-		s.cancelRunningProcesses()
-		s.result = nil
-	} else {
-		s = &session{}
-		s.buildOnGoing.Store(true)
-	}
-
-	s.processes = processes.NewManager()
-	statusChan := make(chan *pb.StatusResponse)
-	s.statusChan = statusChan
-	inR, inW := io.Pipe()
-	defer inR.Close()
-	s.inputPipe = inW
-	m.session[ref] = s
-	m.sessionMu.Unlock()
-	defer func() {
-		close(statusChan)
-		m.sessionMu.Lock()
-		s, ok := m.session[ref]
-		if ok {
-			s.statusChan = nil
-			s.buildOnGoing.Store(false)
-		}
-		m.sessionMu.Unlock()
-	}()
-
-	pw := pb.NewProgressWriter(statusChan)
-
-	// Build the specified request
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-	resp, res, buildErr := m.buildFunc(ctx, req.Options, inR, pw)
-	m.sessionMu.Lock()
-	if s, ok := m.session[ref]; ok {
-		// NOTE: buildFunc can return *build.ResultHandle even on error (e.g. when it's implemented using (github.com/docker/buildx/controller/build).RunBuild).
-		if res != nil {
-			s.result = res
-			s.cancelBuild = cancel
-			s.buildOptions = req.Options
-			m.session[ref] = s
-			if buildErr != nil {
-				buildErr = controllererrors.WrapBuild(buildErr, ref)
-			}
-		}
-	} else {
-		m.sessionMu.Unlock()
-		return nil, errors.Errorf("build: unknown key %v", ref)
-	}
-	m.sessionMu.Unlock()
-
-	if buildErr != nil {
-		return nil, buildErr
-	}
-
-	if resp == nil {
-		resp = &client.SolveResponse{}
-	}
-	return &pb.BuildResponse{
-		ExporterResponse: resp.ExporterResponse,
-	}, nil
-}
-
-func (m *Server) Status(req *pb.StatusRequest, stream pb.Controller_StatusServer) error {
-	ref := req.Ref
-	if ref == "" {
-		return errors.New("status: empty key")
-	}
-
-	// Wait and get status channel prepared by Build()
-	var statusChan <-chan *pb.StatusResponse
-	for {
-		// TODO: timeout?
-		m.sessionMu.Lock()
-		if _, ok := m.session[ref]; !ok || m.session[ref].statusChan == nil {
-			m.sessionMu.Unlock()
-			time.Sleep(time.Millisecond) // TODO: wait Build without busy loop and make it cancellable
-			continue
-		}
-		statusChan = m.session[ref].statusChan
-		m.sessionMu.Unlock()
-		break
-	}
-
-	// forward status
-	for ss := range statusChan {
-		if ss == nil {
-			break
-		}
-		if err := stream.Send(ss); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Server) Input(stream pb.Controller_InputServer) (err error) {
-	// Get the target ref from init message
-	msg, err := stream.Recv()
-	if err != nil {
-		if !errors.Is(err, io.EOF) {
-			return err
-		}
-		return nil
-	}
-	init := msg.GetInit()
-	if init == nil {
-		return errors.Errorf("unexpected message: %T; wanted init", msg.GetInit())
-	}
-	ref := init.Ref
-	if ref == "" {
-		return errors.New("input: no ref is provided")
-	}
-
-	// Wait and get input stream pipe prepared by Build()
-	var inputPipeW *io.PipeWriter
-	for {
-		// TODO: timeout?
-		m.sessionMu.Lock()
-		if _, ok := m.session[ref]; !ok || m.session[ref].inputPipe == nil {
-			m.sessionMu.Unlock()
-			time.Sleep(time.Millisecond) // TODO: wait Build without busy loop and make it cancellable
-			continue
-		}
-		inputPipeW = m.session[ref].inputPipe
-		m.sessionMu.Unlock()
-		break
-	}
-
-	// Forward input stream
-	eg, ctx := errgroup.WithContext(context.TODO())
-	done := make(chan struct{})
-	msgCh := make(chan *pb.InputMessage)
-	eg.Go(func() error {
-		defer close(msgCh)
-		for {
-			msg, err := stream.Recv()
-			if err != nil {
-				if !errors.Is(err, io.EOF) {
-					return err
-				}
-				return nil
-			}
-			select {
-			case msgCh <- msg:
-			case <-done:
-				return nil
-			case <-ctx.Done():
-				return nil
-			}
-		}
-	})
-	eg.Go(func() (retErr error) {
-		defer close(done)
-		defer func() {
-			if retErr != nil {
-				inputPipeW.CloseWithError(retErr)
-				return
-			}
-			inputPipeW.Close()
-		}()
-		for {
-			var msg *pb.InputMessage
-			select {
-			case msg = <-msgCh:
-			case <-ctx.Done():
-				return errors.Wrap(ctx.Err(), "canceled")
-			}
-			if msg == nil {
-				return nil
-			}
-			if data := msg.GetData(); data != nil {
-				if len(data.Data) > 0 {
-					_, err := inputPipeW.Write(data.Data)
-					if err != nil {
-						return err
-					}
-				}
-				if data.EOF {
-					return nil
-				}
-			}
-		}
-	})
-
-	return eg.Wait()
-}
-
-func (m *Server) Invoke(srv pb.Controller_InvokeServer) error {
-	containerIn, containerOut := ioset.Pipe()
-	defer func() { containerOut.Close(); containerIn.Close() }()
-
-	initDoneCh := make(chan *processes.Process)
-	initErrCh := make(chan error)
-	eg, egCtx := errgroup.WithContext(context.TODO())
-	srvIOCtx, srvIOCancel := context.WithCancel(egCtx)
-	eg.Go(func() error {
-		defer srvIOCancel()
-		return serveIO(srvIOCtx, srv, func(initMessage *pb.InitMessage) (retErr error) {
-			defer func() {
-				if retErr != nil {
-					initErrCh <- retErr
-				}
-			}()
-			ref := initMessage.Ref
-			cfg := initMessage.InvokeConfig
-
-			m.sessionMu.Lock()
-			s, ok := m.session[ref]
-			if !ok {
-				m.sessionMu.Unlock()
-				return errors.Errorf("invoke: unknown key %v", ref)
-			}
-			m.sessionMu.Unlock()
-
-			pid := initMessage.ProcessID
-			if pid == "" {
-				return errors.Errorf("invoke: specify process ID")
-			}
-			proc, ok := s.processes.Get(pid)
-			if !ok {
-				// Start a new process.
-				if cfg == nil {
-					return errors.New("no container config is provided")
-				}
-				var err error
-				proc, err = s.processes.StartProcess(pid, s.result, cfg)
-				if err != nil {
-					return err
-				}
-			}
-			// Attach containerIn to this process
-			proc.ForwardIO(&containerIn, srvIOCancel)
-			initDoneCh <- proc
-			return nil
-		}, &ioServerConfig{
-			stdin:  containerOut.Stdin,
-			stdout: containerOut.Stdout,
-			stderr: containerOut.Stderr,
-			// TODO: signal, resize
-		})
-	})
-	eg.Go(func() (rErr error) {
-		defer srvIOCancel()
-		// Wait for init done
-		var proc *processes.Process
-		select {
-		case p := <-initDoneCh:
-			proc = p
-		case err := <-initErrCh:
-			return err
-		case <-egCtx.Done():
-			return egCtx.Err()
-		}
-
-		// Wait for IO done
-		select {
-		case <-srvIOCtx.Done():
-			return srvIOCtx.Err()
-		case err := <-proc.Done():
-			return err
-		case <-egCtx.Done():
-			return egCtx.Err()
-		}
-	})
-
-	return eg.Wait()
-}
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-  default = null
+  default = "1.19"
 }
 variable "DOCS_FORMATS" {
  default = "md"
@@ -59,13 +59,6 @@ target "validate-authors" {
  output = ["type=cacheonly"]
 }

-target "validate-generated-files" {
-  inherits = ["_common"]
-  dockerfile = "./hack/dockerfiles/generated-files.Dockerfile"
-  target = "validate"
-  output = ["type=cacheonly"]
-}
-
 target "update-vendor" {
  inherits = ["_common"]
  dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
@@ -91,13 +84,6 @@ target "update-authors" {
  output = ["."]
 }

-target "update-generated-files" {
-  inherits = ["_common"]
-  dockerfile = "./hack/dockerfiles/generated-files.Dockerfile"
-  target = "update"
-  output = ["."]
-}
-
 target "mod-outdated" {
  inherits = ["_common"]
  dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
@@ -156,29 +142,3 @@ target "image-local" {
  inherits = ["image"]
  output = ["type=docker"]
 }
-
-variable "HTTP_PROXY" {
-  default = ""
-}
-variable "HTTPS_PROXY" {
-  default = ""
-}
-variable "NO_PROXY" {
-  default = ""
-}
-
-target "integration-test-base" {
-  inherits = ["_common"]
-  args = {
-    HTTP_PROXY = HTTP_PROXY
-    HTTPS_PROXY = HTTPS_PROXY
-    NO_PROXY = NO_PROXY
-  }
-  target = "integration-test-base"
-  output = ["type=cacheonly"]
-}
-
-target "integration-test" {
-  inherits = ["integration-test-base"]
-  target = "integration-test"
-}
--- a/docs/bake-reference.md
+++ b/docs/bake-reference.md
--- a/docs/guides/cicd.md
+++ b/docs/guides/cicd.md
@@ -1,3 +1,48 @@
 # CI/CD

-This page has moved to [Docker Docs website](https://docs.docker.com/build/ci/)
+## GitHub Actions
+
+Docker provides a [GitHub Action that will build and push your image](https://github.com/docker/build-push-action/#about)
+using Buildx. Here is a simple workflow:
+
+```yaml
+name: ci
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: user/app:latest
+```
+
+In this example we are also using 3 other actions:
+
+* [`setup-buildx`](https://github.com/docker/setup-buildx-action) action will create and boot a builder using by
+default the `docker-container` [builder driver](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver).
+This is **not required but recommended** using it to be able to build multi-platform images, export cache, etc.
+* [`setup-qemu`](https://github.com/docker/setup-qemu-action) action can be useful if you want
+to add emulation support with QEMU to be able to build against more platforms.
+* [`login`](https://github.com/docker/login-action) action will take care to log
+in against a Docker registry.
--- a/docs/guides/cni-networking.md
+++ b/docs/guides/cni-networking.md
@@ -1,3 +1,23 @@
 # CNI networking

-This page has moved to [Docker Docs website](https://docs.docker.com/build/buildkit/configure/#cni-networking)
+It can be useful to use a bridge network for your builder if for example you
+encounter a network port contention during multiple builds. If you're using
+the BuildKit image, CNI is not yet available in it, but you can create
+[a custom BuildKit image with CNI support](https://github.com/moby/buildkit/blob/master/docs/cni-networking.md).
+
+Now build this image:
+
+```console
+$ docker buildx build --tag buildkit-cni:local --load .
+```
+
+Then [create a `docker-container` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/) that
+will use this image:
+
+```console
+$ docker buildx create --use \
+  --name mybuilder \
+  --driver docker-container \
+  --driver-opt "image=buildkit-cni:local" \
+  --buildkitd-flags "--oci-worker-net=cni"
+```
--- a/docs/guides/color-output.md
+++ b/docs/guides/color-output.md
@@ -1,3 +1,20 @@
 # Color output controls

-This page has moved to [Docker Docs website](https://docs.docker.com/build/building/env-vars/#buildkit_colors)
+Buildx has support for modifying the colors that are used to output information
+to the terminal. You can set the environment variable `BUILDKIT_COLORS` to
+something like `run=123,20,245:error=yellow:cancel=blue:warning=white` to set
+the colors that you would like to use:
+
+![Progress output custom colors](https://user-images.githubusercontent.com/1951866/180584033-24522385-cafd-4a54-a4a2-18f5ce74eb27.png)
+
+Setting `NO_COLOR` to anything will disable any colorized output as recommended
+by [no-color.org](https://no-color.org/):
+
+![Progress output no color](https://user-images.githubusercontent.com/1951866/180584037-e28f9997-dd4c-49cf-8b26-04864815de19.png)
+
+> **Note**
+>
+> Parsing errors will be reported but ignored. This will result in default
+> color values being used where needed.
+
+See also [the list of pre-defined colors](https://github.com/moby/buildkit/blob/master/util/progress/progressui/colors.go).
--- a/docs/guides/custom-network.md
+++ b/docs/guides/custom-network.md
@@ -1,3 +1,34 @@
 # Using a custom network

-This page has moved to [Docker Docs website](https://docs.docker.com/build/drivers/docker-container/#custom-network)
+[Create a network](https://docs.docker.com/engine/reference/commandline/network_create/)
+named `foonet`:
+
+```console
+$ docker network create foonet
+```
+
+[Create a `docker-container` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/)
+named `mybuilder` that will use this network:
+
+```console
+$ docker buildx create --use \
+  --name mybuilder \
+  --driver docker-container \
+  --driver-opt "network=foonet"
+```
+
+Boot and [inspect `mybuilder`](https://docs.docker.com/engine/reference/commandline/buildx_inspect/):
+
+```console
+$ docker buildx inspect --bootstrap
+```
+
+[Inspect the builder container](https://docs.docker.com/engine/reference/commandline/inspect/)
+and see what network is being used:
+
+{% raw %}
+```console
+$ docker inspect buildx_buildkit_mybuilder0 --format={{.NetworkSettings.Networks}}
+map[foonet:0xc00018c0c0]
+```
+{% endraw %}
--- a/docs/guides/custom-registry-config.md
+++ b/docs/guides/custom-registry-config.md
@@ -1,3 +1,63 @@
 # Using a custom registry configuration

-This page has moved to [Docker Docs website](https://docs.docker.com/build/buildkit/configure/#setting-registry-certificates)
+If you [create a `docker-container` or `kubernetes` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/) and
+have specified certificates for registries in the [BuildKit daemon configuration](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md),
+the files will be copied into the container under `/etc/buildkit/certs` and
+configuration will be updated to reflect that.
+
+Take the following `buildkitd.toml` configuration that will be used for
+pushing an image to this registry using self-signed certificates:
+
+```toml
+# /etc/buildkitd.toml
+debug = true
+[registry."myregistry.com"]
+  ca=["/etc/certs/myregistry.pem"]
+  [[registry."myregistry.com".keypair]]
+    key="/etc/certs/myregistry_key.pem"
+    cert="/etc/certs/myregistry_cert.pem"
+```
+
+Here we have configured a self-signed certificate for `myregistry.com` registry.
+
+Now [create a `docker-container` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/)
+that will use this BuildKit configuration:
+
+```console
+$ docker buildx create --use \
+  --name mybuilder \
+  --driver docker-container \
+  --config /etc/buildkitd.toml
+```
+
+Inspecting the builder container, you can see that buildkitd configuration
+has changed:
+
+```console
+$ docker exec -it buildx_buildkit_mybuilder0 cat /etc/buildkit/buildkitd.toml
+```
+```toml
+debug = true
+
+[registry]
+
+  [registry."myregistry.com"]
+    ca = ["/etc/buildkit/certs/myregistry.com/myregistry.pem"]
+
+    [[registry."myregistry.com".keypair]]
+      cert = "/etc/buildkit/certs/myregistry.com/myregistry_cert.pem"
+      key = "/etc/buildkit/certs/myregistry.com/myregistry_key.pem"
+```
+
+And certificates copied inside the container:
+
+```console
+$ docker exec -it buildx_buildkit_mybuilder0 ls /etc/buildkit/certs/myregistry.com/
+myregistry.pem    myregistry_cert.pem   myregistry_key.pem
+```
+
+Now you should be able to push to the registry with this builder:
+
+```console
+$ docker buildx build --push --tag myregistry.com/myimage:latest .
+```
--- a/docs/guides/debugging.md
+++ b/docs/guides/debugging.md
@@ -1,166 +0,0 @@
-# Debug monitor
-
-To assist with creating and debugging complex builds, Buildx provides a
-debugger to help you step through the build process and easily inspect the
-state of the build environment at any point.
-
-> **Note**
->
-> The debug monitor is a new experimental feature in recent versions of Buildx.
-> There are rough edges, known bugs, and missing features. Please try it out
-> and let us know what you think!
-
-## Starting the debugger
-
-To start the debugger, first, ensure that `BUILDX_EXPERIMENTAL=1` is set in
-your environment.
-
-```console
-$ export BUILDX_EXPERIMENTAL=1
-```
-
-To start a debug session for a build, you can use the `buildx debug` command with `--invoke` flag to specify a command to launch in the resulting image.
-`buildx debug` command provides `buildx debug build` subcommand that provides the same features as the normal `buildx build` command but allows launching the debugger session after the build.
-
-Arguments available after `buildx debug build` are the same as the normal `buildx build`.
-
-```console
-$ docker buildx debug --invoke /bin/sh build .
-[+] Building 4.2s (19/19) FINISHED
- => [internal] connecting to local controller                                                                                   0.0s
- => [internal] load build definition from Dockerfile                                                                            0.0s
- => => transferring dockerfile: 32B                                                                                             0.0s
- => [internal] load .dockerignore                                                                                               0.0s
- => => transferring context: 34B                                                                                                0.0s
- ...
-Launching interactive container. Press Ctrl-a-c to switch to monitor console
-Interactive container was restarted with process "dzz7pjb4pk1mj29xqrx0ac3oj". Press Ctrl-a-c to switch to the new container
-Switched IO
-/ #
-```
-
-This launches a `/bin/sh` process in the final stage of the image, and allows
-you to explore the contents of the image, without needing to export or load the
-image outside of the builder.
-
-For example, you can use `ls` to see the contents of the image:
-
-```console
-/ # ls
-bin    etc    lib    mnt    proc   run    srv    tmp    var
-dev    home   media  opt    root   sbin   sys    usr    work
-```
-
-Optional long form allows you specifying detailed configurations of the process. 
-It must be CSV-styled comma-separated key-value pairs.
-Supported keys are `args` (can be JSON array format), `entrypoint` (can be JSON array format), `env` (can be JSON array format), `user`, `cwd` and `tty` (bool).
-
-Example:
-
-```
-$ docker buildx debug --invoke 'entrypoint=["sh"],"args=[""-c"", ""env | grep -e FOO -e AAA""]","env=[""FOO=bar"", ""AAA=bbb""]"' build .
-```
-
-#### `on` flag
-
-If you want to start a debug session when a build fails, you can use
-`--on=error` to start a debug session when the build fails.
-
-```console
-$ docker buildx debug --on=error build .
-[+] Building 4.2s (19/19) FINISHED
- => [internal] connecting to local controller                                                                                   0.0s
- => [internal] load build definition from Dockerfile                                                                            0.0s
- => => transferring dockerfile: 32B                                                                                             0.0s
- => [internal] load .dockerignore                                                                                               0.0s
- => => transferring context: 34B                                                                                                0.0s
- ...
- => ERROR [shell 10/10] RUN bad-command
------
- > [shell 10/10] RUN bad-command:
-#0 0.049 /bin/sh: bad-command: not found
------
-Launching interactive container. Press Ctrl-a-c to switch to monitor console
-Interactive container was restarted with process "edmzor60nrag7rh1mbi4o9lm8". Press Ctrl-a-c to switch to the new container
-/ # 
-```
-
-This allows you to explore the state of the image when the build failed.
-
-#### Launch the debug session directly with `buildx debug` subcommand
-
-If you want to drop into a debug session without first starting the build, you
-can use `buildx debug` command to start a debug session.
-
-```
-$ docker buildx debug
-[+] Building 4.2s (19/19) FINISHED
- => [internal] connecting to local controller                                                                                   0.0s
-(buildx)
-```
-
-You can then use the commands available in [monitor mode](#monitor-mode) to
-start and observe the build.
-
-## Monitor mode
-
-By default, when debugging, you'll be dropped into a shell in the final stage.
-
-When you're in a debug shell, you can use the `Ctrl-a-c` key combination (press
-`Ctrl`+`a` together, lift, then press `c`) to toggle between the debug shell
-and the monitor mode. In monitor mode, you can run commands that control the
-debug environment.
-
-```console
-(buildx) help
-Available commands are:
-  attach	attach to a buildx server or a process in the container
-  disconnect	disconnect a client from a buildx server. Specific session ID can be specified an arg
-  exec		execute a process in the interactive container
-  exit		exits monitor
-  help		shows this message. Optionally pass a command name as an argument to print the detailed usage.
-  kill		kill buildx server
-  list		list buildx sessions
-  ps		list processes invoked by "exec". Use "attach" to attach IO to that process
-  reload	reloads the context and build it
-  rollback	re-runs the interactive container with the step's rootfs contents
-```
-
-## Build controllers
-
-Debugging is performed using a buildx "controller", which provides a high-level
-abstraction to perform builds. By default, the local controller is used for a
-more stable experience which runs all builds in-process. However, you can also
-use the remote controller to detach the build process from the CLI.
-
-To detach the build process from the CLI, you can use the `--detach=true` flag with
-the build command.
-
-```console
-$ docker buildx debug --invoke /bin/sh build --detach=true .
-```
-
-If you start a debugging session using the `--invoke` flag with a detached
-build, then you can attach to it using the `buildx debug` command to
-immediately enter the monitor mode.
-
-```console
-$ docker buildx debug
-[+] Building 0.0s (1/1) FINISHED                                                                                                                                                                                
- => [internal] connecting to remote controller
-(buildx) list
-ID                              CURRENT_SESSION
-xfe1162ovd9def8yapb4ys66t       false
-(buildx) attach xfe1162ovd9def8yapb4ys66t
-Attached to process "". Press Ctrl-a-c to switch to the new container
-(buildx) ps
-PID                             CURRENT_SESSION COMMAND
-3ug8iqaufiwwnukimhqqt06jz       false           [sh]
-(buildx) attach 3ug8iqaufiwwnukimhqqt06jz
-Attached to process "3ug8iqaufiwwnukimhqqt06jz". Press Ctrl-a-c to switch to the new container
-(buildx) Switched IO
-/ # ls
-bin    etc    lib    mnt    proc   run    srv    tmp    var
-dev    home   media  opt    root   sbin   sys    usr    work
-/ # 
-```
--- a/docs/guides/opentelemetry.md
+++ b/docs/guides/opentelemetry.md
@@ -1,3 +1,31 @@
 # OpenTelemetry support

-This page has moved to [Docker Docs website](https://docs.docker.com/build/building/opentelemetry/)
+To capture the trace to [Jaeger](https://github.com/jaegertracing/jaeger), set
+`JAEGER_TRACE` environment variable to the collection address using a `driver-opt`.
+
+First create a Jaeger container:
+
+```console
+$ docker run -d --name jaeger -p "6831:6831/udp" -p "16686:16686" jaegertracing/all-in-one
+```
+
+Then [create a `docker-container` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/)
+that will use the Jaeger instance via the `JAEGER_TRACE` env var:
+
+```console
+$ docker buildx create --use \
+  --name mybuilder \
+  --driver docker-container \
+  --driver-opt "network=host" \
+  --driver-opt "env.JAEGER_TRACE=localhost:6831"
+```
+
+Boot and [inspect `mybuilder`](https://docs.docker.com/engine/reference/commandline/buildx_inspect/):
+
+```console
+$ docker buildx inspect --bootstrap
+```
+
+Buildx commands should be traced at `http://127.0.0.1:16686/`:
+
+![OpenTelemetry Buildx Bake](https://user-images.githubusercontent.com/1951866/124468052-ef085400-dd98-11eb-84ab-7ac8e261dd52.png)
--- a/docs/guides/registry-mirror.md
+++ b/docs/guides/registry-mirror.md
@@ -1,3 +1,62 @@
 # Registry mirror

-This page has moved to [Docker Docs website](https://docs.docker.com/build/buildkit/configure/#registry-mirror)
+You can define a registry mirror to use for your builds by providing a [BuildKit daemon configuration](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md)
+while creating a builder with the [`--config` flags](https://docs.docker.com/engine/reference/commandline/buildx_create/#config).
+
+```toml
+# /etc/buildkitd.toml
+debug = true
+[registry."docker.io"]
+  mirrors = ["mirror.gcr.io"]
+```
+
+> **Note**
+>
+> `debug = true` has been added to be able to debug requests
+> in the BuildKit daemon and see if the mirror is effectively used.
+
+Then [create a `docker-container` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/)
+that will use this BuildKit configuration:
+
+```console
+$ docker buildx create --use \
+  --name mybuilder \
+  --driver docker-container \
+  --config /etc/buildkitd.toml
+```
+
+Boot and [inspect `mybuilder`](https://docs.docker.com/engine/reference/commandline/buildx_inspect/):
+
+```console
+$ docker buildx inspect --bootstrap
+```
+
+Build an image:
+
+```console
+$ docker buildx build --load . -f-<<EOF
+FROM alpine
+RUN echo "hello world"
+EOF
+```
+
+Now let's check the BuildKit logs in the builder container:
+
+```console
+$ docker logs buildx_buildkit_mybuilder0
+```
+```text
+...
+time="2022-02-06T17:47:48Z" level=debug msg="do request" request.header.accept="application/vnd.docker.container.image.v1+json, */*" request.header.user-agent=containerd/1.5.8+unknown request.method=GET spanID=9460e5b6e64cec91 traceID=b162d3040ddf86d6614e79c66a01a577
+time="2022-02-06T17:47:48Z" level=debug msg="fetch response received" response.header.accept-ranges=bytes response.header.age=1356 response.header.alt-svc="h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\"" response.header.cache-control="public, max-age=3600" response.header.content-length=1469 response.header.content-type=application/octet-stream response.header.date="Sun, 06 Feb 2022 17:25:17 GMT" response.header.etag="\"774380abda8f4eae9a149e5d5d3efc83\"" response.header.expires="Sun, 06 Feb 2022 18:25:17 GMT" response.header.last-modified="Wed, 24 Nov 2021 21:07:57 GMT" response.header.server=UploadServer response.header.x-goog-generation=1637788077652182 response.header.x-goog-hash="crc32c=V3DSrg==" response.header.x-goog-hash.1="md5=d0OAq9qPTq6aFJ5dXT78gw==" response.header.x-goog-metageneration=1 response.header.x-goog-storage-class=STANDARD response.header.x-goog-stored-content-encoding=identity response.header.x-goog-stored-content-length=1469 response.header.x-guploader-uploadid=ADPycduqQipVAXc3tzXmTzKQ2gTT6CV736B2J628smtD1iDytEyiYCgvvdD8zz9BT1J1sASUq9pW_ctUyC4B-v2jvhIxnZTlKg response.status="200 OK" spanID=9460e5b6e64cec91 traceID=b162d3040ddf86d6614e79c66a01a577
+time="2022-02-06T17:47:48Z" level=debug msg="fetch response received" response.header.accept-ranges=bytes response.header.age=760 response.header.alt-svc="h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\"" response.header.cache-control="public, max-age=3600" response.header.content-length=1471 response.header.content-type=application/octet-stream response.header.date="Sun, 06 Feb 2022 17:35:13 GMT" response.header.etag="\"35d688bd15327daafcdb4d4395e616a8\"" response.header.expires="Sun, 06 Feb 2022 18:35:13 GMT" response.header.last-modified="Wed, 24 Nov 2021 21:07:12 GMT" response.header.server=UploadServer response.header.x-goog-generation=1637788032100793 response.header.x-goog-hash="crc32c=aWgRjA==" response.header.x-goog-hash.1="md5=NdaIvRUyfar8201DleYWqA==" response.header.x-goog-metageneration=1 response.header.x-goog-storage-class=STANDARD response.header.x-goog-stored-content-encoding=identity response.header.x-goog-stored-content-length=1471 response.header.x-guploader-uploadid=ADPycdtR-gJYwC7yHquIkJWFFG8FovDySvtmRnZBqlO3yVDanBXh_VqKYt400yhuf0XbQ3ZMB9IZV2vlcyHezn_Pu3a1SMMtiw response.status="200 OK" spanID=9460e5b6e64cec91 traceID=b162d3040ddf86d6614e79c66a01a577
+time="2022-02-06T17:47:48Z" level=debug msg=fetch spanID=9460e5b6e64cec91 traceID=b162d3040ddf86d6614e79c66a01a577
+time="2022-02-06T17:47:48Z" level=debug msg=fetch spanID=9460e5b6e64cec91 traceID=b162d3040ddf86d6614e79c66a01a577
+time="2022-02-06T17:47:48Z" level=debug msg=fetch spanID=9460e5b6e64cec91 traceID=b162d3040ddf86d6614e79c66a01a577
+time="2022-02-06T17:47:48Z" level=debug msg=fetch spanID=9460e5b6e64cec91 traceID=b162d3040ddf86d6614e79c66a01a577
+time="2022-02-06T17:47:48Z" level=debug msg="do request" request.header.accept="application/vnd.docker.image.rootfs.diff.tar.gzip, */*" request.header.user-agent=containerd/1.5.8+unknown request.method=GET spanID=9460e5b6e64cec91 traceID=b162d3040ddf86d6614e79c66a01a577
+time="2022-02-06T17:47:48Z" level=debug msg="fetch response received" response.header.accept-ranges=bytes response.header.age=1356 response.header.alt-svc="h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\"" response.header.cache-control="public, max-age=3600" response.header.content-length=2818413 response.header.content-type=application/octet-stream response.header.date="Sun, 06 Feb 2022 17:25:17 GMT" response.header.etag="\"1d55e7be5a77c4a908ad11bc33ebea1c\"" response.header.expires="Sun, 06 Feb 2022 18:25:17 GMT" response.header.last-modified="Wed, 24 Nov 2021 21:07:06 GMT" response.header.server=UploadServer response.header.x-goog-generation=1637788026431708 response.header.x-goog-hash="crc32c=ZojF+g==" response.header.x-goog-hash.1="md5=HVXnvlp3xKkIrRG8M+vqHA==" response.header.x-goog-metageneration=1 response.header.x-goog-storage-class=STANDARD response.header.x-goog-stored-content-encoding=identity response.header.x-goog-stored-content-length=2818413 response.header.x-guploader-uploadid=ADPycdsebqxiTBJqZ0bv9zBigjFxgQydD2ESZSkKchpE0ILlN9Ibko3C5r4fJTJ4UR9ddp-UBd-2v_4eRpZ8Yo2llW_j4k8WhQ response.status="200 OK" spanID=9460e5b6e64cec91 traceID=b162d3040ddf86d6614e79c66a01a577
+...
+```
+
+As you can see, requests come from the GCR registry mirror (`response.header.x-goog*`).
--- a/docs/guides/resource-limiting.md
+++ b/docs/guides/resource-limiting.md
@@ -1,3 +1,33 @@
 # Resource limiting

-This page has moved to [Docker Docs website](https://docs.docker.com/build/buildkit/configure/#resource-limiting)
+## Max parallelism
+
+You can limit the parallelism of the BuildKit solver, which is particularly useful
+for low-powered machines, using a [BuildKit daemon configuration](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md)
+while creating a builder with the [`--config` flags](https://docs.docker.com/engine/reference/commandline/buildx_create/#config).
+
+```toml
+# /etc/buildkitd.toml
+[worker.oci]
+  max-parallelism = 4
+```
+
+Now you can [create a `docker-container` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/)
+that will use this BuildKit configuration to limit parallelism.
+
+```console
+$ docker buildx create --use \
+  --name mybuilder \
+  --driver docker-container \
+  --config /etc/buildkitd.toml
+```
+
+## Limit on TCP connections
+
+We are also now limiting TCP connections to **4 per registry** with an additional
+connection not used for layer pulls and pushes. This limitation will be able to
+manage TCP connection per host to avoid your build being stuck while pulling
+images. The additional connection is used for metadata requests
+(image config retrieval) to enhance the overall build time.
+
+More info: [moby/buildkit#2259](https://github.com/moby/buildkit/pull/2259)
--- a/docs/manuals/README.md
+++ b/docs/manuals/README.md
@@ -0,0 +1,14 @@
+# Buildx manuals 📚
+
+This directory contains a bunch of useful docs for how to use Buildx features.
+
+> **Note**
+>
+> The markdown files in this directory (excluding this README) are reused
+> downstream by the
+> [Docker documentation repository](https://github.com/docker/docs).
+>
+> If you wish to contribute to these docs, be sure to first review the
+> [documentation contribution guidelines](https://docs.docker.com/contribute/overview/).
+>
+> Thank you!
--- a/docs/manuals/bake/build-contexts.md
+++ b/docs/manuals/bake/build-contexts.md
@@ -1,3 +1,3 @@
 # Defining additional build contexts and linking targets

-This page has moved to [Docker Docs website](https://docs.docker.com/build/bake/build-contexts)
+Moved to [docs.docker.com](https://docs.docker.com/build/bake/build-contexts)
--- a/docs/manuals/bake/compose-file.md
+++ b/docs/manuals/bake/compose-file.md
@@ -1,3 +1,3 @@
 # Building from Compose file

-This page has moved to [Docker Docs website](https://docs.docker.com/build/bake/compose-file)
+Moved to [docs.docker.com](https://docs.docker.com/build/bake/compose-file)
--- a/docs/manuals/bake/configuring-build.md
+++ b/docs/manuals/bake/configuring-build.md
@@ -1,3 +1,3 @@
 # Configuring builds

-This page has moved to [Docker Docs website](https://docs.docker.com/build/bake/configuring-build)
+Moved to [docs.docker.com](https://docs.docker.com/build/bake/configuring-build)
--- a/docs/manuals/bake/file-definition.md
+++ b/docs/manuals/bake/file-definition.md
@@ -1,3 +1,3 @@
 # Bake file definition

-This page has moved to [docs/bake-reference.md](../../bake-reference.md)
+Moved to [docs.docker.com](https://docs.docker.com/build/bake/file-definition)
--- a/docs/manuals/bake/hcl-funcs.md
+++ b/docs/manuals/bake/hcl-funcs.md
@@ -1,3 +1,3 @@
 # User defined HCL functions

-This page has moved to [Docker Docs website](https://docs.docker.com/build/bake/hcl-funcs)
+Moved to [docs.docker.com](https://docs.docker.com/build/bake/hcl-funcs)
--- a/docs/manuals/bake/index.md
+++ b/docs/manuals/bake/index.md
@@ -1,3 +1,3 @@
 # High-level build options with Bake

-This page has moved to [Docker Docs website](https://docs.docker.com/build/bake)
+Moved to [docs.docker.com](https://docs.docker.com/build/bake)
--- a/docs/manuals/cache/backends/azblob.md
+++ b/docs/manuals/cache/backends/azblob.md
@@ -1,3 +1,3 @@
 # Azure Blob Storage cache storage

-This page has moved to [Docker Docs website](https://docs.docker.com/build/building/cache/backends/azblob)
+Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends/azblob)
--- a/docs/manuals/cache/backends/gha.md
+++ b/docs/manuals/cache/backends/gha.md
@@ -1,3 +1,3 @@
 # GitHub Actions cache storage

-This page has moved to [Docker Docs website](https://docs.docker.com/build/building/cache/backends/gha)
+Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends/gha)
--- a/docs/manuals/cache/backends/index.md
+++ b/docs/manuals/cache/backends/index.md
@@ -1,3 +1,3 @@
 # Cache storage backends

-This page has moved to [Docker Docs website](https://docs.docker.com/build/building/cache/backends)
+Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tõnis Tiigi	00ed17df6d	Merge pull request #1569 from tonistiigi/v0.10.2-picks [v0.10] cherry-picks for v0.10.2	2023-01-30 11:57:04 -08:00
CrazyMax	cfb71fab97	build: better message output for git provenance Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit `6db696748b`)	2023-01-30 11:46:51 -08:00
CrazyMax	f62342768b	build: silently fail if git remote not found Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit `4789d2219c`)	2023-01-30 11:46:42 -08:00
Tonis Tiigi	7776652a4d	build: fix multi-node merge to read descriptor from result Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit `c33b310b48`)	2023-01-30 11:46:12 -08:00
Akihiro Suda	5a4f80f3ce	bake: SOURCE_DATE_EPOCH: fix `panic: assignment to entry in nil map` Fix issue 1562 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit `1f56f51740`)	2023-01-30 11:45:50 -08:00
CrazyMax	b5ea79e277	build: fix preferred platform not taken account Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit `49b3c0dba5`)	2023-01-30 11:45:15 -08:00
Tõnis Tiigi	481796f84f	Merge pull request #1556 from crazy-max/0.10.1_cherry_picks [v0.10] cherry-picks for v0.10.1	2023-01-26 11:02:55 -08:00
Tonis Tiigi	0090d49e57	vendor: update buildkit to v0.11.2 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit `f6da7ee135`)	2023-01-26 10:34:57 -08:00
CrazyMax	389ac0c3d1	build: set remote origin url Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit `c1058c17aa`)	2023-01-26 13:36:58 +01:00
Justin Chadwell	2bb8ce2f57	build: create error group per opt Using the syncronization primitive, we can avoid needing to create a separate wait group. This allows us to sidestep the issue where the wait group could be completed, but the build invocation functions had not terminated - if one of the functions was to terminate with an error, then it was possible to encounter a race condition, where the result handling code would begin executing, despite an error. The refactor to use a separate error group which more elegantly handles the concept of function returns and errors, ensures that we can't encounter this issue. Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `8b7aa1a168`)	2023-01-26 13:36:57 +01:00
Justin Chadwell	65cea456fd	build: reorder error group funcs Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `1180d919f5`)	2023-01-26 13:36:57 +01:00
Justin Chadwell	f7bd5b99da	build: use copy for BuildWithResultHandler loop vars Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `347417ee12`)	2023-01-26 13:36:57 +01:00
Justin Chadwell	8c14407fa2	imagetools: silence intoto warnings Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `7145e021f9`)	2023-01-26 13:36:57 +01:00
CrazyMax	5245a2b3ff	rm: do not check for context builders when removing inactive This change has been introduced in `e7b5ee7518` but we should not check context builders when removing inactive ones. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit `6cd0c11ab1`)	2023-01-26 13:36:28 +01:00
Tonis Tiigi	44d99d4573	build: mark capabilities request as internal So it doesn't show up in the History API. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit `be55b41427`)	2023-01-26 13:35:46 +01:00
David Karlsson	14942a266e	docs: fix broken link in buildx_bake CLI reference Signed-off-by: David Karlsson <david.karlsson@docker.com> (cherry picked from commit `ba8fa6c403`)	2023-01-26 13:33:13 +01:00
CrazyMax	123febf107	ci: fix typo in docs-release workflow Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit `523a16aa35`)	2023-01-26 13:32:58 +01:00
Batuhan Apaydın	3f5f7c5228	fix the directory of the buildx binary Signed-off-by: Batuhan Apaydın <batuhan.apaydin@trendyol.com> (cherry picked from commit `edb16f8aab`)	2023-01-26 13:32:34 +01:00
Justin Chadwell	6d935625a6	Merge pull request #1546 from jedevc/v0.10-inspect-lazy-attestations [v0.10] Lazily load attestation data in imagetools inspect	2023-01-24 12:41:13 +00:00
Justin Chadwell	e640dc6041	Merge pull request #1545 from jedevc/v0.10-error-on-attestations-docker [v0.10] build: error when using docker exporter and attestations	2023-01-24 12:41:03 +00:00
Justin Chadwell	08244b12b5	Merge pull request #1544 from jedevc/v0.10-bump-ci [v0.10] Bump Buildx and BuildKit versions in GitHub actions	2023-01-24 12:40:52 +00:00
Justin Chadwell	78d8b926db	inspect: lazily load attestation data Delay loading the attestation data immediately, and only compute it upon request. We do this using a deferred function which allows to define the computation in the same place as before, but perform the computation later. With this patch, we ensure that the attestation data is only pulled from the remote if it is actually referenced in the format string - otherwise, we can skip it, for improved performance. Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-24 12:10:57 +00:00
Justin Chadwell	19291d900e	inspect: move attestation loading to struct methods This refactor ensures that the attestations are not output in the JSON output for "{{ json . }}", and additionally allows future refactors to dynamically load the attestation contents, ensuring faster performance when attestations are not used in the output. Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-24 12:10:57 +00:00
Justin Chadwell	ed9b4a7169	build: error when using docker exporter and attestations Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `43a748fd15`) Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-24 12:07:43 +00:00
Justin Chadwell	033d5629c0	build: avoid compatability error when attestations disabled We should avoid erroring with attestations support compatability errors when a user has specified --provenance=false. A user may wish to enable --provenance=false that works across buildkit versions, but currently it will fail on old versions - this patch fixes this, to silently ignore the provenance flag for this check if it's set to disabled. Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `15a80b56b5`) Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-24 12:07:34 +00:00
Justin Chadwell	7cd5add568	ci: update buildkit release version in build pipeline Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `c1ab55a3f2`) Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-24 11:50:58 +00:00
Justin Chadwell	2a000096fa	ci: update buildx release version in build pipeline Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `bc1d590ca7`) Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-24 11:50:53 +00:00
Tõnis Tiigi	b7781447d7	Merge pull request #1530 from thaJeztah/0.10_backport_update_buildkit [0.10 backport] vendor: github.com/moby/buildkit v0.11.1	2023-01-24 00:50:03 -08:00
Sebastiaan van Stijn	f6ba0a23f8	vendor: github.com/moby/buildkit v0.11.1 full diff: https://github.com/moby/buildkit/compare/v0.11.0...v0.11.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `01e1c28dd9`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-01-18 20:58:27 +01:00
CrazyMax	bf4b95fc3a	Merge pull request #1524 from jedevc/v0.10-docs-reference-attest [0.10] docs: add reference for new attest family of flags	2023-01-17 16:24:18 +01:00
Justin Chadwell	467586dc8d	docs: add reference for new attest family of flags Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-17 13:48:19 +00:00
Tõnis Tiigi	8764628976	Merge pull request #1501 from tonistiigi/v0.10-picks [v0.10] cherry-picks	2023-01-09 16:10:12 -08:00
Justin Chadwell	583fe71740	docs: update with new inspect output Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `9818055b0e`)	2023-01-09 15:53:42 -08:00
Justin Chadwell	9fb3ff1a27	inspect: change additional spdxs to not have duplicates Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `484823c97d`)	2023-01-09 15:53:37 -08:00
Justin Chadwell	9d4f38c5fa	inspect: provide access to multiple spdx documents Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `3ce17b01dc`)	2023-01-09 15:53:34 -08:00
Justin Chadwell	793082f543	inspect: parse sbom and provenance into json structs Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `e68c566c1c`)	2023-01-09 15:53:29 -08:00
Justin Chadwell	fe6f697205	inspect: break after first matching attestation Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit `19d16aa941`)	2023-01-09 15:53:13 -08:00
Tonis Tiigi	fd3fb752d3	github: update CI to buildkit v0.11 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit `571871b084`)	2023-01-09 15:52:51 -08:00
CrazyMax	7fcea64eb4	Merge pull request #1496 from thaJeztah/0.10_backport_docs_updates [0.10 backport] update anchor-links and cli-docs-tool v0.5.1	2023-01-09 15:52:56 +01:00
Sebastiaan van Stijn	05e0ce4953	go.mod: update cli-docs-tool v0.5.1 and re-generate docs Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `c97500b117`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-01-09 13:05:27 +01:00
Sebastiaan van Stijn	f8d9d1e776	docs: update anchor links Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `b8285c17e6`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-01-09 13:05:27 +01:00
CrazyMax	8a7a221a7f	imagetools inspect: handle provenance and sbom use stub structs for SLSA/SBOM while waiting for go-imageinspect library to be public. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2023-01-06 16:33:47 -08:00
CrazyMax	e4db8d2a21	imagetools inspect: missing annotations key Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2023-01-06 16:33:47 -08:00
Justin Chadwell	7394853ddf	vendor: update buildkit to v0.11.0-rc4 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-06 16:33:46 -08:00
Justin Chadwell	a8be6b576b	docs: update oci layout with tag resolution Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-06 16:33:46 -08:00
Justin Chadwell	8b960ededd	build: refactor reference parsing for image layouts We allow any valid image reference format for the oci-layout, not just limiting to name@digest, we additionally allow images of the form name:tag@digest now. The name of the reference is used to find the local directory to lookup the store in, while the tag and digest are attached to a random identity to generate the dummy reference sent to the oci-layout context. This separation of the target to replace and the value to replace it with ensures that any tag or digest set in the client is properly sent across to the server. The tag is used when a digest was not specified, and it is resolved in the context of the local directory before being sent, using the same helpers as we use for the local cache expoter. Signed-off-by: Justin Chadwell <me@jedevc.com>	2023-01-06 16:33:46 -08:00
CrazyMax	4735a71fbd	e2e: use native k3s installation script debianmaster/actions-k3s action gives some warnings in our e2e workflow. This commit brings https://github.com/debianmaster/actions-k3s/blob/master/index.js directly in the workflow through actions/github-script with some changes to properly wait for nodes to be up. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2023-01-06 16:33:46 -08:00
Tõnis Tiigi	37fce8cc06	Merge pull request #1489 from AkihiroSuda/cherrypick-1482-v0.10 [0.10] Propagate SOURCE_DATE_EPOCH from the client env	2023-01-05 23:45:21 -08:00
Akihiro Suda	82476ab039	Propagate SOURCE_DATE_EPOCH from the client env Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit `0e6f5a155e`) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>	2023-01-05 08:48:27 +09:00