Merge pull request #1018 from tonistiigi/v0.8-compose-target-dot

[v0.8] bake: allow dot in target names for compose

.dockerignore

@@ -1 +1,3 @@
 bin/
+cross-out/
+release-out/

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    open-pull-requests-limit: 10
-    directory: "/"
-    schedule:
-      interval: "daily"
-    labels:
-      - "dependencies"
-      - "bot"

.github/workflows/build.yml

@@ -1,9 +1,5 @@
 name: build
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   workflow_dispatch:
   push:
@@ -16,126 +12,48 @@ on:
     branches:
       - 'master'
       - 'v[0-9]*'
-    paths-ignore:
-      - 'README.md'
-      - 'docs/**'
 
 env:
-  BUILDX_VERSION: "latest"
-  BUILDKIT_IMAGE: "moby/buildkit:latest"
   REPO_SLUG: "docker/buildx-bin"
-  DESTDIR: "./bin"
+  RELEASE_OUT: "./release-out"
 
 jobs:
-  test:
-    runs-on: ubuntu-22.04
+  build:
+    runs-on: ubuntu-latest
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: ${{ env.BUILDX_VERSION }}
-          driver-opts: image=${{ env.BUILDKIT_IMAGE }}
-          buildkitd-flags: --debug
+        uses: docker/setup-buildx-action@v1
       -
         name: Test
-        uses: docker/bake-action@v2
-        with:
-          targets: test
-          set: |
-            *.cache-from=type=gha,scope=test
-            *.cache-to=type=gha,scope=test
-      -
-        name: Upload coverage
-        uses: codecov/codecov-action@v3
-        with:
-          directory: ${{ env.DESTDIR }}/coverage
-
-  prepare:
-    runs-on: ubuntu-22.04
-    outputs:
-      matrix: ${{ steps.platforms.outputs.matrix }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Create matrix
-        id: platforms
         run: |
-          echo "matrix=$(docker buildx bake binaries-cross --print | jq -cr '.target."binaries-cross".platforms')" >>${GITHUB_OUTPUT}
+          make test
       -
-        name: Show matrix
-        run: |
-          echo ${{ steps.platforms.outputs.matrix }}
-
-  binaries:
-    runs-on: ubuntu-22.04
-    needs:
-      - prepare
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: ${{ fromJson(needs.prepare.outputs.matrix) }}
-    steps:
-      -
-        name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        name: Send to Codecov
+        uses: codecov/codecov-action@v2
         with:
-          version: ${{ env.BUILDX_VERSION }}
-          driver-opts: image=${{ env.BUILDKIT_IMAGE }}
-          buildkitd-flags: --debug
+          file: ./coverage/coverage.txt
       -
-        name: Build
+        name: Build binaries
         run: |
           make release
-        env:
-          PLATFORMS: ${{ matrix.platform }}
-          CACHE_FROM: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }}
-          CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }},mode=max
       -
         name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: buildx
-          path: ${{ env.DESTDIR }}/*
+          path: ${{ env.RELEASE_OUT }}/*
           if-no-files-found: error
-
-  bin-image:
-    runs-on: ubuntu-22.04
-    if: ${{ github.event_name != 'pull_request' }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: ${{ env.BUILDX_VERSION }}
-          driver-opts: image=${{ env.BUILDKIT_IMAGE }}
-          buildkitd-flags: --debug
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v3
         with:
           images: |
             ${{ env.REPO_SLUG }}
@@ -147,80 +65,48 @@ jobs:
       -
         name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push image
-        uses: docker/bake-action@v2
+        uses: docker/bake-action@v1
         with:
           files: |
             ./docker-bake.hcl
             ${{ steps.meta.outputs.bake-file }}
           targets: image-cross
           push: ${{ github.event_name != 'pull_request' }}
-          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:
-      - binaries
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Download binaries
-        uses: actions/download-artifact@v3
-        with:
-          name: buildx
-          path: ${{ env.DESTDIR }}
-      -
-        name: Create checksums
-        run: ./hack/hash-files
-      -
-        name: List artifacts
-        run: |
-          tree -nh ${{ env.DESTDIR }}
-      -
-        name: Check artifacts
-        run: |
-          find ${{ env.DESTDIR }} -type f -exec file -e ascii -- {} +
       -
         name: GitHub Release
         if: startsWith(github.ref, 'refs/tags/v')
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           draft: true
-          files: ${{ env.DESTDIR }}/*
+          files: ${{ env.RELEASE_OUT }}/*
 
   buildkit-edge:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     continue-on-error: true
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
         with:
-          version: ${{ env.BUILDX_VERSION }}
           driver-opts: image=moby/buildkit:master
           buildkitd-flags: --debug
       -
         # Just run a bake target to check eveything runs fine
         name: Build
-        uses: docker/bake-action@v2
+        uses: docker/bake-action@v1
         with:
-          targets: binaries
+          targets: binaries-cross

.github/workflows/docs-release.yml

@@ -1,58 +0,0 @@
-name: docs-release
-
-on:
-  release:
-    types:
-      - released
-
-jobs:
-  open-pr:
-    runs-on: ubuntu-22.04
-    if: "!github.event.release.prerelease"
-    steps:
-      -
-        name: Checkout docs repo
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GHPAT_DOCS_DISPATCH }}
-          repository: docker/docs
-          ref: main
-      -
-        name: Prepare
-        run: |
-          rm -rf ./_data/buildx/*
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Build docs
-        uses: docker/bake-action@v2
-        with:
-          source: ${{ github.server_url }}/${{ github.repository }}.git#${{ github.event.release.name }}
-          targets: update-docs
-          set: |
-            *.output=/tmp/buildx-docs
-        env:
-          DOCS_FORMATS: yaml
-      -
-        name: Copy files
-        run: |
-          cp /tmp/buildx-docs/out/reference/*.yaml ./_data/buildx/
-      -
-        name: Commit changes
-        run: |
-          git add -A .
-      -
-        name: Create PR on docs repo
-        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
-        with:
-          token: ${{ secrets.GHPAT_DOCS_DISPATCH }}
-          push-to-fork: docker-tools-robot/docker.github.io
-          commit-message: "build: update buildx reference to ${{ github.event.release.name }}"
-          signoff: true
-          branch: dispatch/buildx-ref-${{ github.event.release.name }}
-          delete-branch: true
-          title: Update buildx reference to ${{ github.event.release.name }}
-          body: |
-            Update the buildx reference documentation to keep in sync with the latest release `${{ github.event.release.name }}`
-          draft: false

.github/workflows/docs-upstream.yml

@@ -1,61 +0,0 @@
-# this workflow runs the remote validate bake target from docker/docker.github.io
-# to check if yaml reference docs and markdown files used in this repo are still valid
-# https://github.com/docker/docker.github.io/blob/98c7c9535063ae4cd2cd0a31478a21d16d2f07a3/docker-bake.hcl#L34-L36
-name: docs-upstream
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'v[0-9]*'
-    paths:
-      - '.github/workflows/docs-upstream.yml'
-      - 'docs/**'
-  pull_request:
-    paths:
-      - '.github/workflows/docs-upstream.yml'
-      - 'docs/**'
-
-jobs:
-  docs-yaml:
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-      -
-        name: Build reference YAML docs
-        uses: docker/bake-action@v2
-        with:
-          targets: update-docs
-          set: |
-            *.output=/tmp/buildx-docs
-            *.cache-from=type=gha,scope=docs-yaml
-            *.cache-to=type=gha,scope=docs-yaml,mode=max
-        env:
-          DOCS_FORMATS: yaml
-      -
-        name: Upload reference YAML docs
-        uses: actions/upload-artifact@v3
-        with:
-          name: docs-yaml
-          path: /tmp/buildx-docs/out/reference
-          retention-days: 1
-
-  validate:
-    uses: docker/docs/.github/workflows/validate-upstream.yml@main
-    needs:
-      - docs-yaml
-    with:
-      repo: https://github.com/${{ github.repository }}
-      data-files-id: docs-yaml
-      data-files-folder: buildx

.github/workflows/e2e.yml

@@ -1,9 +1,5 @@
 name: e2e
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   workflow_dispatch:
   push:
@@ -14,51 +10,10 @@ on:
     branches:
       - 'master'
       - 'v[0-9]*'
-    paths-ignore:
-      - 'README.md'
-      - 'docs/**'
-
-env:
-  DESTDIR: "./bin"
-  K3S_VERSION: "v1.21.2-k3s1"
 
 jobs:
-  build:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-      -
-        name: Build
-        uses: docker/bake-action@v2
-        with:
-          targets: binaries
-          set: |
-            *.cache-from=type=gha,scope=release
-            *.cache-from=type=gha,scope=binaries
-            *.cache-to=type=gha,scope=binaries
-      -
-        name: Rename binary
-        run: |
-          mv ${{ env.DESTDIR }}/build/buildx ${{ env.DESTDIR }}/build/docker-buildx
-      -
-        name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: binary
-          path: ${{ env.DESTDIR }}/build
-          if-no-files-found: error
-          retention-days: 7
-
   driver:
     runs-on: ubuntu-20.04
-    needs:
-      - build
     strategy:
       fail-fast: false
       matrix:
@@ -66,7 +21,6 @@ jobs:
           - docker
           - docker-container
           - kubernetes
-          - remote
         buildkit:
           - moby/buildkit:buildx-stable-1
           - moby/buildkit:master
@@ -82,8 +36,6 @@ jobs:
         include:
           - driver: kubernetes
             driver-opt: qemu.install=true
-          - driver: remote
-            endpoint: tcp://localhost:1234
         exclude:
           - driver: docker
             multi-node: mnode-true
@@ -91,28 +43,18 @@ jobs:
             buildkit-cfg: bkcfg-true
           - driver: docker-container
             multi-node: mnode-true
-          - driver: remote
-            multi-node: mnode-true
-          - driver: remote
-            buildkit-cfg: bkcfg-true
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1
         if: matrix.driver == 'docker' || matrix.driver == 'docker-container'
       -
         name: Install buildx
-        uses: actions/download-artifact@v3
-        with:
-          name: binary
-          path: /home/runner/.docker/cli-plugins
-      -
-        name: Fix perms and check
         run: |
-          chmod +x /home/runner/.docker/cli-plugins/docker-buildx
+          make install
           docker buildx version
       -
         name: Init env vars
@@ -134,78 +76,20 @@ jobs:
       -
         name: Install k3s
         if: matrix.driver == 'kubernetes'
-        uses: actions/github-script@v6
+        uses: debianmaster/actions-k3s@v1.0.3
+        id: k3s
         with:
-          script: |
-            const fs = require('fs');
-            
-            let wait = function(milliseconds) {
-              return new Promise((resolve, reject) => {
-                if (typeof(milliseconds) !== 'number') { 
-                  throw new Error('milleseconds not a number'); 
-                }
-                setTimeout(() => resolve("done!"), milliseconds)
-              });
-            }
-            
-            try {
-              const kubeconfig="/tmp/buildkit-k3s/kubeconfig.yaml";
-              core.info(`storing kubeconfig in ${kubeconfig}`);
-          
-              await exec.exec('docker', ["run", "-d",
-                "--privileged",
-                "--name=buildkit-k3s",
-                "-e", "K3S_KUBECONFIG_OUTPUT="+kubeconfig,
-                "-e", "K3S_KUBECONFIG_MODE=666",
-                "-v", "/tmp/buildkit-k3s:/tmp/buildkit-k3s",
-                "-p", "6443:6443",
-                "-p", "80:80",
-                "-p", "443:443",
-                "-p", "8080:8080",
-                "rancher/k3s:${{ env.K3S_VERSION }}", "server"
-              ]);
-              await wait(10000);
-              
-              core.exportVariable('KUBECONFIG', kubeconfig);
-              
-              let nodeName;
-              for (let count = 1; count <= 5; count++) {
-                try {
-                  const nodeNameOutput = await exec.getExecOutput("kubectl get nodes --no-headers -oname");
-                  nodeName = nodeNameOutput.stdout
-                } catch (error) {
-                  core.info(`Unable to resolve node name (${error.message}). Attempt ${count} of 5.`)
-                } finally {
-                  if (nodeName) {
-                    break;
-                  }
-                  await wait(5000);
-                }
-              }
-              if (!nodeName) {
-                throw new Error(`Unable to resolve node name after 5 attempts.`);
-              }
-              
-              await exec.exec(`kubectl wait --for=condition=Ready ${nodeName}`);
-            } catch (error) {
-              core.setFailed(error.message);
-            }
+          version: v1.21.2-k3s1
       -
-        name: Print KUBECONFIG
+        name: Config k3s
         if: matrix.driver == 'kubernetes'
         run: |
-          yq ${{ env.KUBECONFIG }}
+          (set -x ; cat ${{ steps.k3s.outputs.kubeconfig }})
       -
-        name: Launch remote buildkitd
-        if: matrix.driver == 'remote'
+        name: Check k3s nodes
+        if: matrix.driver == 'kubernetes'
         run: |
-          docker run -d \
-            --privileged \
-            --name=remote-buildkit \
-            -p 1234:1234 \
-            ${{ matrix.buildkit }} \
-            --addr unix:///run/buildkit/buildkitd.sock \
-            --addr tcp://0.0.0.0:1234
+          kubectl get nodes
       -
         name: Test
         run: |
@@ -214,5 +98,4 @@ jobs:
           BUILDKIT_IMAGE: ${{ matrix.buildkit }}
           DRIVER: ${{ matrix.driver }}
           DRIVER_OPT: ${{ matrix.driver-opt }}
-          ENDPOINT: ${{ matrix.endpoint }}
           PLATFORMS: ${{ matrix.platforms }}

.github/workflows/godev.yml

@@ -0,0 +1,25 @@
+# Workflow used to make a request to proxy.golang.org to refresh cache on https://pkg.go.dev/github.com/docker/buildx
+# when a released of buildx is produced
+name: godev
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.13
+      -
+        name: Call pkg.go.dev
+        run: |
+          go get github.com/${GITHUB_REPOSITORY}@${GITHUB_REF#refs/tags/}
+        env:
+          GO111MODULE: on
+          GOPROXY: https://proxy.golang.org

.github/workflows/validate.yml

@@ -1,9 +1,5 @@
 name: validate
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   workflow_dispatch:
   push:
@@ -19,7 +15,7 @@ on:
 
 jobs:
   validate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -30,13 +26,23 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
+        uses: actions/checkout@v2
       -
         name: Run
         run: |
           make ${{ matrix.target }}
+
+  validate-docs-yaml:
+    runs-on: ubuntu-latest
+    needs:
+      - validate
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Run
+        run: |
+          make docs
+        env:
+          FORMATS: yaml

.gitignore

@@ -1 +1,4 @@
-/bin
+bin
+coverage
+cross-out
+release-out

.golangci.yml

@@ -12,29 +12,19 @@ linters:
     - gofmt
     - govet
     - deadcode
-    - depguard
     - goimports
     - ineffassign
     - misspell
     - unused
     - varcheck
-    - revive
+    - golint
     - staticcheck
     - typecheck
-    - nolintlint
+    - structcheck
   disable-all: true
 
-linters-settings:
-  depguard:
-    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
+        - golint
       text: "stutters"

.yamllint.yml

@@ -0,0 +1,13 @@
+ignore: |
+  /vendor
+
+extends: default
+
+yaml-files:
+  - '*.yaml'
+  - '*.yml'
+
+rules:
+  truthy: disable
+  line-length: disable
+  document-start: disable

Dockerfile

@@ -1,13 +1,12 @@
-# syntax=docker/dockerfile-upstream:1.5.0
+# syntax=docker/dockerfile:1.3
 
-ARG GO_VERSION=1.19
-ARG XX_VERSION=1.1.2
-ARG DOCKERD_VERSION=20.10.14
+ARG GO_VERSION=1.17
+ARG DOCKERD_VERSION=20.10.8
 
 FROM docker:$DOCKERD_VERSION AS dockerd-release
 
 # xx is a helper for cross-compilation
-FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
+FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.0.0 AS xx
 
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS golatest
 
@@ -15,30 +14,26 @@ FROM golatest AS gobase
 COPY --from=xx / /
 RUN apk add --no-cache file git
 ENV GOFLAGS=-mod=vendor
-ENV CGO_ENABLED=0
 WORKDIR /src
 
 FROM gobase AS buildx-version
-RUN --mount=type=bind,target=. <<EOT
-  set -e
-  mkdir /buildx-version
-  echo -n "$(./hack/git-meta version)" | tee /buildx-version/version
-  echo -n "$(./hack/git-meta revision)" | tee /buildx-version/revision
-EOT
+RUN --mount=target=. \
+  PKG=github.com/docker/buildx VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi); \
+  echo "-X ${PKG}/version.Version=${VERSION} -X ${PKG}/version.Revision=${REVISION} -X ${PKG}/version.Package=${PKG}" | tee /tmp/.ldflags; \
+  echo -n "${VERSION}" | tee /tmp/.version;
 
 FROM gobase AS buildx-build
+ENV CGO_ENABLED=0
+ARG LDFLAGS="-w -s"
 ARG TARGETPLATFORM
 RUN --mount=type=bind,target=. \
   --mount=type=cache,target=/root/.cache \
   --mount=type=cache,target=/go/pkg/mod \
-  --mount=type=bind,from=buildx-version,source=/buildx-version,target=/buildx-version <<EOT
-  set -e
-  xx-go --wrap
-  DESTDIR=/usr/bin VERSION=$(cat /buildx-version/version) REVISION=$(cat /buildx-version/revision) GO_EXTRA_LDFLAGS="-s -w" ./hack/build
-  xx-verify --static /usr/bin/docker-buildx
-EOT
+  --mount=type=bind,source=/tmp/.ldflags,target=/tmp/.ldflags,from=buildx-version \
+  set -x; xx-go build -ldflags "$(cat /tmp/.ldflags) ${LDFLAGS}" -o /usr/bin/buildx ./cmd/buildx && \
+  xx-verify --static /usr/bin/buildx
 
-FROM gobase AS test
+FROM buildx-build AS test
 RUN --mount=type=bind,target=. \
   --mount=type=cache,target=/root/.cache \
   --mount=type=cache,target=/go/pkg/mod \
@@ -49,28 +44,23 @@ FROM scratch AS test-coverage
 COPY --from=test /tmp/coverage.txt /coverage.txt
 
 FROM scratch AS binaries-unix
-COPY --link --from=buildx-build /usr/bin/docker-buildx /buildx
+COPY --from=buildx-build /usr/bin/buildx /
 
 FROM binaries-unix AS binaries-darwin
 FROM binaries-unix AS binaries-linux
 
 FROM scratch AS binaries-windows
-COPY --link --from=buildx-build /usr/bin/docker-buildx /buildx.exe
+COPY --from=buildx-build /usr/bin/buildx /buildx.exe
 
 FROM binaries-$TARGETOS AS binaries
-# enable scanning for this stage
-ARG BUILDKIT_SBOM_SCAN_STAGE=true
 
 # Release
 FROM --platform=$BUILDPLATFORM alpine AS releaser
 WORKDIR /work
 ARG TARGETPLATFORM
 RUN --mount=from=binaries \
-  --mount=type=bind,from=buildx-version,source=/buildx-version,target=/buildx-version <<EOT
-  set -e
-  mkdir -p /out
-  cp buildx* "/out/buildx-$(cat /buildx-version/version).$(echo $TARGETPLATFORM | sed 's/\//-/g')$(ls buildx* | sed -e 's/^buildx//')"
-EOT
+  --mount=type=bind,source=/tmp/.version,target=/tmp/.version,from=buildx-version \
+  mkdir -p /out && cp buildx* "/out/buildx-$(cat /tmp/.version).$(echo $TARGETPLATFORM | sed 's/\//-/g')$(ls buildx* | sed -e 's/^buildx//')"
 
 FROM scratch AS release
 COPY --from=releaser /out/ /

MAINTAINERS

@@ -152,7 +152,6 @@ made through a pull request.
 		people = [
 			"akihirosuda",
 			"crazy-max",
-			"jedevc",
 			"tiborvass",
 			"tonistiigi",
 		]
@@ -189,11 +188,6 @@ made through a pull request.
 	Email = "contact@crazymax.dev"
 	GitHub = "crazy-max"
 
-	[people.jedevc]
-	Name = "Justin Chadwell"
-	Email = "me@jedevc.com"
-	GitHub = "jedevc"
-
 	[people.thajeztah]
 	Name = "Sebastiaan van Stijn"
 	Email = "github@gone.nl"

Makefile

@@ -4,77 +4,59 @@ else ifneq (, $(shell docker buildx version))
 	export BUILDX_CMD = docker buildx
 else ifneq (, $(shell which buildx))
 	export BUILDX_CMD = $(which buildx)
+else
+	$(error "Buildx is required: https://github.com/docker/buildx#installing")
 endif
 
-export BUILDX_CMD ?= docker buildx
+export BIN_OUT = ./bin
+export RELEASE_OUT = ./release-out
 
-.PHONY: all
-all: binaries
-
-.PHONY: build
-build:
-	./hack/build
-
-.PHONY: shell
 shell:
 	./hack/shell
 
-.PHONY: binaries
 binaries:
 	$(BUILDX_CMD) bake binaries
 
-.PHONY: binaries-cross
 binaries-cross:
 	$(BUILDX_CMD) bake binaries-cross
 
-.PHONY: install
 install: binaries
 	mkdir -p ~/.docker/cli-plugins
-	install bin/build/buildx ~/.docker/cli-plugins/docker-buildx
+	install bin/buildx ~/.docker/cli-plugins/docker-buildx
 
-.PHONY: release
 release:
 	./hack/release
 
-.PHONY: validate-all
 validate-all: lint test validate-vendor validate-docs
 
-.PHONY: lint
 lint:
 	$(BUILDX_CMD) bake lint
 
-.PHONY: test
 test:
 	$(BUILDX_CMD) bake test
 
-.PHONY: validate-vendor
 validate-vendor:
 	$(BUILDX_CMD) bake validate-vendor
 
-.PHONY: validate-docs
 validate-docs:
 	$(BUILDX_CMD) bake validate-docs
 
-.PHONY: validate-authors
 validate-authors:
 	$(BUILDX_CMD) bake validate-authors
 
-.PHONY: test-driver
 test-driver:
 	./hack/test-driver
 
-.PHONY: vendor
 vendor:
 	./hack/update-vendor
 
-.PHONY: docs
 docs:
 	./hack/update-docs
 
-.PHONY: authors
 authors:
 	$(BUILDX_CMD) bake update-authors
 
-.PHONY: mod-outdated
 mod-outdated:
 	$(BUILDX_CMD) bake mod-outdated
+
+.PHONY: shell binaries binaries-cross install release validate-all lint validate-vendor validate-docs validate-authors vendor docs authors

README.md

@@ -2,7 +2,7 @@
 
 [![GitHub release](https://img.shields.io/github/release/docker/buildx.svg?style=flat-square)](https://github.com/docker/buildx/releases/latest)
 [![PkgGoDev](https://img.shields.io/badge/go.dev-docs-007d9c?style=flat-square&logo=go&logoColor=white)](https://pkg.go.dev/github.com/docker/buildx)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/docker/buildx/build.yml?branch=master&label=build&logo=github&style=flat-square)](https://github.com/docker/buildx/actions?query=workflow%3Abuild)
+[![Build Status](https://img.shields.io/github/workflow/status/docker/buildx/build?label=build&logo=github&style=flat-square)](https://github.com/docker/buildx/actions?query=workflow%3Abuild)
 [![Go Report Card](https://goreportcard.com/badge/github.com/docker/buildx?style=flat-square)](https://goreportcard.com/report/github.com/docker/buildx)
 [![codecov](https://img.shields.io/codecov/c/github/docker/buildx?logo=codecov&style=flat-square)](https://codecov.io/gh/docker/buildx)
 
@@ -32,19 +32,14 @@ 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)
+  - [High-level build options](#high-level-build-options)
 - [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)
+  - [Using a custom network](docs/guides/custom-network.md)
+  - [Using a custom registry configuration](docs/guides/custom-registry-config.md)
 - [Reference](docs/reference/buildx.md)
   - [`buildx bake`](docs/reference/buildx_bake.md)
   - [`buildx build`](docs/reference/buildx_build.md)
@@ -126,8 +121,7 @@ On Windows:
 Here is how to install and use Buildx inside a Dockerfile through the
 [`docker/buildx-bin`](https://hub.docker.com/r/docker/buildx-bin) image:
 
-```dockerfile
-# syntax=docker/dockerfile:1
+```Dockerfile
 FROM docker
 COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
 RUN docker buildx version
@@ -147,7 +141,7 @@ To remove this alias, run [`docker buildx uninstall`](docs/reference/buildx_unin
 # Buildx 0.6+
 $ docker buildx bake "https://github.com/docker/buildx.git"
 $ mkdir -p ~/.docker/cli-plugins
-$ mv ./bin/build/buildx ~/.docker/cli-plugins/docker-buildx
+$ mv ./bin/buildx ~/.docker/cli-plugins/docker-buildx
 
 # Docker 19.03+
 $ DOCKER_BUILDKIT=1 docker build --platform=local -o . "https://github.com/docker/buildx.git"
@@ -189,17 +183,23 @@ specifying target platform. In addition, Buildx also supports new features that
 are not yet available for regular `docker build` like building manifest lists,
 distributed caching, and exporting build results to OCI image tarballs.
 
-Buildx is flexible and can be run in different configurations that are exposed
-through various "drivers". Each driver defines how and where a build should
-run, and have different feature sets.
+Buildx is supposed to be flexible and can be run in different configurations
+that are exposed through a driver concept. Currently, we support a
+[`docker` driver](docs/reference/buildx_create.md#docker-driver) that uses
+the BuildKit library bundled into the Docker daemon binary, a
+[`docker-container` driver](docs/reference/buildx_create.md#docker-container-driver)
+that automatically launches BuildKit inside a Docker container and a
+[`kubernetes` driver](docs/reference/buildx_create.md#kubernetes-driver) to
+spin up pods with defined BuildKit container image to build your images. We
+plan to add more drivers in the future.
 
-We currently support the following drivers:
-- The `docker` driver ([guide](docs/manuals/drivers/docker.md), [reference](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver))
-- The `docker-container` driver ([guide](docs/manuals/drivers/docker-container.md), [reference](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver))
-- The `kubernetes` driver ([guide](docs/manuals/drivers/kubernetes.md), [reference](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver))
-- The `remote` driver ([guide](docs/manuals/drivers/remote.md))
-
-For more information on drivers, see the [drivers guide](docs/manuals/drivers/index.md).
+The user experience of using buildx is very similar across drivers, but there
+are some features that are not currently supported by the `docker` driver,
+because the BuildKit library bundled into docker daemon currently uses a
+different storage component. In contrast, all images built with `docker` driver
+are automatically added to the `docker images` view by default, whereas when
+using other drivers the method for outputting an image needs to be selected
+with `--output`.
 
 ## Working with builder instances
 
@@ -302,7 +302,6 @@ inside your Dockerfile and can be leveraged by the processes running as part
 of your build.
 
 ```dockerfile
-# syntax=docker/dockerfile:1
 FROM --platform=$BUILDPLATFORM golang:alpine AS build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -316,7 +315,26 @@ cross-compilation helpers for more advanced use-cases.
 
 ## High-level build options
 
-See [`docs/manuals/bake/index.md`](docs/manuals/bake/index.md) for more details.
+Buildx also aims to provide support for high-level build concepts that go beyond
+invoking a single build command. We want to support building all the images in
+your application together and let the users define project specific reusable
+build flows that can then be easily invoked by anyone.
+
+BuildKit efficiently handles multiple concurrent build requests and
+de-duplicating work. The build commands can be combined with general-purpose
+command runners (for example, `make`). However, these tools generally invoke
+builds in sequence  and therefore cannot leverage the full potential of BuildKit
+parallelization, or combine BuildKit’s output for the user. For this use case,
+we have added a command called [`docker buildx bake`](docs/reference/buildx_bake.md).
+
+The `bake` command supports building images from compose files, similar to
+[`docker-compose build`](https://docs.docker.com/compose/reference/build/),
+but allowing all the services to be built concurrently as part of a single
+request.
+
+There is also support for custom build rules from HCL/JSON files allowing
+better code reuse and different target groups. The design of bake is in very
+early stages and we are looking for feedback from users.
 
 # Contributing
 

bake/bake.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/csv"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -17,8 +17,7 @@ import (
 	"github.com/docker/buildx/build"
 	"github.com/docker/buildx/util/buildflags"
 	"github.com/docker/buildx/util/platformutil"
-	"github.com/docker/cli/cli/config"
-	"github.com/docker/docker/builder/remotecontext/urlutil"
+	"github.com/docker/docker/pkg/urlutil"
 	hcl "github.com/hashicorp/hcl/v2"
 	"github.com/moby/buildkit/client/llb"
 	"github.com/moby/buildkit/session/auth/authprovider"
@@ -29,8 +28,10 @@ var (
 	httpPrefix                   = regexp.MustCompile(`^https?://`)
 	gitURLPathWithFragmentSuffix = regexp.MustCompile(`\.git(?:#.+)?$`)
 
-	validTargetNameChars = `[a-zA-Z0-9_-]+`
-	targetNamePattern    = regexp.MustCompile(`^` + validTargetNameChars + `$`)
+	validTargetNameChars        = `[a-zA-Z0-9_-]+`
+	validTargetNameCharsCompose = `[a-zA-Z0-9._-]+`
+	targetNamePattern           = regexp.MustCompile(`^` + validTargetNameChars + `$`)
+	targetNamePatternCompose    = regexp.MustCompile(`^` + validTargetNameCharsCompose + `$`)
 )
 
 type File struct {
@@ -66,12 +67,12 @@ func ReadLocalFiles(names []string) ([]File, error) {
 		var dt []byte
 		var err error
 		if n == "-" {
-			dt, err = io.ReadAll(os.Stdin)
+			dt, err = ioutil.ReadAll(os.Stdin)
 			if err != nil {
 				return nil, err
 			}
 		} else {
-			dt, err = os.ReadFile(n)
+			dt, err = ioutil.ReadFile(n)
 			if err != nil {
 				if isDefault && errors.Is(err, os.ErrNotExist) {
 					continue
@@ -84,54 +85,53 @@ func ReadLocalFiles(names []string) ([]File, error) {
 	return out, nil
 }
 
-func ReadTargets(ctx context.Context, files []File, targets, overrides []string, defaults map[string]string) (map[string]*Target, map[string]*Group, error) {
+func ReadTargets(ctx context.Context, files []File, targets, overrides []string, defaults map[string]string) (map[string]*Target, []*Group, error) {
 	c, err := ParseFiles(files, defaults)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	for i, t := range targets {
-		targets[i] = sanitizeTargetName(t)
-	}
-
 	o, err := c.newOverrides(overrides)
 	if err != nil {
 		return nil, nil, err
 	}
 	m := map[string]*Target{}
-	n := map[string]*Group{}
-	for _, target := range targets {
-		ts, gs := c.ResolveGroup(target)
-		for _, tname := range ts {
-			t, err := c.ResolveTarget(tname, o)
+	for _, n := range targets {
+		for _, n := range c.ResolveGroup(n) {
+			t, err := c.ResolveTarget(n, o)
 			if err != nil {
 				return nil, nil, err
 			}
 			if t != nil {
-				m[tname] = t
-			}
-		}
-		for _, gname := range gs {
-			for _, group := range c.Groups {
-				if group.Name == gname {
-					n[gname] = group
-					break
-				}
+				m[n] = t
 			}
 		}
 	}
 
-	for _, target := range targets {
-		if target == "default" {
-			continue
+	var g []*Group
+	if len(targets) == 0 || (len(targets) == 1 && targets[0] == "default") {
+		for _, group := range c.Groups {
+			if group.Name != "default" {
+				continue
+			}
+			g = []*Group{{Targets: group.Targets}}
 		}
-		if _, ok := n["default"]; !ok {
-			n["default"] = &Group{Name: "default"}
+	} else {
+		var gt []string
+		for _, target := range targets {
+			isGroup := false
+			for _, group := range c.Groups {
+				if target == group.Name {
+					gt = append(gt, group.Targets...)
+					isGroup = true
+					break
+				}
+			}
+			if !isGroup {
+				gt = append(gt, target)
+			}
 		}
-		n["default"].Targets = append(n["default"].Targets, target)
-	}
-	if g, ok := n["default"]; ok {
-		g.Targets = dedupSlice(g.Targets)
+		g = []*Group{{Targets: dedupString(gt)}}
 	}
 
 	for name, t := range m {
@@ -140,23 +140,10 @@ 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
+	return m, g, nil
 }
 
-func dedupSlice(s []string) []string {
+func dedupString(s []string) []string {
 	if len(s) == 0 {
 		return s
 	}
@@ -171,54 +158,21 @@ func dedupSlice(s []string) []string {
 	return res
 }
 
-func dedupMap(ms ...map[string]string) map[string]string {
-	if len(ms) == 0 {
-		return nil
-	}
-	res := map[string]string{}
-	for _, m := range ms {
-		if len(m) == 0 {
-			continue
-		}
-		for k, v := range m {
-			if _, ok := res[k]; !ok {
-				res[k] = v
-			}
-		}
-	}
-	return res
-}
-
-func sliceToMap(env []string) (res map[string]string) {
-	res = make(map[string]string)
-	for _, s := range env {
-		kv := strings.SplitN(s, "=", 2)
-		key := kv[0]
-		switch {
-		case len(kv) == 1:
-			res[key] = ""
-		default:
-			res[key] = kv[1]
-		}
-	}
-	return
-}
-
 func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error) {
 	defer func() {
 		err = formatHCLError(err, files)
 	}()
 
 	var c Config
-	var composeFiles []File
-	var hclFiles []*hcl.File
+	var fs []*hcl.File
 	for _, f := range files {
-		isCompose, composeErr := validateComposeFile(f.Data, f.Name)
+		cfg, isCompose, composeErr := ParseComposeFile(f.Data, f.Name)
 		if isCompose {
 			if composeErr != nil {
 				return nil, composeErr
 			}
-			composeFiles = append(composeFiles, f)
+			c = mergeConfig(c, *cfg)
+			c = dedupeConfig(c)
 		}
 		if !isCompose {
 			hf, isHCL, err := ParseHCLFile(f.Data, f.Name)
@@ -226,7 +180,7 @@ func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error)
 				if err != nil {
 					return nil, err
 				}
-				hclFiles = append(hclFiles, hf)
+				fs = append(fs, hf)
 			} else if composeErr != nil {
 				return nil, fmt.Errorf("failed to parse %s: parsing yaml: %v, parsing hcl: %w", f.Name, composeErr, err)
 			} else {
@@ -235,17 +189,8 @@ func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error)
 		}
 	}
 
-	if len(composeFiles) > 0 {
-		cfg, cmperr := ParseComposeFiles(composeFiles)
-		if cmperr != nil {
-			return nil, errors.Wrap(cmperr, "failed to parse compose file")
-		}
-		c = mergeConfig(c, *cfg)
-		c = dedupeConfig(c)
-	}
-
-	if len(hclFiles) > 0 {
-		if err := hclparser.Parse(hcl.MergeFiles(hclFiles), hclparser.Opt{
+	if len(fs) > 0 {
+		if err := hclparser.Parse(hcl.MergeFiles(fs), hclparser.Opt{
 			LookupVar:     os.LookupEnv,
 			Vars:          defaults,
 			ValidateLabel: validateTargetName,
@@ -253,25 +198,18 @@ func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error)
 			return nil, err
 		}
 	}
-
 	return &c, nil
 }
 
 func dedupeConfig(c Config) Config {
 	c2 := c
-	c2.Groups = make([]*Group, 0, len(c2.Groups))
-	for _, g := range c.Groups {
-		g1 := *g
-		g1.Targets = dedupSlice(g1.Targets)
-		c2.Groups = append(c2.Groups, &g1)
-	}
 	c2.Targets = make([]*Target, 0, len(c2.Targets))
-	mt := map[string]*Target{}
+	m := map[string]*Target{}
 	for _, t := range c.Targets {
-		if t2, ok := mt[t.Name]; ok {
+		if t2, ok := m[t.Name]; ok {
 			t2.Merge(t)
 		} else {
-			mt[t.Name] = t
+			m[t.Name] = t
 			c2.Targets = append(c2.Targets, t)
 		}
 	}
@@ -282,9 +220,22 @@ func ParseFile(dt []byte, fn string) (*Config, error) {
 	return ParseFiles([]File{{Data: dt, Name: fn}}, nil)
 }
 
+func ParseComposeFile(dt []byte, fn string) (*Config, bool, error) {
+	fnl := strings.ToLower(fn)
+	if strings.HasSuffix(fnl, ".yml") || strings.HasSuffix(fnl, ".yaml") {
+		cfg, err := ParseCompose(dt)
+		return cfg, true, err
+	}
+	if strings.HasSuffix(fnl, ".json") || strings.HasSuffix(fnl, ".hcl") {
+		return nil, false, nil
+	}
+	cfg, err := ParseCompose(dt)
+	return cfg, err == nil, err
+}
+
 type Config struct {
-	Groups  []*Group  `json:"group" hcl:"group,block" cty:"group"`
-	Targets []*Target `json:"target" hcl:"target,block" cty:"target"`
+	Groups  []*Group  `json:"group" hcl:"group,block"`
+	Targets []*Target `json:"target" hcl:"target,block"`
 }
 
 func mergeConfig(c1, c2 Config) Config {
@@ -383,7 +334,6 @@ func (c Config) loadLinks(name string, t *Target, m map[string]*Target, o map[st
 					return err
 				}
 				t2.Outputs = nil
-				t2.linked = true
 				m[target] = t2
 			}
 			if err := c.loadLinks(target, t2, m, o, visited); err != nil {
@@ -430,7 +380,7 @@ func (c Config) newOverrides(v []string) (map[string]map[string]Override, error)
 			o := t[kk[1]]
 
 			switch keys[1] {
-			case "output", "cache-to", "cache-from", "tags", "platform", "secrets", "ssh", "attest":
+			case "output", "cache-to", "cache-from", "tags", "platform", "secrets", "ssh":
 				if len(parts) == 2 {
 					o.ArrValue = append(o.ArrValue, parts[1])
 				}
@@ -463,19 +413,13 @@ func (c Config) newOverrides(v []string) (map[string]map[string]Override, error)
 	return m, nil
 }
 
-func (c Config) ResolveGroup(name string) ([]string, []string) {
-	targets, groups := c.group(name, map[string]visit{})
-	return dedupSlice(targets), dedupSlice(groups)
+func (c Config) ResolveGroup(name string) []string {
+	return c.group(name, map[string]struct{}{})
 }
 
-type visit struct {
-	target []string
-	group  []string
-}
-
-func (c Config) group(name string, visited map[string]visit) ([]string, []string) {
-	if v, ok := visited[name]; ok {
-		return v.target, v.group
+func (c Config) group(name string, visited map[string]struct{}) []string {
+	if _, ok := visited[name]; ok {
+		return nil
 	}
 	var g *Group
 	for _, group := range c.Groups {
@@ -485,24 +429,19 @@ func (c Config) group(name string, visited map[string]visit) ([]string, []string
 		}
 	}
 	if g == nil {
-		return []string{name}, nil
+		return []string{name}
 	}
-	visited[name] = visit{}
+	visited[name] = struct{}{}
 	targets := make([]string, 0, len(g.Targets))
-	groups := []string{name}
 	for _, t := range g.Targets {
-		ttarget, tgroup := c.group(t, visited)
-		if len(ttarget) > 0 {
-			targets = append(targets, ttarget...)
+		tgroup := c.group(t, visited)
+		if len(tgroup) > 0 {
+			targets = append(targets, tgroup...)
 		} else {
 			targets = append(targets, t)
 		}
-		if len(tgroup) > 0 {
-			groups = append(groups, tgroup...)
-		}
 	}
-	visited[name] = visit{target: targets, group: groups}
-	return targets, groups
+	return targets
 }
 
 func (c Config) ResolveTarget(name string, overrides map[string]map[string]Override) (*Target, error) {
@@ -560,44 +499,39 @@ func (c Config) target(name string, visited map[string]*Target, overrides map[st
 }
 
 type Group struct {
-	Name    string   `json:"-" hcl:"name,label" cty:"name"`
-	Targets []string `json:"targets" hcl:"targets" cty:"targets"`
+	Name    string   `json:"-" hcl:"name,label"`
+	Targets []string `json:"targets" hcl:"targets"`
 	// Target // TODO?
 }
 
 type Target struct {
-	Name string `json:"-" hcl:"name,label" cty:"name"`
+	Name string `json:"-" hcl:"name,label"`
 
 	// 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"`
+	Inherits []string `json:"inherits,omitempty" hcl:"inherits,optional"`
 
-	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"`
-	DockerfileInline *string            `json:"dockerfile-inline,omitempty" hcl:"dockerfile-inline,optional" cty:"dockerfile-inline"`
-	Args             map[string]*string `json:"args,omitempty" hcl:"args,optional" cty:"args"`
-	Labels           map[string]*string `json:"labels,omitempty" hcl:"labels,optional" cty:"labels"`
-	Tags             []string           `json:"tags,omitempty" hcl:"tags,optional" cty:"tags"`
-	CacheFrom        []string           `json:"cache-from,omitempty"  hcl:"cache-from,optional" cty:"cache-from"`
-	CacheTo          []string           `json:"cache-to,omitempty"  hcl:"cache-to,optional" cty:"cache-to"`
-	Target           *string            `json:"target,omitempty" hcl:"target,optional" cty:"target"`
-	Secrets          []string           `json:"secret,omitempty" hcl:"secret,optional" cty:"secret"`
-	SSH              []string           `json:"ssh,omitempty" hcl:"ssh,optional" cty:"ssh"`
-	Platforms        []string           `json:"platforms,omitempty" hcl:"platforms,optional" cty:"platforms"`
-	Outputs          []string           `json:"output,omitempty" hcl:"output,optional" cty:"output"`
-	Pull             *bool              `json:"pull,omitempty" hcl:"pull,optional" cty:"pull"`
-	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.
-
-	// linked is a private field to mark a target used as a linked one
-	linked bool
+	Context          *string           `json:"context,omitempty" hcl:"context,optional"`
+	Contexts         map[string]string `json:"contexts,omitempty" hcl:"contexts,optional"`
+	Dockerfile       *string           `json:"dockerfile,omitempty" hcl:"dockerfile,optional"`
+	DockerfileInline *string           `json:"dockerfile-inline,omitempty" hcl:"dockerfile-inline,optional"`
+	Args             map[string]string `json:"args,omitempty" hcl:"args,optional"`
+	Labels           map[string]string `json:"labels,omitempty" hcl:"labels,optional"`
+	Tags             []string          `json:"tags,omitempty" hcl:"tags,optional"`
+	CacheFrom        []string          `json:"cache-from,omitempty"  hcl:"cache-from,optional"`
+	CacheTo          []string          `json:"cache-to,omitempty"  hcl:"cache-to,optional"`
+	Target           *string           `json:"target,omitempty" hcl:"target,optional"`
+	Secrets          []string          `json:"secret,omitempty" hcl:"secret,optional"`
+	SSH              []string          `json:"ssh,omitempty" hcl:"ssh,optional"`
+	Platforms        []string          `json:"platforms,omitempty" hcl:"platforms,optional"`
+	Outputs          []string          `json:"output,omitempty" hcl:"output,optional"`
+	Pull             *bool             `json:"pull,omitempty" hcl:"pull,optional"`
+	NoCache          *bool             `json:"no-cache,omitempty" hcl:"no-cache,optional"`
+	NetworkMode      *string           `json:"-" hcl:"-"`
+	NoCacheFilter    []string          `json:"no-cache-filter,omitempty" hcl:"no-cache-filter,optional"`
+	// IMPORTANT: if you add more fields here, do not forget to update newOverrides and README.
 }
 
 func (t *Target) normalize() {
-	t.Attest = removeDupes(t.Attest)
 	t.Tags = removeDupes(t.Tags)
 	t.Secrets = removeDupes(t.Secrets)
 	t.SSH = removeDupes(t.SSH)
@@ -628,11 +562,8 @@ func (t *Target) Merge(t2 *Target) {
 		t.DockerfileInline = t2.DockerfileInline
 	}
 	for k, v := range t2.Args {
-		if v == nil {
-			continue
-		}
 		if t.Args == nil {
-			t.Args = map[string]*string{}
+			t.Args = map[string]string{}
 		}
 		t.Args[k] = v
 	}
@@ -643,11 +574,8 @@ func (t *Target) Merge(t2 *Target) {
 		t.Contexts[k] = v
 	}
 	for k, v := range t2.Labels {
-		if v == nil {
-			continue
-		}
 		if t.Labels == nil {
-			t.Labels = map[string]*string{}
+			t.Labels = map[string]string{}
 		}
 		t.Labels[k] = v
 	}
@@ -657,9 +585,6 @@ func (t *Target) Merge(t2 *Target) {
 	if t2.Target != nil {
 		t.Target = t2.Target
 	}
-	if t2.Attest != nil { // merge
-		t.Attest = append(t.Attest, t2.Attest...)
-	}
 	if t2.Secrets != nil { // merge
 		t.Secrets = append(t.Secrets, t2.Secrets...)
 	}
@@ -707,9 +632,9 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
 				return errors.Errorf("args require name")
 			}
 			if t.Args == nil {
-				t.Args = map[string]*string{}
+				t.Args = map[string]string{}
 			}
-			t.Args[keys[1]] = &value
+			t.Args[keys[1]] = value
 		case "contexts":
 			if len(keys) != 2 {
 				return errors.Errorf("contexts require name")
@@ -723,9 +648,9 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
 				return errors.Errorf("labels require name")
 			}
 			if t.Labels == nil {
-				t.Labels = map[string]*string{}
+				t.Labels = map[string]string{}
 			}
-			t.Labels[keys[1]] = &value
+			t.Labels[keys[1]] = value
 		case "tags":
 			t.Tags = o.ArrValue
 		case "cache-from":
@@ -742,8 +667,6 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
 			t.Platforms = o.ArrValue
 		case "output":
 			t.Outputs = o.ArrValue
-		case "attest":
-			t.Attest = append(t.Attest, o.ArrValue...)
 		case "no-cache":
 			noCache, err := strconv.ParseBool(value)
 			if err != nil {
@@ -901,22 +824,6 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 		dockerfilePath = path.Join(contextPath, dockerfilePath)
 	}
 
-	args := map[string]string{}
-	for k, v := range t.Args {
-		if v == nil {
-			continue
-		}
-		args[k] = *v
-	}
-
-	labels := map[string]string{}
-	for k, v := range t.Labels {
-		if v == nil {
-			continue
-		}
-		labels[k] = *v
-	}
-
 	noCache := false
 	if t.NoCache != nil {
 		noCache = *t.NoCache
@@ -957,13 +864,12 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 	bo := &build.Options{
 		Inputs:        bi,
 		Tags:          t.Tags,
-		BuildArgs:     args,
-		Labels:        labels,
+		BuildArgs:     t.Args,
+		Labels:        t.Labels,
 		NoCache:       noCache,
 		NoCacheFilter: t.NoCacheFilter,
 		Pull:          pull,
 		NetworkMode:   networkMode,
-		Linked:        t.linked,
 	}
 
 	platforms, err := platformutil.Parse(t.Platforms)
@@ -972,8 +878,7 @@ 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))
+	bo.Session = append(bo.Session, authprovider.NewDockerAuthProvider(os.Stderr))
 
 	secrets, err := buildflags.ParseSecretSpecs(t.Secrets)
 	if err != nil {
@@ -1013,12 +918,6 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 	}
 	bo.Exports = outputs
 
-	attests, err := buildflags.ParseAttests(t.Attest)
-	if err != nil {
-		return nil, err
-	}
-	bo.Attests = attests
-
 	return bo, nil
 }
 
@@ -1071,11 +970,11 @@ func validateTargetName(name string) error {
 	return nil
 }
 
-func sanitizeTargetName(target string) string {
-	// as stipulated in compose spec, service name can contain a dot so as
-	// best-effort and to avoid any potential ambiguity, we replace the dot
-	// with an underscore.
-	return strings.ReplaceAll(target, ".", "_")
+func validateTargetNameCompose(name string) error {
+	if !targetNamePatternCompose.MatchString(name) {
+		return errors.Errorf("only %q are allowed", validTargetNameCharsCompose)
+	}
+	return nil
 }
 
 func sliceEqual(s1, s2 []string) bool {

bake/bake_test.go

@@ -2,8 +2,8 @@ package bake
 
 import (
 	"context"
+	"os"
 	"sort"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -41,12 +41,12 @@ target "webapp" {
 
 		require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile)
 		require.Equal(t, ".", *m["webapp"].Context)
-		require.Equal(t, ptrstr("webDEP"), m["webapp"].Args["VAR_INHERITED"])
+		require.Equal(t, "webDEP", m["webapp"].Args["VAR_INHERITED"])
 		require.Equal(t, true, *m["webapp"].NoCache)
 		require.Nil(t, m["webapp"].Pull)
 
 		require.Equal(t, 1, len(g))
-		require.Equal(t, []string{"webapp"}, g["default"].Targets)
+		require.Equal(t, []string{"webapp"}, g[0].Targets)
 	})
 
 	t.Run("InvalidTargetOverrides", func(t *testing.T) {
@@ -57,7 +57,8 @@ target "webapp" {
 
 	t.Run("ArgsOverrides", func(t *testing.T) {
 		t.Run("leaf", func(t *testing.T) {
-			t.Setenv("VAR_FROMENV"+t.Name(), "fromEnv")
+			os.Setenv("VAR_FROMENV"+t.Name(), "fromEnv")
+			defer os.Unsetenv("VAR_FROM_ENV" + t.Name())
 
 			m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{
 				"webapp.args.VAR_UNSET",
@@ -78,15 +79,15 @@ target "webapp" {
 			_, isSet = m["webapp"].Args["VAR_EMPTY"]
 			require.True(t, isSet, m["webapp"].Args["VAR_EMPTY"])
 
-			require.Equal(t, ptrstr("bananas"), m["webapp"].Args["VAR_SET"])
+			require.Equal(t, m["webapp"].Args["VAR_SET"], "bananas")
 
-			require.Equal(t, ptrstr("fromEnv"), m["webapp"].Args["VAR_FROMENV"+t.Name()])
+			require.Equal(t, m["webapp"].Args["VAR_FROMENV"+t.Name()], "fromEnv")
 
-			require.Equal(t, ptrstr("webapp"), m["webapp"].Args["VAR_BOTH"])
-			require.Equal(t, ptrstr("override"), m["webapp"].Args["VAR_INHERITED"])
+			require.Equal(t, m["webapp"].Args["VAR_BOTH"], "webapp")
+			require.Equal(t, m["webapp"].Args["VAR_INHERITED"], "override")
 
 			require.Equal(t, 1, len(g))
-			require.Equal(t, []string{"webapp"}, g["default"].Targets)
+			require.Equal(t, []string{"webapp"}, g[0].Targets)
 		})
 
 		// building leaf but overriding parent fields
@@ -97,10 +98,10 @@ target "webapp" {
 			}, nil)
 
 			require.NoError(t, err)
-			require.Equal(t, ptrstr("override"), m["webapp"].Args["VAR_INHERITED"])
-			require.Equal(t, ptrstr("webapp"), m["webapp"].Args["VAR_BOTH"])
+			require.Equal(t, m["webapp"].Args["VAR_INHERITED"], "override")
+			require.Equal(t, m["webapp"].Args["VAR_BOTH"], "webapp")
 			require.Equal(t, 1, len(g))
-			require.Equal(t, []string{"webapp"}, g["default"].Targets)
+			require.Equal(t, []string{"webapp"}, g[0].Targets)
 		})
 	})
 
@@ -112,7 +113,7 @@ target "webapp" {
 		require.NoError(t, err)
 		require.Equal(t, "foo", *m["webapp"].Context)
 		require.Equal(t, 1, len(g))
-		require.Equal(t, []string{"webapp"}, g["default"].Targets)
+		require.Equal(t, []string{"webapp"}, g[0].Targets)
 	})
 
 	t.Run("NoCacheOverride", func(t *testing.T) {
@@ -120,7 +121,7 @@ target "webapp" {
 		require.NoError(t, err)
 		require.Equal(t, false, *m["webapp"].NoCache)
 		require.Equal(t, 1, len(g))
-		require.Equal(t, []string{"webapp"}, g["default"].Targets)
+		require.Equal(t, []string{"webapp"}, g[0].Targets)
 	})
 
 	t.Run("PullOverride", func(t *testing.T) {
@@ -128,28 +129,28 @@ target "webapp" {
 		require.NoError(t, err)
 		require.Equal(t, false, *m["webapp"].Pull)
 		require.Equal(t, 1, len(g))
-		require.Equal(t, []string{"webapp"}, g["default"].Targets)
+		require.Equal(t, []string{"webapp"}, g[0].Targets)
 	})
 
 	t.Run("PatternOverride", func(t *testing.T) {
 		// same check for two cases
-		multiTargetCheck := func(t *testing.T, m map[string]*Target, g map[string]*Group, err error) {
+		multiTargetCheck := func(t *testing.T, m map[string]*Target, g []*Group, err error) {
 			require.NoError(t, err)
 			require.Equal(t, 2, len(m))
 			require.Equal(t, "foo", *m["webapp"].Dockerfile)
-			require.Equal(t, ptrstr("webDEP"), m["webapp"].Args["VAR_INHERITED"])
+			require.Equal(t, "webDEP", m["webapp"].Args["VAR_INHERITED"])
 			require.Equal(t, "foo", *m["webDEP"].Dockerfile)
-			require.Equal(t, ptrstr("webDEP"), m["webDEP"].Args["VAR_INHERITED"])
+			require.Equal(t, "webDEP", m["webDEP"].Args["VAR_INHERITED"])
 			require.Equal(t, 1, len(g))
-			sort.Strings(g["default"].Targets)
-			require.Equal(t, []string{"webDEP", "webapp"}, g["default"].Targets)
+			sort.Strings(g[0].Targets)
+			require.Equal(t, []string{"webDEP", "webapp"}, g[0].Targets)
 		}
 
 		cases := []struct {
 			name      string
 			targets   []string
 			overrides []string
-			check     func(*testing.T, map[string]*Target, map[string]*Group, error)
+			check     func(*testing.T, map[string]*Target, []*Group, error)
 		}{
 			{
 				name:      "multi target single pattern",
@@ -167,20 +168,20 @@ target "webapp" {
 				name:      "single target",
 				targets:   []string{"webapp"},
 				overrides: []string{"web*.dockerfile=foo"},
-				check: func(t *testing.T, m map[string]*Target, g map[string]*Group, err error) {
+				check: func(t *testing.T, m map[string]*Target, g []*Group, err error) {
 					require.NoError(t, err)
 					require.Equal(t, 1, len(m))
 					require.Equal(t, "foo", *m["webapp"].Dockerfile)
-					require.Equal(t, ptrstr("webDEP"), m["webapp"].Args["VAR_INHERITED"])
+					require.Equal(t, "webDEP", m["webapp"].Args["VAR_INHERITED"])
 					require.Equal(t, 1, len(g))
-					require.Equal(t, []string{"webapp"}, g["default"].Targets)
+					require.Equal(t, []string{"webapp"}, g[0].Targets)
 				},
 			},
 			{
 				name:      "nomatch",
 				targets:   []string{"webapp"},
 				overrides: []string{"nomatch*.dockerfile=foo"},
-				check: func(t *testing.T, m map[string]*Target, g map[string]*Group, err error) {
+				check: func(t *testing.T, m map[string]*Target, g []*Group, err error) {
 					// NOTE: I am unsure whether failing to match should always error out
 					// instead of simply skipping that override.
 					// Let's enforce the error and we can relax it later if users complain.
@@ -277,19 +278,9 @@ services:
 `),
 	}
 
-	fp3 := File{
-		Name: "docker-compose3.yml",
-		Data: []byte(
-			`version: "3"
-services:
-  webapp:
-    entrypoint: echo 1
-`),
-	}
-
 	ctx := context.TODO()
 
-	m, g, err := ReadTargets(ctx, []File{fp, fp2, fp3}, []string{"default"}, nil, nil)
+	m, g, err := ReadTargets(ctx, []File{fp, fp2}, []string{"default"}, nil, nil)
 	require.NoError(t, err)
 
 	require.Equal(t, 3, len(m))
@@ -298,73 +289,12 @@ services:
 	require.True(t, ok)
 	require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile)
 	require.Equal(t, ".", *m["webapp"].Context)
-	require.Equal(t, ptrstr("1"), m["webapp"].Args["buildno"])
-	require.Equal(t, ptrstr("12"), m["webapp"].Args["buildno2"])
+	require.Equal(t, "1", m["webapp"].Args["buildno"])
+	require.Equal(t, "12", m["webapp"].Args["buildno2"])
 
 	require.Equal(t, 1, len(g))
-	sort.Strings(g["default"].Targets)
-	require.Equal(t, []string{"db", "newservice", "webapp"}, g["default"].Targets)
-}
-
-func TestReadTargetsWithDotCompose(t *testing.T) {
-	t.Parallel()
-
-	fp := File{
-		Name: "docker-compose.yml",
-		Data: []byte(
-			`version: "3"
-services:
-  web.app:
-    build:
-      dockerfile: Dockerfile.webapp
-      args:
-        buildno: 1
-`),
-	}
-
-	fp2 := File{
-		Name: "docker-compose2.yml",
-		Data: []byte(
-			`version: "3"
-services:
-  web_app:
-    build:
-      args:
-        buildno2: 12
-`),
-	}
-
-	ctx := context.TODO()
-
-	m, _, err := ReadTargets(ctx, []File{fp}, []string{"web.app"}, nil, nil)
-	require.NoError(t, err)
-	require.Equal(t, 1, len(m))
-	_, ok := m["web_app"]
-	require.True(t, ok)
-	require.Equal(t, "Dockerfile.webapp", *m["web_app"].Dockerfile)
-	require.Equal(t, ptrstr("1"), m["web_app"].Args["buildno"])
-
-	m, _, err = ReadTargets(ctx, []File{fp2}, []string{"web_app"}, nil, nil)
-	require.NoError(t, err)
-	require.Equal(t, 1, len(m))
-	_, ok = m["web_app"]
-	require.True(t, ok)
-	require.Equal(t, "Dockerfile", *m["web_app"].Dockerfile)
-	require.Equal(t, ptrstr("12"), m["web_app"].Args["buildno2"])
-
-	m, g, err := ReadTargets(ctx, []File{fp, fp2}, []string{"default"}, nil, nil)
-	require.NoError(t, err)
-	require.Equal(t, 1, len(m))
-	_, ok = m["web_app"]
-	require.True(t, ok)
-	require.Equal(t, "Dockerfile.webapp", *m["web_app"].Dockerfile)
-	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"])
-
-	require.Equal(t, 1, len(g))
-	sort.Strings(g["default"].Targets)
-	require.Equal(t, []string{"web_app"}, g["default"].Targets)
+	sort.Strings(g[0].Targets)
+	require.Equal(t, []string{"db", "newservice", "webapp"}, g[0].Targets)
 }
 
 func TestHCLCwdPrefix(t *testing.T) {
@@ -391,7 +321,7 @@ func TestHCLCwdPrefix(t *testing.T) {
 	require.Equal(t, "foo", *m["app"].Context)
 
 	require.Equal(t, 1, len(g))
-	require.Equal(t, []string{"app"}, g["default"].Targets)
+	require.Equal(t, []string{"app"}, g[0].Targets)
 }
 
 func TestOverrideMerge(t *testing.T) {
@@ -516,41 +446,6 @@ func TestReadContextFromTargetUnknown(t *testing.T) {
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "failed to find target bar")
 }
-
-func TestReadEmptyTargets(t *testing.T) {
-	t.Parallel()
-
-	fp := File{
-		Name: "docker-bake.hcl",
-		Data: []byte(`target "app1" {}`),
-	}
-
-	fp2 := File{
-		Name: "docker-compose.yml",
-		Data: []byte(`
-services:
-  app2:
-    build: {}
-`),
-	}
-
-	ctx := context.TODO()
-
-	m, _, err := ReadTargets(ctx, []File{fp, fp2}, []string{"app1", "app2"}, nil, nil)
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(m))
-	_, ok := m["app1"]
-	require.True(t, ok)
-	_, ok = m["app2"]
-	require.True(t, ok)
-
-	require.Equal(t, "Dockerfile", *m["app1"].Dockerfile)
-	require.Equal(t, ".", *m["app1"].Context)
-	require.Equal(t, "Dockerfile", *m["app2"].Dockerfile)
-	require.Equal(t, ".", *m["app2"].Context)
-}
-
 func TestReadContextFromTargetChain(t *testing.T) {
 	ctx := context.TODO()
 	fp := File{
@@ -695,7 +590,7 @@ target "image" {
 	m, g, err := ReadTargets(ctx, []File{f}, []string{"image"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(g))
-	require.Equal(t, []string{"image"}, g["default"].Targets)
+	require.Equal(t, []string{"image"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, "test", *m["image"].Dockerfile)
 }
@@ -716,9 +611,8 @@ target "image" {
 
 	m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
 	require.NoError(t, err)
-	require.Equal(t, 2, len(g))
-	require.Equal(t, []string{"foo"}, g["default"].Targets)
-	require.Equal(t, []string{"image"}, g["foo"].Targets)
+	require.Equal(t, 1, len(g))
+	require.Equal(t, []string{"image"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, "test", *m["image"].Dockerfile)
 }
@@ -742,17 +636,15 @@ target "image" {
 
 	m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
 	require.NoError(t, err)
-	require.Equal(t, 2, len(g))
-	require.Equal(t, []string{"foo"}, g["default"].Targets)
-	require.Equal(t, []string{"image"}, g["foo"].Targets)
+	require.Equal(t, 1, len(g))
+	require.Equal(t, []string{"image"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, "test", *m["image"].Dockerfile)
 
 	m, g, err = ReadTargets(ctx, []File{f}, []string{"foo", "foo"}, nil, nil)
 	require.NoError(t, err)
-	require.Equal(t, 2, len(g))
-	require.Equal(t, []string{"foo"}, g["default"].Targets)
-	require.Equal(t, []string{"image"}, g["foo"].Targets)
+	require.Equal(t, 1, len(g))
+	require.Equal(t, []string{"image"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, "test", *m["image"].Dockerfile)
 }
@@ -831,7 +723,7 @@ services:
 	m, g, err := ReadTargets(ctx, []File{fhcl}, []string{"default"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(g))
-	require.Equal(t, []string{"image"}, g["default"].Targets)
+	require.Equal(t, []string{"image"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, 1, len(m["image"].Outputs))
 	require.Equal(t, "type=docker", m["image"].Outputs[0])
@@ -839,7 +731,7 @@ services:
 	m, g, err = ReadTargets(ctx, []File{fhcl}, []string{"image-release"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(g))
-	require.Equal(t, []string{"image-release"}, g["default"].Targets)
+	require.Equal(t, []string{"image-release"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, 1, len(m["image-release"].Outputs))
 	require.Equal(t, "type=image,push=true", m["image-release"].Outputs[0])
@@ -847,7 +739,7 @@ services:
 	m, g, err = ReadTargets(ctx, []File{fhcl}, []string{"image", "image-release"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(g))
-	require.Equal(t, []string{"image", "image-release"}, g["default"].Targets)
+	require.Equal(t, []string{"image", "image-release"}, g[0].Targets)
 	require.Equal(t, 2, len(m))
 	require.Equal(t, ".", *m["image"].Context)
 	require.Equal(t, 1, len(m["image-release"].Outputs))
@@ -856,22 +748,22 @@ services:
 	m, g, err = ReadTargets(ctx, []File{fyml, fhcl}, []string{"default"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(g))
-	require.Equal(t, []string{"image"}, g["default"].Targets)
+	require.Equal(t, []string{"image"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, ".", *m["image"].Context)
 
 	m, g, err = ReadTargets(ctx, []File{fjson}, []string{"default"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(g))
-	require.Equal(t, []string{"image"}, g["default"].Targets)
+	require.Equal(t, []string{"image"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, ".", *m["image"].Context)
 
 	m, g, err = ReadTargets(ctx, []File{fyml}, []string{"default"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(g))
-	sort.Strings(g["default"].Targets)
-	require.Equal(t, []string{"addon", "aws"}, g["default"].Targets)
+	sort.Strings(g[0].Targets)
+	require.Equal(t, []string{"addon", "aws"}, g[0].Targets)
 	require.Equal(t, 2, len(m))
 	require.Equal(t, "./Dockerfile", *m["addon"].Dockerfile)
 	require.Equal(t, "./aws.Dockerfile", *m["aws"].Dockerfile)
@@ -879,8 +771,8 @@ services:
 	m, g, err = ReadTargets(ctx, []File{fyml, fhcl}, []string{"addon", "aws"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(g))
-	sort.Strings(g["default"].Targets)
-	require.Equal(t, []string{"addon", "aws"}, g["default"].Targets)
+	sort.Strings(g[0].Targets)
+	require.Equal(t, []string{"addon", "aws"}, g[0].Targets)
 	require.Equal(t, 2, len(m))
 	require.Equal(t, "./Dockerfile", *m["addon"].Dockerfile)
 	require.Equal(t, "./aws.Dockerfile", *m["aws"].Dockerfile)
@@ -888,8 +780,8 @@ services:
 	m, g, err = ReadTargets(ctx, []File{fyml, fhcl}, []string{"addon", "aws", "image"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(g))
-	sort.Strings(g["default"].Targets)
-	require.Equal(t, []string{"addon", "aws", "image"}, g["default"].Targets)
+	sort.Strings(g[0].Targets)
+	require.Equal(t, []string{"addon", "aws", "image"}, g[0].Targets)
 	require.Equal(t, 3, len(m))
 	require.Equal(t, ".", *m["image"].Context)
 	require.Equal(t, "./Dockerfile", *m["addon"].Dockerfile)
@@ -915,17 +807,15 @@ target "image" {
 
 	m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
 	require.NoError(t, err)
-	require.Equal(t, 2, len(g))
-	require.Equal(t, []string{"foo"}, g["default"].Targets)
-	require.Equal(t, []string{"foo"}, g["foo"].Targets)
+	require.Equal(t, 1, len(g))
+	require.Equal(t, []string{"foo"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, "bar", *m["foo"].Dockerfile)
 
 	m, g, err = ReadTargets(ctx, []File{f}, []string{"foo", "foo"}, nil, nil)
 	require.NoError(t, err)
-	require.Equal(t, 2, len(g))
-	require.Equal(t, []string{"foo"}, g["default"].Targets)
-	require.Equal(t, []string{"foo"}, g["foo"].Targets)
+	require.Equal(t, 1, len(g))
+	require.Equal(t, []string{"foo"}, g[0].Targets)
 	require.Equal(t, 1, len(m))
 	require.Equal(t, "bar", *m["foo"].Dockerfile)
 }
@@ -949,18 +839,16 @@ target "image" {
 
 	m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
 	require.NoError(t, err)
-	require.Equal(t, 2, len(g))
-	require.Equal(t, []string{"foo"}, g["default"].Targets)
-	require.Equal(t, []string{"foo", "image"}, g["foo"].Targets)
+	require.Equal(t, 1, len(g))
+	require.Equal(t, []string{"foo", "image"}, g[0].Targets)
 	require.Equal(t, 2, len(m))
 	require.Equal(t, "bar", *m["foo"].Dockerfile)
 	require.Equal(t, "type=docker", m["image"].Outputs[0])
 
 	m, g, err = ReadTargets(ctx, []File{f}, []string{"foo", "image"}, nil, nil)
 	require.NoError(t, err)
-	require.Equal(t, 2, len(g))
-	require.Equal(t, []string{"foo", "image"}, g["default"].Targets)
-	require.Equal(t, []string{"foo", "image"}, g["foo"].Targets)
+	require.Equal(t, 1, len(g))
+	require.Equal(t, []string{"foo", "image"}, g[0].Targets)
 	require.Equal(t, 2, len(m))
 	require.Equal(t, "bar", *m["foo"].Dockerfile)
 	require.Equal(t, "type=docker", m["image"].Outputs[0])
@@ -997,22 +885,22 @@ target "d" {
 	cases := []struct {
 		name      string
 		overrides []string
-		want      map[string]*string
+		want      map[string]string
 	}{
 		{
 			name:      "nested simple",
 			overrides: nil,
-			want:      map[string]*string{"bar": ptrstr("234"), "baz": ptrstr("890"), "foo": ptrstr("123")},
+			want:      map[string]string{"bar": "234", "baz": "890", "foo": "123"},
 		},
 		{
 			name:      "nested with overrides first",
 			overrides: []string{"a.args.foo=321", "b.args.bar=432"},
-			want:      map[string]*string{"bar": ptrstr("234"), "baz": ptrstr("890"), "foo": ptrstr("321")},
+			want:      map[string]string{"bar": "234", "baz": "890", "foo": "321"},
 		},
 		{
 			name:      "nested with overrides last",
 			overrides: []string{"a.args.foo=321", "c.args.bar=432"},
-			want:      map[string]*string{"bar": ptrstr("432"), "baz": ptrstr("890"), "foo": ptrstr("321")},
+			want:      map[string]string{"bar": "432", "baz": "890", "foo": "321"},
 		},
 	}
 	for _, tt := range cases {
@@ -1021,7 +909,7 @@ target "d" {
 			m, g, err := ReadTargets(ctx, []File{f}, []string{"d"}, tt.overrides, nil)
 			require.NoError(t, err)
 			require.Equal(t, 1, len(g))
-			require.Equal(t, []string{"d"}, g["default"].Targets)
+			require.Equal(t, []string{"d"}, g[0].Targets)
 			require.Equal(t, 1, len(m))
 			require.Equal(t, tt.want, m["d"].Args)
 		})
@@ -1065,26 +953,26 @@ group "default" {
 	cases := []struct {
 		name      string
 		overrides []string
-		wantch1   map[string]*string
-		wantch2   map[string]*string
+		wantch1   map[string]string
+		wantch2   map[string]string
 	}{
 		{
 			name:      "nested simple",
 			overrides: nil,
-			wantch1:   map[string]*string{"BAR": ptrstr("fuu"), "FOO": ptrstr("bar")},
-			wantch2:   map[string]*string{"BAR": ptrstr("fuu"), "FOO": ptrstr("bar"), "FOO2": ptrstr("bar2")},
+			wantch1:   map[string]string{"BAR": "fuu", "FOO": "bar"},
+			wantch2:   map[string]string{"BAR": "fuu", "FOO": "bar", "FOO2": "bar2"},
 		},
 		{
 			name:      "nested with overrides first",
 			overrides: []string{"grandparent.args.BAR=fii", "child1.args.FOO=baaar"},
-			wantch1:   map[string]*string{"BAR": ptrstr("fii"), "FOO": ptrstr("baaar")},
-			wantch2:   map[string]*string{"BAR": ptrstr("fii"), "FOO": ptrstr("bar"), "FOO2": ptrstr("bar2")},
+			wantch1:   map[string]string{"BAR": "fii", "FOO": "baaar"},
+			wantch2:   map[string]string{"BAR": "fii", "FOO": "bar", "FOO2": "bar2"},
 		},
 		{
 			name:      "nested with overrides last",
 			overrides: []string{"grandparent.args.BAR=fii", "child2.args.FOO=baaar"},
-			wantch1:   map[string]*string{"BAR": ptrstr("fii"), "FOO": ptrstr("bar")},
-			wantch2:   map[string]*string{"BAR": ptrstr("fii"), "FOO": ptrstr("baaar"), "FOO2": ptrstr("bar2")},
+			wantch1:   map[string]string{"BAR": "fii", "FOO": "bar"},
+			wantch2:   map[string]string{"BAR": "fii", "FOO": "baaar", "FOO2": "bar2"},
 		},
 	}
 	for _, tt := range cases {
@@ -1093,7 +981,7 @@ group "default" {
 			m, g, err := ReadTargets(ctx, []File{f}, []string{"default"}, tt.overrides, nil)
 			require.NoError(t, err)
 			require.Equal(t, 1, len(g))
-			require.Equal(t, []string{"child1", "child2"}, g["default"].Targets)
+			require.Equal(t, []string{"child1", "child2"}, g[0].Targets)
 			require.Equal(t, 2, len(m))
 			require.Equal(t, tt.wantch1, m["child1"].Args)
 			require.Equal(t, []string{"type=docker"}, m["child1"].Outputs)
@@ -1157,204 +1045,3 @@ func TestTargetName(t *testing.T) {
 		})
 	}
 }
-
-func TestNestedGroupsWithSameTarget(t *testing.T) {
-	ctx := context.TODO()
-
-	f := File{
-		Name: "docker-bake.hcl",
-		Data: []byte(`
-group "a" {
-  targets = ["b", "c"]
-}
-
-group "b" {
-  targets = ["d"]
-}
-
-group "c" {
-  targets = ["b"]
-}
-
-target "d" {
-  context = "."
-  dockerfile = "./testdockerfile"
-}
-
-group "e" {
-  targets = ["a", "f"]
-}
-
-target "f" {
-  context = "./foo"
-}`)}
-
-	cases := []struct {
-		names   []string
-		targets []string
-		groups  []string
-		count   int
-	}{
-		{
-			names:   []string{"a"},
-			targets: []string{"a"},
-			groups:  []string{"default", "a", "b", "c"},
-			count:   1,
-		},
-		{
-			names:   []string{"b"},
-			targets: []string{"b"},
-			groups:  []string{"default", "b"},
-			count:   1,
-		},
-		{
-			names:   []string{"c"},
-			targets: []string{"c"},
-			groups:  []string{"default", "b", "c"},
-			count:   1,
-		},
-		{
-			names:   []string{"d"},
-			targets: []string{"d"},
-			groups:  []string{"default"},
-			count:   1,
-		},
-		{
-			names:   []string{"e"},
-			targets: []string{"e"},
-			groups:  []string{"default", "a", "b", "c", "e"},
-			count:   2,
-		},
-		{
-			names:   []string{"a", "e"},
-			targets: []string{"a", "e"},
-			groups:  []string{"default", "a", "b", "c", "e"},
-			count:   2,
-		},
-	}
-	for _, tt := range cases {
-		tt := tt
-		t.Run(strings.Join(tt.names, "+"), func(t *testing.T) {
-			m, g, err := ReadTargets(ctx, []File{f}, tt.names, nil, nil)
-			require.NoError(t, err)
-
-			var gnames []string
-			for _, g := range g {
-				gnames = append(gnames, g.Name)
-			}
-			sort.Strings(gnames)
-			sort.Strings(tt.groups)
-			require.Equal(t, tt.groups, gnames)
-
-			sort.Strings(g["default"].Targets)
-			sort.Strings(tt.targets)
-			require.Equal(t, tt.targets, g["default"].Targets)
-
-			require.Equal(t, tt.count, len(m))
-			require.Equal(t, ".", *m["d"].Context)
-			require.Equal(t, "./testdockerfile", *m["d"].Dockerfile)
-		})
-	}
-}
-
-func TestUnknownExt(t *testing.T) {
-	dt := []byte(`
-		target "app" {
-			context = "dir"
-			args = {
-				v1 = "foo"
-			}
-		}
-		`)
-	dt2 := []byte(`
-services:
-  app:
-    build:
-      dockerfile: Dockerfile-alternate
-      args:
-        v2: "bar"
-`)
-
-	c, err := ParseFiles([]File{
-		{Data: dt, Name: "c1.foo"},
-		{Data: dt2, Name: "c2.bar"},
-	}, nil)
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(c.Targets))
-	require.Equal(t, "app", c.Targets[0].Name)
-	require.Equal(t, ptrstr("foo"), c.Targets[0].Args["v1"])
-	require.Equal(t, ptrstr("bar"), c.Targets[0].Args["v2"])
-	require.Equal(t, "dir", *c.Targets[0].Context)
-	require.Equal(t, "Dockerfile-alternate", *c.Targets[0].Dockerfile)
-}
-
-func TestHCLNullVars(t *testing.T) {
-	fp := File{
-		Name: "docker-bake.hcl",
-		Data: []byte(
-			`variable "FOO" {
-				default = null
-			}
-			variable "BAR" {
-				default = null
-			}
-			target "default" {
-				args = {
-					foo = FOO
-					bar = "baz"
-				}
-				labels = {
-					"com.docker.app.bar" = BAR
-					"com.docker.app.baz" = "foo"
-				}
-			}`),
-	}
-
-	ctx := context.TODO()
-	m, _, err := ReadTargets(ctx, []File{fp}, []string{"default"}, nil, nil)
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(m))
-	_, ok := m["default"]
-	require.True(t, ok)
-
-	_, err = TargetsToBuildOpt(m, &Input{})
-	require.NoError(t, err)
-	require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, m["default"].Args)
-	require.Equal(t, map[string]*string{"com.docker.app.baz": ptrstr("foo")}, m["default"].Labels)
-}
-
-func TestJSONNullVars(t *testing.T) {
-	fp := File{
-		Name: "docker-bake.json",
-		Data: []byte(
-			`{
-				"variable": {
-					"FOO": {
-						"default": null
-					}
-				},
-				"target": {
-					"default": {
-						"args": {
-							"foo": "${FOO}",
-							"bar": "baz"
-						}
-					}
-				}
-			}`),
-	}
-
-	ctx := context.TODO()
-	m, _, err := ReadTargets(ctx, []File{fp}, []string{"default"}, nil, nil)
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(m))
-	_, ok := m["default"]
-	require.True(t, ok)
-
-	_, err = TargetsToBuildOpt(m, &Input{})
-	require.NoError(t, err)
-	require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, m["default"].Args)
-}

bake/compose.go

@@ -1,44 +1,49 @@
 package bake
 
 import (
+	"fmt"
 	"os"
-	"path/filepath"
+	"reflect"
 	"strings"
 
-	"github.com/compose-spec/compose-go/dotenv"
 	"github.com/compose-spec/compose-go/loader"
 	compose "github.com/compose-spec/compose-go/types"
 	"github.com/pkg/errors"
-	"gopkg.in/yaml.v3"
 )
 
-func ParseComposeFiles(fs []File) (*Config, error) {
-	envs, err := composeEnv()
-	if err != nil {
-		return nil, err
-	}
-	var cfgs []compose.ConfigFile
-	for _, f := range fs {
-		cfgs = append(cfgs, compose.ConfigFile{
-			Filename: f.Name,
-			Content:  f.Data,
-		})
-	}
-	return ParseCompose(cfgs, envs)
-}
-
-func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, error) {
-	cfg, err := loader.Load(compose.ConfigDetails{
-		ConfigFiles: cfgs,
-		Environment: envs,
+func parseCompose(dt []byte) (*compose.Project, error) {
+	return loader.Load(compose.ConfigDetails{
+		ConfigFiles: []compose.ConfigFile{
+			{
+				Content: dt,
+			},
+		},
+		Environment: envMap(os.Environ()),
 	}, func(options *loader.Options) {
 		options.SkipNormalization = true
 	})
+}
+
+func envMap(env []string) map[string]string {
+	result := make(map[string]string, len(env))
+	for _, s := range env {
+		kv := strings.SplitN(s, "=", 2)
+		if len(kv) != 2 {
+			continue
+		}
+		result[kv[0]] = kv[1]
+	}
+	return result
+}
+
+func ParseCompose(dt []byte) (*Config, error) {
+	cfg, err := parseCompose(dt)
 	if err != nil {
 		return nil, err
 	}
 
 	var c Config
+	var zeroBuildConfig compose.BuildConfig
 	if len(cfg.Services) > 0 {
 		c.Groups = []*Group{}
 		c.Targets = []*Target{}
@@ -46,13 +51,17 @@ func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, e
 		g := &Group{Name: "default"}
 
 		for _, s := range cfg.Services {
-			if s.Build == nil {
+
+			if s.Build == nil || reflect.DeepEqual(s.Build, zeroBuildConfig) {
+				// if not make sure they're setting an image or it's invalid d-c.yml
+				if s.Image == "" {
+					return nil, fmt.Errorf("compose file invalid: service %s has neither an image nor a build context specified. At least one must be provided", s.Name)
+				}
 				continue
 			}
 
-			targetName := sanitizeTargetName(s.Name)
-			if err = validateTargetName(targetName); err != nil {
-				return nil, errors.Wrapf(err, "invalid service name %q", targetName)
+			if err = validateTargetNameCompose(s.Name); err != nil {
+				return nil, errors.Wrapf(err, "invalid service name %q", s.Name)
 			}
 
 			var contextPathP *string
@@ -65,30 +74,12 @@ func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, e
 				dockerfilePath := s.Build.Dockerfile
 				dockerfilePathP = &dockerfilePath
 			}
-
-			var secrets []string
-			for _, bs := range s.Build.Secrets {
-				secret, err := composeToBuildkitSecret(bs, cfg.Secrets[bs.Source])
-				if err != nil {
-					return nil, err
-				}
-				secrets = append(secrets, secret)
-			}
-
-			// 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)
+			g.Targets = append(g.Targets, s.Name)
 			t := &Target{
-				Name:       targetName,
+				Name:       s.Name,
 				Context:    contextPathP,
 				Dockerfile: dockerfilePathP,
-				Tags:       s.Build.Tags,
-				Labels:     labels,
+				Labels:     s.Build.Labels,
 				Args: flatten(s.Build.Args.Resolve(func(val string) (string, bool) {
 					if val, ok := s.Environment[val]; ok && val != nil {
 						return *val, true
@@ -97,9 +88,7 @@ func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, e
 					return val, ok
 				})),
 				CacheFrom:   s.Build.CacheFrom,
-				CacheTo:     s.Build.CacheTo,
 				NetworkMode: &s.Build.Network,
-				Secrets:     secrets,
 			}
 			if err = t.composeExtTarget(s.Build.Extensions); err != nil {
 				return nil, err
@@ -120,205 +109,103 @@ func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, e
 	return &c, nil
 }
 
-func validateComposeFile(dt []byte, fn string) (bool, error) {
-	envs, err := composeEnv()
-	if err != nil {
-		return true, err
-	}
-	fnl := strings.ToLower(fn)
-	if strings.HasSuffix(fnl, ".yml") || strings.HasSuffix(fnl, ".yaml") {
-		return true, validateCompose(dt, envs)
-	}
-	if strings.HasSuffix(fnl, ".json") || strings.HasSuffix(fnl, ".hcl") {
-		return false, nil
-	}
-	err = validateCompose(dt, envs)
-	return err == nil, err
-}
-
-func validateCompose(dt []byte, envs map[string]string) error {
-	_, err := loader.Load(compose.ConfigDetails{
-		ConfigFiles: []compose.ConfigFile{
-			{
-				Content: dt,
-			},
-		},
-		Environment: envs,
-	}, func(options *loader.Options) {
-		options.SkipNormalization = true
-		// consistency is checked later in ParseCompose to ensure multiple
-		// compose files can be merged together
-		options.SkipConsistencyCheck = true
-	})
-	return err
-}
-
-func composeEnv() (map[string]string, error) {
-	envs := sliceToMap(os.Environ())
-	if wd, err := os.Getwd(); err == nil {
-		envs, err = loadDotEnv(envs, wd)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return envs, nil
-}
-
-func loadDotEnv(curenv map[string]string, workingDir string) (map[string]string, error) {
-	if curenv == nil {
-		curenv = make(map[string]string)
-	}
-
-	ef, err := filepath.Abs(filepath.Join(workingDir, ".env"))
-	if err != nil {
-		return nil, err
-	}
-
-	if _, err = os.Stat(ef); os.IsNotExist(err) {
-		return curenv, nil
-	} else if err != nil {
-		return nil, err
-	}
-
-	dt, err := os.ReadFile(ef)
-	if err != nil {
-		return nil, err
-	}
-
-	envs, err := dotenv.UnmarshalBytes(dt)
-	if err != nil {
-		return nil, err
-	}
-
-	for k, v := range envs {
-		if _, set := curenv[k]; set {
-			continue
-		}
-		curenv[k] = v
-	}
-
-	return curenv, nil
-}
-
-func flatten(in compose.MappingWithEquals) map[string]*string {
+func flatten(in compose.MappingWithEquals) compose.Mapping {
 	if len(in) == 0 {
 		return nil
 	}
-	out := map[string]*string{}
+	out := compose.Mapping{}
 	for k, v := range in {
 		if v == nil {
 			continue
 		}
-		out[k] = v
+		out[k] = *v
 	}
 	return out
 }
 
-// xbake Compose build extension provides fields not (yet) available in
-// Compose build specification: https://github.com/compose-spec/compose-spec/blob/master/build.md
-type xbake struct {
-	Tags          stringArray `yaml:"tags,omitempty"`
-	CacheFrom     stringArray `yaml:"cache-from,omitempty"`
-	CacheTo       stringArray `yaml:"cache-to,omitempty"`
-	Secrets       stringArray `yaml:"secret,omitempty"`
-	SSH           stringArray `yaml:"ssh,omitempty"`
-	Platforms     stringArray `yaml:"platforms,omitempty"`
-	Outputs       stringArray `yaml:"output,omitempty"`
-	Pull          *bool       `yaml:"pull,omitempty"`
-	NoCache       *bool       `yaml:"no-cache,omitempty"`
-	NoCacheFilter stringArray `yaml:"no-cache-filter,omitempty"`
-	Contexts      stringMap   `yaml:"contexts,omitempty"`
-	// don't forget to update documentation if you add a new field:
-	// docs/manuals/bake/compose-file.md#extension-field-with-x-bake
-}
-
-type stringMap map[string]string
-type stringArray []string
-
-func (sa *stringArray) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var multi []string
-	err := unmarshal(&multi)
-	if err != nil {
-		var single string
-		if err := unmarshal(&single); err != nil {
-			return err
-		}
-		*sa = strings.Fields(single)
-	} else {
-		*sa = multi
-	}
-	return nil
-}
-
 // composeExtTarget converts Compose build extension x-bake to bake Target
 // https://github.com/compose-spec/compose-spec/blob/master/spec.md#extension
 func (t *Target) composeExtTarget(exts map[string]interface{}) error {
-	var xb xbake
-
-	ext, ok := exts["x-bake"]
-	if !ok || ext == nil {
-		return nil
+	if ext, ok := exts["x-bake"]; ok {
+		for key, val := range ext.(map[string]interface{}) {
+			switch key {
+			case "tags":
+				if res, k := val.(string); k {
+					t.Tags = append(t.Tags, res)
+				} else {
+					for _, res := range val.([]interface{}) {
+						t.Tags = append(t.Tags, res.(string))
+					}
+				}
+			case "cache-from":
+				t.CacheFrom = []string{} // Needed to override the main field
+				if res, k := val.(string); k {
+					t.CacheFrom = append(t.CacheFrom, res)
+				} else {
+					for _, res := range val.([]interface{}) {
+						t.CacheFrom = append(t.CacheFrom, res.(string))
+					}
+				}
+			case "cache-to":
+				if res, k := val.(string); k {
+					t.CacheTo = append(t.CacheTo, res)
+				} else {
+					for _, res := range val.([]interface{}) {
+						t.CacheTo = append(t.CacheTo, res.(string))
+					}
+				}
+			case "secret":
+				if res, k := val.(string); k {
+					t.Secrets = append(t.Secrets, res)
+				} else {
+					for _, res := range val.([]interface{}) {
+						t.Secrets = append(t.Secrets, res.(string))
+					}
+				}
+			case "ssh":
+				if res, k := val.(string); k {
+					t.SSH = append(t.SSH, res)
+				} else {
+					for _, res := range val.([]interface{}) {
+						t.SSH = append(t.SSH, res.(string))
+					}
+				}
+			case "platforms":
+				if res, k := val.(string); k {
+					t.Platforms = append(t.Platforms, res)
+				} else {
+					for _, res := range val.([]interface{}) {
+						t.Platforms = append(t.Platforms, res.(string))
+					}
+				}
+			case "output":
+				if res, k := val.(string); k {
+					t.Outputs = append(t.Outputs, res)
+				} else {
+					for _, res := range val.([]interface{}) {
+						t.Outputs = append(t.Outputs, res.(string))
+					}
+				}
+			case "pull":
+				if res, ok := val.(bool); ok {
+					t.Pull = &res
+				}
+			case "no-cache":
+				if res, ok := val.(bool); ok {
+					t.NoCache = &res
+				}
+			case "no-cache-filter":
+				if res, k := val.(string); k {
+					t.NoCacheFilter = append(t.NoCacheFilter, res)
+				} else {
+					for _, res := range val.([]interface{}) {
+						t.NoCacheFilter = append(t.NoCacheFilter, res.(string))
+					}
+				}
+			default:
+				return fmt.Errorf("compose file invalid: unkwown %s field for x-bake", key)
+			}
+		}
 	}
-
-	yb, _ := yaml.Marshal(ext)
-	if err := yaml.Unmarshal(yb, &xb); err != nil {
-		return err
-	}
-
-	if len(xb.Tags) > 0 {
-		t.Tags = dedupSlice(append(t.Tags, xb.Tags...))
-	}
-	if len(xb.CacheFrom) > 0 {
-		t.CacheFrom = dedupSlice(append(t.CacheFrom, xb.CacheFrom...))
-	}
-	if len(xb.CacheTo) > 0 {
-		t.CacheTo = dedupSlice(append(t.CacheTo, xb.CacheTo...))
-	}
-	if len(xb.Secrets) > 0 {
-		t.Secrets = dedupSlice(append(t.Secrets, xb.Secrets...))
-	}
-	if len(xb.SSH) > 0 {
-		t.SSH = dedupSlice(append(t.SSH, xb.SSH...))
-	}
-	if len(xb.Platforms) > 0 {
-		t.Platforms = dedupSlice(append(t.Platforms, xb.Platforms...))
-	}
-	if len(xb.Outputs) > 0 {
-		t.Outputs = dedupSlice(append(t.Outputs, xb.Outputs...))
-	}
-	if xb.Pull != nil {
-		t.Pull = xb.Pull
-	}
-	if xb.NoCache != nil {
-		t.NoCache = xb.NoCache
-	}
-	if len(xb.NoCacheFilter) > 0 {
-		t.NoCacheFilter = dedupSlice(append(t.NoCacheFilter, xb.NoCacheFilter...))
-	}
-	if len(xb.Contexts) > 0 {
-		t.Contexts = dedupMap(t.Contexts, xb.Contexts)
-	}
-
 	return nil
 }
-
-// composeToBuildkitSecret converts secret from compose format to buildkit's
-// csv format.
-func composeToBuildkitSecret(inp compose.ServiceSecretConfig, psecret compose.SecretConfig) (string, error) {
-	if psecret.External.External {
-		return "", errors.Errorf("unsupported external secret %s", psecret.Name)
-	}
-
-	var bkattrs []string
-	if inp.Source != "" {
-		bkattrs = append(bkattrs, "id="+inp.Source)
-	}
-	if psecret.File != "" {
-		bkattrs = append(bkattrs, "src="+psecret.File)
-	}
-	if psecret.Environment != "" {
-		bkattrs = append(bkattrs, "env="+psecret.Environment)
-	}
-
-	return strings.Join(bkattrs, ","), nil
-}

bake/compose_test.go

@@ -2,12 +2,9 @@ package bake
 
 import (
 	"os"
-	"path/filepath"
 	"sort"
 	"testing"
 
-	compose "github.com/compose-spec/compose-go/types"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -26,25 +23,13 @@ services:
         none
       args:
         buildno: 123
-      cache_from:
-        - type=local,src=path/to/cache
-      cache_to:
-        - type=local,dest=path/to/cache
-      secrets:
-        - token
-        - aws
-secrets:
-  token:
-    environment: ENV_TOKEN
-  aws:
-    file: /root/.aws/credentials
 `)
 
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose(dt)
 	require.NoError(t, err)
 
 	require.Equal(t, 1, len(c.Groups))
-	require.Equal(t, "default", c.Groups[0].Name)
+	require.Equal(t, c.Groups[0].Name, "default")
 	sort.Strings(c.Groups[0].Targets)
 	require.Equal(t, []string{"db", "webapp"}, c.Groups[0].Targets)
 
@@ -54,20 +39,13 @@ secrets:
 	})
 	require.Equal(t, "db", c.Targets[0].Name)
 	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, "./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"])
-	require.Equal(t, []string{"type=local,src=path/to/cache"}, c.Targets[1].CacheFrom)
-	require.Equal(t, []string{"type=local,dest=path/to/cache"}, c.Targets[1].CacheTo)
+	require.Equal(t, "123", c.Targets[1].Args["buildno"])
 	require.Equal(t, "none", *c.Targets[1].NetworkMode)
-	require.Equal(t, []string{
-		"id=token,env=ENV_TOKEN",
-		"id=aws,src=/root/.aws/credentials",
-	}, c.Targets[1].Secrets)
 }
 
 func TestNoBuildOutOfTreeService(t *testing.T) {
@@ -78,10 +56,9 @@ services:
     webapp:
         build: ./db
 `)
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose(dt)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(c.Groups))
-	require.Equal(t, 1, len(c.Targets))
 }
 
 func TestParseComposeTarget(t *testing.T) {
@@ -97,7 +74,7 @@ services:
       target: webapp
 `)
 
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose(dt)
 	require.NoError(t, err)
 
 	require.Equal(t, 2, len(c.Targets))
@@ -122,15 +99,15 @@ services:
       target: webapp
 `)
 
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose(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, "db", c.Targets[0].Name)
+	require.Equal(t, c.Targets[0].Name, "db")
 	require.Equal(t, "db", *c.Targets[0].Target)
-	require.Equal(t, "webapp", c.Targets[1].Name)
+	require.Equal(t, c.Targets[1].Name, "webapp")
 	require.Equal(t, "webapp", *c.Targets[1].Target)
 }
 
@@ -149,26 +126,35 @@ services:
         BRB: FOO
 `)
 
-	t.Setenv("FOO", "bar")
-	t.Setenv("BAR", "foo")
-	t.Setenv("ZZZ_BAR", "zzz_foo")
+	os.Setenv("FOO", "bar")
+	defer os.Unsetenv("FOO")
+	os.Setenv("BAR", "foo")
+	defer os.Unsetenv("BAR")
+	os.Setenv("ZZZ_BAR", "zzz_foo")
+	defer os.Unsetenv("ZZZ_BAR")
 
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, sliceToMap(os.Environ()))
+	c, err := ParseCompose(dt)
 	require.NoError(t, err)
-	require.Equal(t, ptrstr("bar"), c.Targets[0].Args["FOO"])
-	require.Equal(t, ptrstr("zzz_foo"), c.Targets[0].Args["BAR"])
-	require.Equal(t, ptrstr("FOO"), c.Targets[0].Args["BRB"])
+	require.Equal(t, c.Targets[0].Args["FOO"], "bar")
+	require.Equal(t, c.Targets[0].Args["BAR"], "zzz_foo")
+	require.Equal(t, c.Targets[0].Args["BRB"], "FOO")
 }
 
-func TestInconsistentComposeFile(t *testing.T) {
+func TestBogusCompose(t *testing.T) {
 	var dt = []byte(`
 services:
+  db:
+    labels:
+      - "foo"
   webapp:
-    entrypoint: echo 1
+    build:
+      context: .
+      target: webapp
 `)
 
-	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+	_, err := ParseCompose(dt)
 	require.Error(t, err)
+	require.Contains(t, err.Error(), "has neither an image nor a build context specified: invalid compose project")
 }
 
 func TestAdvancedNetwork(t *testing.T) {
@@ -192,28 +178,10 @@ networks:
           gateway: 10.5.0.254
 `)
 
-	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+	_, err := ParseCompose(dt)
 	require.NoError(t, err)
 }
 
-func TestTags(t *testing.T) {
-	var dt = []byte(`
-services:
-  example:
-    image: example
-    build:
-      context: .
-      dockerfile: Dockerfile
-      tags:
-        - foo
-        - bar
-`)
-
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
-	require.NoError(t, err)
-	require.Equal(t, []string{"foo", "bar"}, c.Targets[0].Tags)
-}
-
 func TestDependsOnList(t *testing.T) {
 	var dt = []byte(`
 version: "3.8"
@@ -246,7 +214,7 @@ networks:
     name: test-net
 `)
 
-	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+	_, err := ParseCompose(dt)
 	require.NoError(t, err)
 }
 
@@ -260,16 +228,10 @@ services:
       dockerfile: ./Dockerfile
       cache_from:
         - user/app:cache
-      cache_to:
-        - user/app:cache
-      tags:
-        - ct-addon:baz
       args:
         CT_ECR: foo
         CT_TAG: bar
       x-bake:
-        contexts:
-          alpine: docker-image://alpine:3.13
         tags:
           - ct-addon:foo
           - ct-addon:alp
@@ -278,8 +240,7 @@ services:
           - linux/arm64
         cache-from:
           - type=local,src=path/to/cache
-        cache-to:
-          - type=local,dest=path/to/cache
+        cache-to: local,dest=path/to/cache
         pull: true
 
   aws:
@@ -299,56 +260,24 @@ services:
         no-cache: true
 `)
 
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose(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, map[string]*string{"CT_ECR": ptrstr("foo"), "CT_TAG": ptrstr("bar")}, c.Targets[0].Args)
-	require.Equal(t, []string{"ct-addon:baz", "ct-addon:foo", "ct-addon:alp"}, c.Targets[0].Tags)
-	require.Equal(t, []string{"linux/amd64", "linux/arm64"}, c.Targets[0].Platforms)
-	require.Equal(t, []string{"user/app:cache", "type=local,src=path/to/cache"}, c.Targets[0].CacheFrom)
-	require.Equal(t, []string{"user/app:cache", "type=local,dest=path/to/cache"}, c.Targets[0].CacheTo)
-	require.Equal(t, newBool(true), c.Targets[0].Pull)
-	require.Equal(t, map[string]string{"alpine": "docker-image://alpine:3.13"}, c.Targets[0].Contexts)
-	require.Equal(t, []string{"ct-fake-aws:bar"}, c.Targets[1].Tags)
-	require.Equal(t, []string{"id=mysecret,src=/local/secret", "id=mysecret2,src=/local/secret2"}, c.Targets[1].Secrets)
-	require.Equal(t, []string{"default"}, c.Targets[1].SSH)
-	require.Equal(t, []string{"linux/arm64"}, c.Targets[1].Platforms)
-	require.Equal(t, []string{"type=docker"}, c.Targets[1].Outputs)
-	require.Equal(t, newBool(true), c.Targets[1].NoCache)
-}
-
-func TestComposeExtDedup(t *testing.T) {
-	var dt = []byte(`
-services:
-  webapp:
-    image: app:bar
-    build:
-      cache_from:
-        - user/app:cache
-      cache_to:
-        - user/app:cache
-      tags:
-        - ct-addon:foo
-      x-bake:
-        tags:
-          - ct-addon:foo
-          - ct-addon:baz
-        cache-from:
-          - user/app:cache
-          - type=local,src=path/to/cache
-        cache-to:
-          - type=local,dest=path/to/cache
-`)
-
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
-	require.NoError(t, err)
-	require.Equal(t, 1, len(c.Targets))
-	require.Equal(t, []string{"ct-addon:foo", "ct-addon:baz"}, c.Targets[0].Tags)
-	require.Equal(t, []string{"user/app:cache", "type=local,src=path/to/cache"}, c.Targets[0].CacheFrom)
-	require.Equal(t, []string{"user/app:cache", "type=local,dest=path/to/cache"}, c.Targets[0].CacheTo)
+	require.Equal(t, c.Targets[0].Args, map[string]string{"CT_ECR": "foo", "CT_TAG": "bar"})
+	require.Equal(t, c.Targets[0].Tags, []string{"ct-addon:foo", "ct-addon:alp"})
+	require.Equal(t, c.Targets[0].Platforms, []string{"linux/amd64", "linux/arm64"})
+	require.Equal(t, c.Targets[0].CacheFrom, []string{"type=local,src=path/to/cache"})
+	require.Equal(t, c.Targets[0].CacheTo, []string{"local,dest=path/to/cache"})
+	require.Equal(t, c.Targets[0].Pull, newBool(true))
+	require.Equal(t, c.Targets[1].Tags, []string{"ct-fake-aws:bar"})
+	require.Equal(t, c.Targets[1].Secrets, []string{"id=mysecret,src=/local/secret", "id=mysecret2,src=/local/secret2"})
+	require.Equal(t, c.Targets[1].SSH, []string{"default"})
+	require.Equal(t, c.Targets[1].Platforms, []string{"linux/arm64"})
+	require.Equal(t, c.Targets[1].Outputs, []string{"type=docker"})
+	require.Equal(t, c.Targets[1].NoCache, newBool(true))
 }
 
 func TestEnv(t *testing.T) {
@@ -376,54 +305,9 @@ services:
       - ` + envf.Name() + `
 `)
 
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
-	require.NoError(t, err)
-	require.Equal(t, map[string]*string{"CT_ECR": ptrstr("foo"), "FOO": ptrstr("bsdf -csdf"), "NODE_ENV": ptrstr("test")}, c.Targets[0].Args)
-}
-
-func TestDotEnv(t *testing.T) {
-	tmpdir := t.TempDir()
-
-	err := os.WriteFile(filepath.Join(tmpdir, ".env"), []byte("FOO=bar"), 0644)
-	require.NoError(t, err)
-
-	var dt = []byte(`
-services:
-  scratch:
-    build:
-     context: .
-     args:
-        FOO:
-`)
-
-	chdir(t, tmpdir)
-	c, err := ParseComposeFiles([]File{{
-		Name: "docker-compose.yml",
-		Data: dt,
-	}})
-	require.NoError(t, err)
-	require.Equal(t, map[string]*string{"FOO": ptrstr("bar")}, c.Targets[0].Args)
-}
-
-func TestPorts(t *testing.T) {
-	var dt = []byte(`
-services:
-  foo:
-    build:
-     context: .
-    ports:
-      - 3306:3306
-  bar:
-    build:
-     context: .
-    ports:
-      - mode: ingress
-        target: 3306
-        published: "3306"
-        protocol: tcp
-`)
-	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose(dt)
 	require.NoError(t, err)
+	require.Equal(t, c.Targets[0].Args, map[string]string{"CT_ECR": "foo", "FOO": "bsdf -csdf", "NODE_ENV": "test"})
 }
 
 func newBool(val bool) *bool {
@@ -448,6 +332,10 @@ func TestServiceName(t *testing.T) {
 			svc:     "a.b",
 			wantErr: false,
 		},
+		{
+			svc:     "a?b",
+			wantErr: true,
+		},
 		{
 			svc:     "_a",
 			wantErr: false,
@@ -468,12 +356,12 @@ func TestServiceName(t *testing.T) {
 	for _, tt := range cases {
 		tt := tt
 		t.Run(tt.svc, func(t *testing.T) {
-			_, err := ParseCompose([]compose.ConfigFile{{Content: []byte(`
+			_, err := ParseCompose([]byte(`
 services:
   ` + tt.svc + `:
     build:
       context: .
-`)}}, nil)
+`))
 			if tt.wantErr {
 				require.Error(t, err)
 			} else {
@@ -482,180 +370,3 @@ services:
 		})
 	}
 }
-
-func TestValidateComposeSecret(t *testing.T) {
-	cases := []struct {
-		name    string
-		dt      []byte
-		wantErr bool
-	}{
-		{
-			name: "secret set by file",
-			dt: []byte(`
-secrets:
-  foo:
-    file: .secret
-`),
-			wantErr: false,
-		},
-		{
-			name: "secret set by environment",
-			dt: []byte(`
-secrets:
-  foo:
-    environment: TOKEN
-`),
-			wantErr: false,
-		},
-		{
-			name: "external secret",
-			dt: []byte(`
-secrets:
-  foo:
-    external: true
-`),
-			wantErr: false,
-		},
-		{
-			name: "unset secret",
-			dt: []byte(`
-secrets:
-  foo: {}
-`),
-			wantErr: true,
-		},
-		{
-			name: "undefined secret",
-			dt: []byte(`
-services:
-  foo:
-    build:
-      secrets:
-        - token
-`),
-			wantErr: true,
-		},
-	}
-	for _, tt := range cases {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			_, err := ParseCompose([]compose.ConfigFile{{Content: tt.dt}}, nil)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestValidateComposeFile(t *testing.T) {
-	cases := []struct {
-		name      string
-		fn        string
-		dt        []byte
-		isCompose bool
-		wantErr   bool
-	}{
-		{
-			name: "empty service",
-			fn:   "docker-compose.yml",
-			dt: []byte(`
-services:
-  foo:
-`),
-			isCompose: true,
-			wantErr:   true,
-		},
-		{
-			name: "build",
-			fn:   "docker-compose.yml",
-			dt: []byte(`
-services:
-  foo:
-    build: .
-`),
-			isCompose: true,
-			wantErr:   false,
-		},
-		{
-			name: "image",
-			fn:   "docker-compose.yml",
-			dt: []byte(`
-services:
-  simple:
-    image: nginx
-`),
-			isCompose: true,
-			wantErr:   false,
-		},
-		{
-			name: "unknown ext",
-			fn:   "docker-compose.foo",
-			dt: []byte(`
-services:
-  simple:
-    image: nginx
-`),
-			isCompose: true,
-			wantErr:   false,
-		},
-		{
-			name: "hcl",
-			fn:   "docker-bake.hcl",
-			dt: []byte(`
-target "default" {
-  dockerfile = "test"
-}
-`),
-			isCompose: false,
-			wantErr:   false,
-		},
-	}
-	for _, tt := range cases {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			isCompose, err := validateComposeFile(tt.dt, tt.fn)
-			assert.Equal(t, tt.isCompose, isCompose)
-			if tt.wantErr {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestComposeNullArgs(t *testing.T) {
-	var dt = []byte(`
-services:
-  scratch:
-    build:
-     context: .
-     args:
-        FOO: null
-        bar: "baz"
-`)
-
-	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
-	require.NoError(t, err)
-	require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, c.Targets[0].Args)
-}
-
-// 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) {
-	olddir, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("chdir: %v", err)
-	}
-	if err := os.Chdir(dir); err != nil {
-		t.Fatalf("chdir %s: %v", dir, err)
-	}
-	t.Cleanup(func() {
-		if err := os.Chdir(olddir); err != nil {
-			t.Errorf("chdir to original working directory %s: %v", olddir, err)
-			os.Exit(1)
-		}
-	})
-}

bake/hcl_test.go

@@ -1,7 +1,7 @@
 package bake
 
 import (
-	"reflect"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -54,7 +54,7 @@ func TestHCLBasic(t *testing.T) {
 
 	require.Equal(t, c.Targets[1].Name, "webapp")
 	require.Equal(t, 1, len(c.Targets[1].Args))
-	require.Equal(t, ptrstr("123"), c.Targets[1].Args["buildno"])
+	require.Equal(t, "123", c.Targets[1].Args["buildno"])
 
 	require.Equal(t, c.Targets[2].Name, "cross")
 	require.Equal(t, 2, len(c.Targets[2].Platforms))
@@ -62,7 +62,7 @@ func TestHCLBasic(t *testing.T) {
 
 	require.Equal(t, c.Targets[3].Name, "webapp-plus")
 	require.Equal(t, 1, len(c.Targets[3].Args))
-	require.Equal(t, map[string]*string{"IAMCROSS": ptrstr("true")}, c.Targets[3].Args)
+	require.Equal(t, map[string]string{"IAMCROSS": "true"}, c.Targets[3].Args)
 }
 
 func TestHCLBasicInJSON(t *testing.T) {
@@ -114,7 +114,7 @@ func TestHCLBasicInJSON(t *testing.T) {
 
 	require.Equal(t, c.Targets[1].Name, "webapp")
 	require.Equal(t, 1, len(c.Targets[1].Args))
-	require.Equal(t, ptrstr("123"), c.Targets[1].Args["buildno"])
+	require.Equal(t, "123", c.Targets[1].Args["buildno"])
 
 	require.Equal(t, c.Targets[2].Name, "cross")
 	require.Equal(t, 2, len(c.Targets[2].Platforms))
@@ -122,7 +122,7 @@ func TestHCLBasicInJSON(t *testing.T) {
 
 	require.Equal(t, c.Targets[3].Name, "webapp-plus")
 	require.Equal(t, 1, len(c.Targets[3].Args))
-	require.Equal(t, map[string]*string{"IAMCROSS": ptrstr("true")}, c.Targets[3].Args)
+	require.Equal(t, map[string]string{"IAMCROSS": "true"}, c.Targets[3].Args)
 }
 
 func TestHCLWithFunctions(t *testing.T) {
@@ -147,7 +147,7 @@ func TestHCLWithFunctions(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "webapp")
-	require.Equal(t, ptrstr("124"), c.Targets[0].Args["buildno"])
+	require.Equal(t, "124", c.Targets[0].Args["buildno"])
 }
 
 func TestHCLWithUserDefinedFunctions(t *testing.T) {
@@ -177,7 +177,7 @@ func TestHCLWithUserDefinedFunctions(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "webapp")
-	require.Equal(t, ptrstr("124"), c.Targets[0].Args["buildno"])
+	require.Equal(t, "124", c.Targets[0].Args["buildno"])
 }
 
 func TestHCLWithVariables(t *testing.T) {
@@ -206,9 +206,9 @@ func TestHCLWithVariables(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "webapp")
-	require.Equal(t, ptrstr("123"), c.Targets[0].Args["buildno"])
+	require.Equal(t, "123", c.Targets[0].Args["buildno"])
 
-	t.Setenv("BUILD_NUMBER", "456")
+	os.Setenv("BUILD_NUMBER", "456")
 
 	c, err = ParseFile(dt, "docker-bake.hcl")
 	require.NoError(t, err)
@@ -219,7 +219,7 @@ func TestHCLWithVariables(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "webapp")
-	require.Equal(t, ptrstr("456"), c.Targets[0].Args["buildno"])
+	require.Equal(t, "456", c.Targets[0].Args["buildno"])
 }
 
 func TestHCLWithVariablesInFunctions(t *testing.T) {
@@ -244,7 +244,7 @@ func TestHCLWithVariablesInFunctions(t *testing.T) {
 	require.Equal(t, c.Targets[0].Name, "webapp")
 	require.Equal(t, []string{"user/repo:v1"}, c.Targets[0].Tags)
 
-	t.Setenv("REPO", "docker/buildx")
+	os.Setenv("REPO", "docker/buildx")
 
 	c, err = ParseFile(dt, "docker-bake.hcl")
 	require.NoError(t, err)
@@ -280,10 +280,10 @@ func TestHCLMultiFileSharedVariables(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("pre-abc"), c.Targets[0].Args["v1"])
-	require.Equal(t, ptrstr("abc-post"), c.Targets[0].Args["v2"])
+	require.Equal(t, "pre-abc", c.Targets[0].Args["v1"])
+	require.Equal(t, "abc-post", c.Targets[0].Args["v2"])
 
-	t.Setenv("FOO", "def")
+	os.Setenv("FOO", "def")
 
 	c, err = ParseFiles([]File{
 		{Data: dt, Name: "c1.hcl"},
@@ -293,11 +293,12 @@ func TestHCLMultiFileSharedVariables(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("pre-def"), c.Targets[0].Args["v1"])
-	require.Equal(t, ptrstr("def-post"), c.Targets[0].Args["v2"])
+	require.Equal(t, "pre-def", c.Targets[0].Args["v1"])
+	require.Equal(t, "def-post", c.Targets[0].Args["v2"])
 }
 
 func TestHCLVarsWithVars(t *testing.T) {
+	os.Unsetenv("FOO")
 	dt := []byte(`
 		variable "FOO" {
 			default = upper("${BASE}def")
@@ -329,10 +330,10 @@ func TestHCLVarsWithVars(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("pre--ABCDEF-"), c.Targets[0].Args["v1"])
-	require.Equal(t, ptrstr("ABCDEF-post"), c.Targets[0].Args["v2"])
+	require.Equal(t, "pre--ABCDEF-", c.Targets[0].Args["v1"])
+	require.Equal(t, "ABCDEF-post", c.Targets[0].Args["v2"])
 
-	t.Setenv("BASE", "new")
+	os.Setenv("BASE", "new")
 
 	c, err = ParseFiles([]File{
 		{Data: dt, Name: "c1.hcl"},
@@ -342,11 +343,12 @@ func TestHCLVarsWithVars(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("pre--NEWDEF-"), c.Targets[0].Args["v1"])
-	require.Equal(t, ptrstr("NEWDEF-post"), c.Targets[0].Args["v2"])
+	require.Equal(t, "pre--NEWDEF-", c.Targets[0].Args["v1"])
+	require.Equal(t, "NEWDEF-post", c.Targets[0].Args["v2"])
 }
 
 func TestHCLTypedVariables(t *testing.T) {
+	os.Unsetenv("FOO")
 	dt := []byte(`
 		variable "FOO" {
 			default = 3
@@ -367,80 +369,33 @@ func TestHCLTypedVariables(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("lower"), c.Targets[0].Args["v1"])
-	require.Equal(t, ptrstr("yes"), c.Targets[0].Args["v2"])
+	require.Equal(t, "lower", c.Targets[0].Args["v1"])
+	require.Equal(t, "yes", c.Targets[0].Args["v2"])
 
-	t.Setenv("FOO", "5.1")
-	t.Setenv("IS_FOO", "0")
+	os.Setenv("FOO", "5.1")
+	os.Setenv("IS_FOO", "0")
 
 	c, err = ParseFile(dt, "docker-bake.hcl")
 	require.NoError(t, err)
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("higher"), c.Targets[0].Args["v1"])
-	require.Equal(t, ptrstr("no"), c.Targets[0].Args["v2"])
+	require.Equal(t, "higher", c.Targets[0].Args["v1"])
+	require.Equal(t, "no", c.Targets[0].Args["v2"])
 
-	t.Setenv("FOO", "NaN")
+	os.Setenv("FOO", "NaN")
 	_, err = ParseFile(dt, "docker-bake.hcl")
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "failed to parse FOO as number")
 
-	t.Setenv("FOO", "0")
-	t.Setenv("IS_FOO", "maybe")
+	os.Setenv("FOO", "0")
+	os.Setenv("IS_FOO", "maybe")
 
 	_, err = ParseFile(dt, "docker-bake.hcl")
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "failed to parse IS_FOO as bool")
 }
 
-func TestHCLNullVariables(t *testing.T) {
-	dt := []byte(`
-		variable "FOO" {
-			default = null
-		}
-		target "default" {
-			args = {
-				foo = FOO
-			}
-		}`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-	require.Equal(t, ptrstr(nil), c.Targets[0].Args["foo"])
-
-	t.Setenv("FOO", "bar")
-	c, err = ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-	require.Equal(t, ptrstr("bar"), c.Targets[0].Args["foo"])
-}
-
-func TestJSONNullVariables(t *testing.T) {
-	dt := []byte(`{
-		"variable": {
-			"FOO": {
-				"default": null
-			}
-		},
-		"target": {
-			"default": {
-				"args": {
-					"foo": "${FOO}"
-				}
-			}
-		}
-	}`)
-
-	c, err := ParseFile(dt, "docker-bake.json")
-	require.NoError(t, err)
-	require.Equal(t, ptrstr(nil), c.Targets[0].Args["foo"])
-
-	t.Setenv("FOO", "bar")
-	c, err = ParseFile(dt, "docker-bake.json")
-	require.NoError(t, err)
-	require.Equal(t, ptrstr("bar"), c.Targets[0].Args["foo"])
-}
-
 func TestHCLVariableCycle(t *testing.T) {
 	dt := []byte(`
 		variable "FOO" {
@@ -476,107 +431,19 @@ func TestHCLAttrs(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("attr-abcdef"), c.Targets[0].Args["v1"])
+	require.Equal(t, "attr-abcdef", c.Targets[0].Args["v1"])
 
 	// env does not apply if no variable
-	t.Setenv("FOO", "bar")
+	os.Setenv("FOO", "bar")
 	c, err = ParseFile(dt, "docker-bake.hcl")
 	require.NoError(t, err)
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("attr-abcdef"), c.Targets[0].Args["v1"])
+	require.Equal(t, "attr-abcdef", c.Targets[0].Args["v1"])
 	// attr-multifile
 }
 
-func TestHCLTargetAttrs(t *testing.T) {
-	dt := []byte(`
-		target "foo" {
-			dockerfile = "xxx"
-			context = target.bar.context
-			target = target.foo.dockerfile
-		}
-		
-		target "bar" {
-			dockerfile = target.foo.dockerfile
-			context = "yyy"
-			target = target.bar.context
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(c.Targets))
-	require.Equal(t, "foo", c.Targets[0].Name)
-	require.Equal(t, "bar", c.Targets[1].Name)
-
-	require.Equal(t, "xxx", *c.Targets[0].Dockerfile)
-	require.Equal(t, "yyy", *c.Targets[0].Context)
-	require.Equal(t, "xxx", *c.Targets[0].Target)
-
-	require.Equal(t, "xxx", *c.Targets[1].Dockerfile)
-	require.Equal(t, "yyy", *c.Targets[1].Context)
-	require.Equal(t, "yyy", *c.Targets[1].Target)
-}
-
-func TestHCLTargetGlobal(t *testing.T) {
-	dt := []byte(`
-		target "foo" {
-			dockerfile = "x"
-		}
-		x = target.foo.dockerfile
-		y = x
-		target "bar" {
-			dockerfile = y
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 2, len(c.Targets))
-	require.Equal(t, "foo", c.Targets[0].Name)
-	require.Equal(t, "bar", c.Targets[1].Name)
-
-	require.Equal(t, "x", *c.Targets[0].Dockerfile)
-	require.Equal(t, "x", *c.Targets[1].Dockerfile)
-}
-
-func TestHCLTargetAttrName(t *testing.T) {
-	dt := []byte(`
-		target "foo" {
-			dockerfile = target.foo.name
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(c.Targets))
-	require.Equal(t, "foo", c.Targets[0].Name)
-	require.Equal(t, "foo", *c.Targets[0].Dockerfile)
-}
-
-func TestHCLTargetAttrEmptyChain(t *testing.T) {
-	dt := []byte(`
-		target "foo" {
-			# dockerfile = Dockerfile
-			context = target.foo.dockerfile
-			target = target.foo.context
-		}
-		`)
-
-	c, err := ParseFile(dt, "docker-bake.hcl")
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(c.Targets))
-	require.Equal(t, "foo", c.Targets[0].Name)
-	require.Nil(t, c.Targets[0].Dockerfile)
-	require.Nil(t, c.Targets[0].Context)
-	require.Nil(t, c.Targets[0].Target)
-}
-
 func TestHCLAttrsCustomType(t *testing.T) {
 	dt := []byte(`
 		platforms=["linux/arm64", "linux/amd64"]
@@ -594,10 +461,11 @@ func TestHCLAttrsCustomType(t *testing.T) {
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
 	require.Equal(t, []string{"linux/arm64", "linux/amd64"}, c.Targets[0].Platforms)
-	require.Equal(t, ptrstr("linux/arm64"), c.Targets[0].Args["v1"])
+	require.Equal(t, "linux/arm64", c.Targets[0].Args["v1"])
 }
 
 func TestHCLMultiFileAttrs(t *testing.T) {
+	os.Unsetenv("FOO")
 	dt := []byte(`
 		variable "FOO" {
 			default = "abc"
@@ -619,9 +487,9 @@ func TestHCLMultiFileAttrs(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("pre-def"), c.Targets[0].Args["v1"])
+	require.Equal(t, "pre-def", c.Targets[0].Args["v1"])
 
-	t.Setenv("FOO", "ghi")
+	os.Setenv("FOO", "ghi")
 
 	c, err = ParseFiles([]File{
 		{Data: dt, Name: "c1.hcl"},
@@ -631,7 +499,7 @@ func TestHCLMultiFileAttrs(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("pre-ghi"), c.Targets[0].Args["v1"])
+	require.Equal(t, "pre-ghi", c.Targets[0].Args["v1"])
 }
 
 func TestJSONAttributes(t *testing.T) {
@@ -642,7 +510,7 @@ func TestJSONAttributes(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("pre-abc-def"), c.Targets[0].Args["v1"])
+	require.Equal(t, "pre-abc-def", c.Targets[0].Args["v1"])
 }
 
 func TestJSONFunctions(t *testing.T) {
@@ -667,25 +535,7 @@ func TestJSONFunctions(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	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"])
+	require.Equal(t, "pre-<FOO-abc>", c.Targets[0].Args["v1"])
 }
 
 func TestHCLFunctionInAttr(t *testing.T) {
@@ -713,7 +563,7 @@ func TestHCLFunctionInAttr(t *testing.T) {
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("FOO <> [baz]"), c.Targets[0].Args["v1"])
+	require.Equal(t, "FOO <> [baz]", c.Targets[0].Args["v1"])
 }
 
 func TestHCLCombineCompose(t *testing.T) {
@@ -744,8 +594,8 @@ services:
 
 	require.Equal(t, 1, len(c.Targets))
 	require.Equal(t, c.Targets[0].Name, "app")
-	require.Equal(t, ptrstr("foo"), c.Targets[0].Args["v1"])
-	require.Equal(t, ptrstr("bar"), c.Targets[0].Args["v2"])
+	require.Equal(t, "foo", c.Targets[0].Args["v1"])
+	require.Equal(t, "bar", c.Targets[0].Args["v2"])
 	require.Equal(t, "dir", *c.Targets[0].Context)
 	require.Equal(t, "Dockerfile-alternate", *c.Targets[0].Dockerfile)
 }
@@ -770,186 +620,3 @@ func TestHCLBuiltinVars(t *testing.T) {
 	require.Equal(t, "foo", *c.Targets[0].Context)
 	require.Equal(t, "test", *c.Targets[0].Dockerfile)
 }
-
-func TestCombineHCLAndJSONTargets(t *testing.T) {
-	c, err := ParseFiles([]File{
-		{
-			Name: "docker-bake.hcl",
-			Data: []byte(`
-group "default" {
-  targets = ["a"]
-}
-
-target "metadata-a" {}
-target "metadata-b" {}
-
-target "a" {
-  inherits = ["metadata-a"]
-  context = "."
-  target = "a"
-}
-
-target "b" {
-  inherits = ["metadata-b"]
-  context = "."
-  target = "b"
-}`),
-		},
-		{
-			Name: "metadata-a.json",
-			Data: []byte(`
-{
-  "target": [{
-    "metadata-a": [{
-      "tags": [
-        "app/a:1.0.0",
-        "app/a:latest"
-      ]
-    }]
-  }]
-}`),
-		},
-		{
-			Name: "metadata-b.json",
-			Data: []byte(`
-{
-  "target": [{
-    "metadata-b": [{
-      "tags": [
-        "app/b:1.0.0",
-        "app/b:latest"
-      ]
-    }]
-  }]
-}`),
-		},
-	}, nil)
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(c.Groups))
-	require.Equal(t, "default", c.Groups[0].Name)
-	require.Equal(t, []string{"a"}, c.Groups[0].Targets)
-
-	require.Equal(t, 4, len(c.Targets))
-
-	require.Equal(t, c.Targets[0].Name, "metadata-a")
-	require.Equal(t, []string{"app/a:1.0.0", "app/a:latest"}, c.Targets[0].Tags)
-
-	require.Equal(t, c.Targets[1].Name, "metadata-b")
-	require.Equal(t, []string{"app/b:1.0.0", "app/b:latest"}, c.Targets[1].Tags)
-
-	require.Equal(t, c.Targets[2].Name, "a")
-	require.Equal(t, ".", *c.Targets[2].Context)
-	require.Equal(t, "a", *c.Targets[2].Target)
-
-	require.Equal(t, c.Targets[3].Name, "b")
-	require.Equal(t, ".", *c.Targets[3].Context)
-	require.Equal(t, "b", *c.Targets[3].Target)
-}
-
-func TestCombineHCLAndJSONVars(t *testing.T) {
-	c, err := ParseFiles([]File{
-		{
-			Name: "docker-bake.hcl",
-			Data: []byte(`
-variable "ABC" {
-  default = "foo"
-}
-variable "DEF" {
-  default = ""
-}
-group "default" {
-  targets = ["one"]
-}
-target "one" {
-  args = {
-    a = "pre-${ABC}"
-  }
-}
-target "two" {
-  args = {
-    b = "pre-${DEF}"
-  }
-}`),
-		},
-		{
-			Name: "foo.json",
-			Data: []byte(`{"variable": {"DEF": {"default": "bar"}}, "target": { "one": { "args": {"a": "pre-${ABC}-${DEF}"}} } }`),
-		},
-		{
-			Name: "bar.json",
-			Data: []byte(`{"ABC": "ghi", "DEF": "jkl"}`),
-		},
-	}, nil)
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(c.Groups))
-	require.Equal(t, "default", c.Groups[0].Name)
-	require.Equal(t, []string{"one"}, c.Groups[0].Targets)
-
-	require.Equal(t, 2, len(c.Targets))
-
-	require.Equal(t, c.Targets[0].Name, "one")
-	require.Equal(t, map[string]*string{"a": ptrstr("pre-ghi-jkl")}, c.Targets[0].Args)
-
-	require.Equal(t, c.Targets[1].Name, "two")
-	require.Equal(t, map[string]*string{"b": ptrstr("pre-jkl")}, c.Targets[1].Args)
-}
-
-func TestEmptyVariableJSON(t *testing.T) {
-	dt := []byte(`{
-	  "variable": {
-	    "VAR": {}
-	  }
-	}`)
-	_, err := ParseFile(dt, "docker-bake.json")
-	require.NoError(t, err)
-}
-
-func TestFunctionNoParams(t *testing.T) {
-	dt := []byte(`
-		function "foo" {
-			result = "bar"
-		}
-		target "foo_target" {
-			args = {
-				test = foo()
-			}
-		}
-		`)
-
-	_, err := ParseFile(dt, "docker-bake.hcl")
-	require.Error(t, err)
-}
-
-func TestFunctionNoResult(t *testing.T) {
-	dt := []byte(`
-		function "foo" {
-			params = ["a"]
-		}
-		`)
-
-	_, err := ParseFile(dt, "docker-bake.hcl")
-	require.Error(t, err)
-}
-
-func TestVarUnsupportedType(t *testing.T) {
-	dt := []byte(`
-		variable "FOO" {
-			default = []
-		}
-		target "default" {}`)
-
-	t.Setenv("FOO", "bar")
-	_, err := ParseFile(dt, "docker-bake.hcl")
-	require.Error(t, err)
-}
-
-func ptrstr(s interface{}) *string {
-	var n *string = nil
-	if reflect.ValueOf(s).Kind() == reflect.String {
-		ss := s.(string)
-		n = &ss
-	}
-	return n
-}

bake/hclparser/body.go

@@ -1,103 +0,0 @@
-package hclparser
-
-import (
-	"github.com/hashicorp/hcl/v2"
-)
-
-type filterBody struct {
-	body    hcl.Body
-	schema  *hcl.BodySchema
-	exclude bool
-}
-
-func FilterIncludeBody(body hcl.Body, schema *hcl.BodySchema) hcl.Body {
-	return &filterBody{
-		body:   body,
-		schema: schema,
-	}
-}
-
-func FilterExcludeBody(body hcl.Body, schema *hcl.BodySchema) hcl.Body {
-	return &filterBody{
-		body:    body,
-		schema:  schema,
-		exclude: true,
-	}
-}
-
-func (b *filterBody) Content(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Diagnostics) {
-	if b.exclude {
-		schema = subtractSchemas(schema, b.schema)
-	} else {
-		schema = intersectSchemas(schema, b.schema)
-	}
-	content, _, diag := b.body.PartialContent(schema)
-	return content, diag
-}
-
-func (b *filterBody) PartialContent(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Body, hcl.Diagnostics) {
-	if b.exclude {
-		schema = subtractSchemas(schema, b.schema)
-	} else {
-		schema = intersectSchemas(schema, b.schema)
-	}
-	return b.body.PartialContent(schema)
-}
-
-func (b *filterBody) JustAttributes() (hcl.Attributes, hcl.Diagnostics) {
-	return b.body.JustAttributes()
-}
-
-func (b *filterBody) MissingItemRange() hcl.Range {
-	return b.body.MissingItemRange()
-}
-
-func intersectSchemas(a, b *hcl.BodySchema) *hcl.BodySchema {
-	result := &hcl.BodySchema{}
-	for _, blockA := range a.Blocks {
-		for _, blockB := range b.Blocks {
-			if blockA.Type == blockB.Type {
-				result.Blocks = append(result.Blocks, blockA)
-				break
-			}
-		}
-	}
-	for _, attrA := range a.Attributes {
-		for _, attrB := range b.Attributes {
-			if attrA.Name == attrB.Name {
-				result.Attributes = append(result.Attributes, attrA)
-				break
-			}
-		}
-	}
-	return result
-}
-
-func subtractSchemas(a, b *hcl.BodySchema) *hcl.BodySchema {
-	result := &hcl.BodySchema{}
-	for _, blockA := range a.Blocks {
-		found := false
-		for _, blockB := range b.Blocks {
-			if blockA.Type == blockB.Type {
-				found = true
-				break
-			}
-		}
-		if !found {
-			result.Blocks = append(result.Blocks, blockA)
-		}
-	}
-	for _, attrA := range a.Attributes {
-		found := false
-		for _, attrB := range b.Attributes {
-			if attrA.Name == attrB.Name {
-				found = true
-				break
-			}
-		}
-		if !found {
-			result.Attributes = append(result.Attributes, attrA)
-		}
-	}
-	return result
-}

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
 	}
@@ -75,11 +83,11 @@ func appendJSONFuncCalls(exp hcl.Expression, m map[string]struct{}) error {
 
 	// hcl/v2/json/ast#stringVal
 	val := src.FieldByName("Value")
-	if !val.IsValid() || val.IsZero() {
+	if val.IsZero() {
 		return nil
 	}
 	rng := src.FieldByName("SrcRange")
-	if rng.IsZero() {
+	if val.IsZero() {
 		return nil
 	}
 	var stringVal struct {

bake/hclparser/hclparser.go

@@ -13,7 +13,6 @@ import (
 	"github.com/hashicorp/hcl/v2/gohcl"
 	"github.com/pkg/errors"
 	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/gocty"
 )
 
 type Opt struct {
@@ -49,22 +48,14 @@ 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
-	blockTypes  map[string]reflect.Type
-
 	ectx *hcl.EvalContext
 
 	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{}
 }
 
-var errUndefined = errors.New("undefined")
-
-func (p *parser) loadDeps(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
@@ -72,10 +63,15 @@ func (p *parser) loadDeps(exp hcl.Expression, exclude map[string]struct{}, allow
 
 	for _, fn := range fns {
 		if err := p.resolveFunction(fn); err != nil {
-			if allowMissing && errors.Is(err, errUndefined) {
-				continue
+			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())
 		}
 	}
 
@@ -83,59 +79,15 @@ func (p *parser) loadDeps(exp hcl.Expression, exclude map[string]struct{}, allow
 		if _, ok := exclude[v.RootName()]; ok {
 			continue
 		}
-		if _, ok := p.blockTypes[v.RootName()]; ok {
-			blockType := v.RootName()
-
-			split := v.SimpleSplit().Rel
-			if len(split) == 0 {
-				return hcl.Diagnostics{
-					&hcl.Diagnostic{
-						Severity: hcl.DiagError,
-						Summary:  "Invalid expression",
-						Detail:   fmt.Sprintf("cannot access %s as a variable", blockType),
-						Subject:  exp.Range().Ptr(),
-						Context:  exp.Range().Ptr(),
-					},
-				}
-			}
-			blockName, ok := split[0].(hcl.TraverseAttr)
-			if !ok {
-				return hcl.Diagnostics{
-					&hcl.Diagnostic{
-						Severity: hcl.DiagError,
-						Summary:  "Invalid expression",
-						Detail:   fmt.Sprintf("cannot traverse %s without attribute", blockType),
-						Subject:  exp.Range().Ptr(),
-						Context:  exp.Range().Ptr(),
-					},
-				}
-			}
-			blocks := p.blocks[blockType][blockName.Name]
-			if len(blocks) == 0 {
-				continue
-			}
-
-			var target *hcl.BodySchema
-			if len(split) > 1 {
-				if attr, ok := split[1].(hcl.TraverseAttr); ok {
-					target = &hcl.BodySchema{
-						Attributes: []hcl.AttributeSchema{{Name: attr.Name}},
-						Blocks:     []hcl.BlockHeaderSchema{{Type: attr.Name}},
-					}
-				}
-			}
-			if err := p.resolveBlock(blocks[0], target); err != nil {
-				if allowMissing && errors.Is(err, errUndefined) {
-					continue
-				}
-				return wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
-			}
-		} else {
-			if err := p.resolveValue(v.RootName()); err != nil {
-				if allowMissing && errors.Is(err, errUndefined) {
-					continue
-				}
-				return wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
+		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(),
+				},
 			}
 		}
 	}
@@ -143,8 +95,6 @@ func (p *parser) loadDeps(exp hcl.Expression, exclude map[string]struct{}, allow
 	return nil
 }
 
-// resolveFunction forces evaluation of a function, storing the result into the
-// parser.
 func (p *parser) resolveFunction(name string) error {
 	if _, ok := p.doneF[name]; ok {
 		return nil
@@ -154,20 +104,13 @@ func (p *parser) resolveFunction(name string) error {
 		if _, ok := p.ectx.Functions[name]; ok {
 			return nil
 		}
-		return errors.Wrapf(errUndefined, "function %q does not exit", name)
+		return errors.Errorf("undefined function %s", name)
 	}
 	if _, ok := p.progressF[name]; ok {
 		return errors.Errorf("function cycle not allowed for %s", name)
 	}
 	p.progressF[name] = struct{}{}
 
-	if f.Result == nil {
-		return errors.Errorf("empty result not allowed for %s", name)
-	}
-	if f.Params == nil {
-		return errors.Errorf("empty params not allowed for %s", name)
-	}
-
 	paramExprs, paramsDiags := hcl.ExprList(f.Params.Expr)
 	if paramsDiags.HasErrors() {
 		return paramsDiags
@@ -204,7 +147,7 @@ func (p *parser) resolveFunction(name string) error {
 		return diags
 	}
 
-	if diags := p.loadDeps(f.Result.Expr, params, false); diags.HasErrors() {
+	if diags := p.loadDeps(f.Result.Expr, params); diags.HasErrors() {
 		return diags
 	}
 
@@ -220,8 +163,6 @@ func (p *parser) resolveFunction(name string) error {
 	return nil
 }
 
-// resolveValue forces evaluation of a named value, storing the result into the
-// parser.
 func (p *parser) resolveValue(name string) (err error) {
 	if _, ok := p.ectx.Variables[name]; ok {
 		return nil
@@ -242,7 +183,7 @@ func (p *parser) resolveValue(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 exit", name)
+			return errors.Errorf("undefined variable %q", name)
 		}
 		def = vr.Default
 	}
@@ -257,7 +198,7 @@ func (p *parser) resolveValue(name string) (err error) {
 		return
 	}
 
-	if diags := p.loadDeps(def.Expr, nil, true); diags.HasErrors() {
+	if diags := p.loadDeps(def.Expr, nil); diags.HasErrors() {
 		return diags
 	}
 	vv, diags := def.Expr.Value(p.ectx)
@@ -268,16 +209,19 @@ func (p *parser) resolveValue(name string) (err error) {
 	_, isVar := p.vars[name]
 
 	if envv, ok := p.opt.LookupVar(name); ok && isVar {
-		switch {
-		case vv.Type().Equals(cty.Bool):
+		if vv.Type().Equals(cty.Bool) {
 			b, err := strconv.ParseBool(envv)
 			if err != nil {
 				return errors.Wrapf(err, "failed to parse %s as bool", name)
 			}
-			vv = cty.BoolVal(b)
-		case vv.Type().Equals(cty.String), vv.Type().Equals(cty.DynamicPseudoType):
-			vv = cty.StringVal(envv)
-		case vv.Type().Equals(cty.Number):
+			vv := cty.BoolVal(b)
+			v = &vv
+			return nil
+		} else if vv.Type().Equals(cty.String) {
+			vv := cty.StringVal(envv)
+			v = &vv
+			return nil
+		} else if vv.Type().Equals(cty.Number) {
 			n, err := strconv.ParseFloat(envv, 64)
 			if err == nil && (math.IsNaN(n) || math.IsInf(n, 0)) {
 				err = errors.Errorf("invalid number value")
@@ -285,160 +229,18 @@ func (p *parser) resolveValue(name string) (err error) {
 			if err != nil {
 				return errors.Wrapf(err, "failed to parse %s as number", name)
 			}
-			vv = cty.NumberVal(big.NewFloat(n))
-		default:
+			vv := cty.NumberVal(big.NewFloat(n))
+			v = &vv
+			return nil
+		} else {
 			// TODO: support lists with csv values
-			return errors.Errorf("unsupported type %s for variable %s", vv.Type().FriendlyName(), name)
+			return errors.Errorf("unsupported type %s for variable %s", v.Type(), name)
 		}
 	}
 	v = &vv
 	return nil
 }
 
-// resolveBlock force evaluates a block, storing the result in the parser. If a
-// 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) {
-	name := block.Labels[0]
-	if err := p.opt.ValidateLabel(name); err != nil {
-		return wrapErrorDiagnostic("Invalid name", err, &block.LabelRanges[0], &block.LabelRanges[0])
-	}
-
-	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
-	}
-	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, true)
-		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 {
-		output = prev
-	} else {
-		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 _, b := range target.Blocks {
-			p.doneB[block][b.Type] = struct{}{}
-		}
-	}
-
-	// 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
-}
-
 func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 	reserved := map[string]struct{}{}
 	schema, _ := gohcl.ImpliedBodySchema(val)
@@ -454,7 +256,6 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 	if err := gohcl.DecodeBody(b, nil, &defs); err != nil {
 		return err
 	}
-	defsSchema, _ := gohcl.ImpliedBodySchema(defs)
 
 	if opt.LookupVar == nil {
 		opt.LookupVar = func(string) (string, bool) {
@@ -475,16 +276,9 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 		attrs: map[string]*hcl.Attribute{},
 		funcs: map[string]*functionDef{},
 
-		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{}{},
+		doneF:     map[string]struct{}{},
 		ectx: &hcl.EvalContext{
 			Variables: map[string]cty.Value{},
 			Functions: stdlibFunctions,
@@ -506,20 +300,12 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 		p.funcs[v.Name] = v
 	}
 
-	content, b, diags := b.PartialContent(schema)
-	if diags.HasErrors() {
-		return diags
-	}
-
-	blocks, b, diags := b.PartialContent(defsSchema)
-	if diags.HasErrors() {
-		return diags
-	}
-
 	attrs, diags := b.JustAttributes()
 	if diags.HasErrors() {
-		if d := removeAttributesDiags(diags, reserved, p.vars); len(d) > 0 {
-			return d
+		for _, d := range diags {
+			if d.Detail != "Blocks are not allowed here." {
+				return diags
+			}
 		}
 	}
 
@@ -535,6 +321,63 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 		_ = p.resolveValue(k)
 	}
 
+	for k := range p.attrs {
+		if err := p.resolveValue(k); err != nil {
+			if diags, ok := err.(hcl.Diagnostics); ok {
+				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,
+				},
+			}
+		}
+	}
+
+	for k := range p.vars {
+		if err := p.resolveValue(k); err != nil {
+			if diags, ok := err.(hcl.Diagnostics); ok {
+				return diags
+			}
+			r := p.vars[k].Body.MissingItemRange()
+			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(k); err != nil {
+			if diags, ok := err.(hcl.Diagnostics); ok {
+				return diags
+			}
+			return hcl.Diagnostics{
+				&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid function",
+					Detail:   err.Error(),
+					Subject:  &p.funcs[k].Params.Range,
+					Context:  &p.funcs[k].Params.Range,
+				},
+			}
+		}
+	}
+
+	content, _, diags := b.PartialContent(schema)
+	if diags.HasErrors() {
+		return diags
+	}
+
 	for _, a := range content.Attributes {
 		return hcl.Diagnostics{
 			&hcl.Diagnostic{
@@ -547,39 +390,7 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 		}
 	}
 
-	for k := range p.vars {
-		if err := p.resolveValue(k); err != nil {
-			if diags, ok := err.(hcl.Diagnostics); ok {
-				return diags
-			}
-			r := p.vars[k].Body.MissingItemRange()
-			return wrapErrorDiagnostic("Invalid value", err, &r, &r)
-		}
-	}
-
-	for k := range p.funcs {
-		if err := p.resolveFunction(k); err != nil {
-			if diags, ok := err.(hcl.Diagnostics); ok {
-				return diags
-			}
-			var subject *hcl.Range
-			var context *hcl.Range
-			if p.funcs[k].Params != nil {
-				subject = &p.funcs[k].Params.Range
-				context = subject
-			} else {
-				for _, block := range blocks.Blocks {
-					if block.Type == "function" && len(block.Labels) == 1 && block.Labels[0] == k {
-						subject = &block.LabelRanges[0]
-						context = &block.DefRange
-						break
-					}
-				}
-			}
-			return wrapErrorDiagnostic("Invalid function", err, subject, context)
-		}
-	}
-
+	m := map[string]map[string][]*hcl.Block{}
 	for _, b := range content.Blocks {
 		if len(b.Labels) == 0 || len(b.Labels) > 1 {
 			return hcl.Diagnostics{
@@ -592,16 +403,19 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 				},
 			}
 		}
-		bm, ok := p.blocks[b.Type]
+		bm, ok := m[b.Type]
 		if !ok {
 			bm = map[string][]*hcl.Block{}
-			p.blocks[b.Type] = bm
+			m[b.Type] = bm
 		}
 
 		lbl := b.Labels[0]
 		bm[lbl] = append(bm[lbl], b)
 	}
 
+	vt := reflect.ValueOf(val).Elem().Type()
+	numFields := vt.NumField()
+
 	type value struct {
 		reflect.Value
 		idx int
@@ -613,11 +427,9 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 	}
 	types := map[string]field{}
 
-	vt := reflect.ValueOf(val).Elem().Type()
-	for i := 0; i < vt.NumField(); i++ {
+	for i := 0; i < numFields; i++ {
 		tags := strings.Split(vt.Field(i).Tag.Get("hcl"), ",")
 
-		p.blockTypes[tags[0]] = vt.Field(i).Type.Elem().Elem()
 		types[tags[0]] = field{
 			idx:    i,
 			typ:    vt.Field(i).Type,
@@ -629,21 +441,29 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 	for _, b := range content.Blocks {
 		v := reflect.ValueOf(val)
 
-		err := p.resolveBlock(b, nil)
-		if err != nil {
-			if diag, ok := err.(hcl.Diagnostics); ok {
-				if diag.HasErrors() {
-					diags = append(diags, diag...)
-					continue
-				}
-			} else {
-				return wrapErrorDiagnostic("Invalid block", err, &b.LabelRanges[0], &b.DefRange)
+		t, ok := types[b.Type]
+		if !ok {
+			continue
+		}
+
+		vv := reflect.New(t.typ.Elem().Elem())
+		diag := gohcl.DecodeBody(b.Body, p.ectx, vv.Interface())
+		if diag.HasErrors() {
+			diags = append(diags, diag...)
+			continue
+		}
+
+		if err := opt.ValidateLabel(b.Labels[0]); err != nil {
+			return hcl.Diagnostics{
+				&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid name",
+					Detail:   err.Error(),
+					Subject:  &b.LabelRanges[0],
+				},
 			}
 		}
 
-		vv := p.blockValues[b]
-
-		t := types[b.Type]
 		lblIndex := setLabel(vv, b.Labels[0])
 
 		oldValue, exists := t.values[b.Labels[0]]
@@ -657,6 +477,7 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 					}
 				}
 			}
+
 		}
 		if exists {
 			if m := oldValue.Value.MethodByName("Merge"); m.IsValid() {
@@ -677,39 +498,9 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
 		return diags
 	}
 
-	for k := range p.attrs {
-		if err := p.resolveValue(k); err != nil {
-			if diags, ok := err.(hcl.Diagnostics); ok {
-				return diags
-			}
-			return wrapErrorDiagnostic("Invalid attribute", err, &p.attrs[k].Range, &p.attrs[k].Range)
-		}
-	}
-
 	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 setLabel(v reflect.Value, lbl string) int {
 	// cache field index?
 	numFields := v.Elem().Type().NumField()
@@ -723,33 +514,3 @@ func setLabel(v reflect.Value, lbl string) int {
 	}
 	return -1
 }
-
-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 {
-			// https://github.com/docker/buildx/pull/541
-			if d.Detail == "Blocks are not allowed here." {
-				return true
-			}
-			for r := range reserved {
-				// JSON body objects don't handle repeated blocks like HCL but
-				// reserved name attributes should be allowed when multi bodies are merged.
-				// https://github.com/hashicorp/hcl/blob/main/json/spec.md#blocks
-				if strings.HasPrefix(d.Detail, fmt.Sprintf(`Argument "%s" was already set at `, r)) {
-					return true
-				}
-			}
-			for v := range vars {
-				// Do the same for global variables
-				if strings.HasPrefix(d.Detail, fmt.Sprintf(`Argument "%s" was already set at `, v)) {
-					return true
-				}
-			}
-			return false
-		}(d); !fout {
-			fdiags = append(fdiags, d)
-		}
-	}
-	return fdiags
-}

bake/hclparser/stdlib.go

@@ -1,15 +1,12 @@
 package hclparser
 
 import (
-	"time"
-
 	"github.com/hashicorp/go-cty-funcs/cidr"
 	"github.com/hashicorp/go-cty-funcs/crypto"
 	"github.com/hashicorp/go-cty-funcs/encoding"
 	"github.com/hashicorp/go-cty-funcs/uuid"
 	"github.com/hashicorp/hcl/v2/ext/tryfunc"
 	"github.com/hashicorp/hcl/v2/ext/typeexpr"
-	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 	"github.com/zclconf/go-cty/cty/function/stdlib"
 )
@@ -99,7 +96,6 @@ var stdlibFunctions = map[string]function.Function{
 	"substr":                 stdlib.SubstrFunc,
 	"subtract":               stdlib.SubtractFunc,
 	"timeadd":                stdlib.TimeAddFunc,
-	"timestamp":              timestampFunc,
 	"title":                  stdlib.TitleFunc,
 	"trim":                   stdlib.TrimFunc,
 	"trimprefix":             stdlib.TrimPrefixFunc,
@@ -113,14 +109,3 @@ var stdlibFunctions = map[string]function.Function{
 	"values":                 stdlib.ValuesFunc,
 	"zipmap":                 stdlib.ZipmapFunc,
 }
-
-// timestampFunc constructs a function that returns a string representation of the current date and time.
-//
-// This function was imported from terraform's datetime utilities.
-var timestampFunc = function.New(&function.Spec{
-	Params: []function.Parameter{},
-	Type:   function.StaticReturnType(cty.String),
-	Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) {
-		return cty.StringVal(time.Now().UTC().Format(time.RFC3339)), nil
-	},
-})

bake/remote.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/docker/buildx/builder"
+	"github.com/docker/buildx/build"
 	"github.com/docker/buildx/driver"
 	"github.com/docker/buildx/util/progress"
 	"github.com/moby/buildkit/client"
@@ -20,7 +20,7 @@ type Input struct {
 	URL   string
 }
 
-func ReadRemoteFiles(ctx context.Context, nodes []builder.Node, url string, names []string, pw progress.Writer) ([]File, *Input, error) {
+func ReadRemoteFiles(ctx context.Context, dis []build.DriverInfo, url string, names []string, pw progress.Writer) ([]File, *Input, error) {
 	var filename string
 	st, ok := detectGitContext(url)
 	if !ok {
@@ -33,18 +33,18 @@ func ReadRemoteFiles(ctx context.Context, nodes []builder.Node, url string, name
 	inp := &Input{State: st, URL: url}
 	var files []File
 
-	var node *builder.Node
-	for i, n := range nodes {
-		if n.Err == nil {
-			node = &nodes[i]
+	var di *build.DriverInfo
+	for _, d := range dis {
+		if d.Err == nil {
+			di = &d
 			continue
 		}
 	}
-	if node == nil {
+	if di == nil {
 		return nil, nil, nil
 	}
 
-	c, err := driver.Boot(ctx, ctx, node.Driver, pw)
+	c, err := driver.Boot(ctx, ctx, di.Driver, pw)
 	if err != nil {
 		return nil, nil, err
 	}

build/git.go

@@ -1,115 +0,0 @@
-package build
-
-import (
-	"context"
-	"os"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/docker/buildx/util/gitutil"
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/pkg/errors"
-)
-
-const DockerfileLabel = "com.docker.image.source.entrypoint"
-
-func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath string) (res map[string]string, _ error) {
-	res = make(map[string]string)
-	if contextPath == "" {
-		return
-	}
-
-	setGitLabels := false
-	if v, ok := os.LookupEnv("BUILDX_GIT_LABELS"); ok {
-		if v == "full" { // backward compatibility with old "full" mode
-			setGitLabels = true
-		} else if v, err := strconv.ParseBool(v); err == nil {
-			setGitLabels = v
-		}
-	}
-	setGitInfo := true
-	if v, ok := os.LookupEnv("BUILDX_GIT_INFO"); ok {
-		if v, err := strconv.ParseBool(v); err == nil {
-			setGitInfo = v
-		}
-	}
-
-	if !setGitLabels && !setGitInfo {
-		return
-	}
-
-	// figure out in which directory the git command needs to run in
-	var wd string
-	if filepath.IsAbs(contextPath) {
-		wd = contextPath
-	} else {
-		cwd, _ := os.Getwd()
-		wd, _ = filepath.Abs(filepath.Join(cwd, contextPath))
-	}
-
-	gitc, err := gitutil.New(gitutil.WithContext(ctx), gitutil.WithWorkingDir(wd))
-	if err != nil {
-		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("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.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() {
-			sha += "-dirty"
-		}
-		if setGitLabels {
-			res["label:"+specs.AnnotationRevision] = sha
-		}
-		if setGitInfo {
-			res["vcs:revision"] = sha
-		}
-	}
-
-	if rurl, err := gitc.RemoteURL(); err == nil && rurl != "" {
-		if setGitLabels {
-			res["label:"+specs.AnnotationSource] = rurl
-		}
-		if setGitInfo {
-			res["vcs:source"] = rurl
-		}
-	}
-
-	if setGitLabels {
-		if root, err := gitc.RootDir(); err != nil {
-			return res, errors.Wrapf(err, "buildx: failed to get git root dir")
-		} else if root != "" {
-			if dockerfilePath == "" {
-				dockerfilePath = filepath.Join(wd, "Dockerfile")
-			}
-			if !filepath.IsAbs(dockerfilePath) {
-				cwd, _ := os.Getwd()
-				dockerfilePath = filepath.Join(cwd, dockerfilePath)
-			}
-			dockerfilePath, _ = filepath.Rel(root, dockerfilePath)
-			if !strings.HasPrefix(dockerfilePath, "..") {
-				res["label:"+DockerfileLabel] = dockerfilePath
-			}
-		}
-	}
-
-	return
-}

build/git_test.go

@@ -1,156 +0,0 @@
-package build
-
-import (
-	"context"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/docker/buildx/util/gitutil"
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func setupTest(tb testing.TB) {
-	gitutil.Mktmp(tb)
-
-	c, err := gitutil.New()
-	require.NoError(tb, err)
-	gitutil.GitInit(c, tb)
-
-	df := []byte("FROM alpine:latest\n")
-	assert.NoError(tb, os.WriteFile("Dockerfile", df, 0644))
-
-	gitutil.GitAdd(c, tb, "Dockerfile")
-	gitutil.GitCommit(c, tb, "initial commit")
-	gitutil.GitSetRemote(c, tb, "origin", "git@github.com:docker/buildx.git")
-}
-
-func TestGetGitAttributesNotGitRepo(t *testing.T) {
-	_, err := getGitAttributes(context.Background(), t.TempDir(), "Dockerfile")
-	assert.NoError(t, err)
-}
-
-func TestGetGitAttributesBadGitRepo(t *testing.T) {
-	tmp := t.TempDir()
-	require.NoError(t, os.MkdirAll(path.Join(tmp, ".git"), 0755))
-
-	_, err := getGitAttributes(context.Background(), tmp, "Dockerfile")
-	assert.Error(t, err)
-}
-
-func TestGetGitAttributesNoContext(t *testing.T) {
-	setupTest(t)
-
-	gitattrs, err := getGitAttributes(context.Background(), "", "Dockerfile")
-	assert.NoError(t, err)
-	assert.Empty(t, gitattrs)
-}
-
-func TestGetGitAttributes(t *testing.T) {
-	cases := []struct {
-		name         string
-		envGitLabels string
-		envGitInfo   string
-		expected     []string
-	}{
-		{
-			name:         "default",
-			envGitLabels: "",
-			envGitInfo:   "",
-			expected: []string{
-				"vcs:revision",
-				"vcs:source",
-			},
-		},
-		{
-			name:         "none",
-			envGitLabels: "false",
-			envGitInfo:   "false",
-			expected:     []string{},
-		},
-		{
-			name:         "gitinfo",
-			envGitLabels: "false",
-			envGitInfo:   "true",
-			expected: []string{
-				"vcs:revision",
-				"vcs:source",
-			},
-		},
-		{
-			name:         "gitlabels",
-			envGitLabels: "true",
-			envGitInfo:   "false",
-			expected: []string{
-				"label:" + DockerfileLabel,
-				"label:" + specs.AnnotationRevision,
-				"label:" + specs.AnnotationSource,
-			},
-		},
-		{
-			name:         "both",
-			envGitLabels: "true",
-			envGitInfo:   "",
-			expected: []string{
-				"label:" + DockerfileLabel,
-				"label:" + specs.AnnotationRevision,
-				"label:" + specs.AnnotationSource,
-				"vcs:revision",
-				"vcs:source",
-			},
-		},
-	}
-	for _, tt := range cases {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			setupTest(t)
-			if tt.envGitLabels != "" {
-				t.Setenv("BUILDX_GIT_LABELS", tt.envGitLabels)
-			}
-			if tt.envGitInfo != "" {
-				t.Setenv("BUILDX_GIT_INFO", tt.envGitInfo)
-			}
-			gitattrs, err := getGitAttributes(context.Background(), ".", "Dockerfile")
-			require.NoError(t, err)
-			for _, e := range tt.expected {
-				assert.Contains(t, gitattrs, e)
-				assert.NotEmpty(t, gitattrs[e])
-				if e == "label:"+DockerfileLabel {
-					assert.Equal(t, "Dockerfile", gitattrs[e])
-				} else if e == "label:"+specs.AnnotationSource || e == "vcs:source" {
-					assert.Equal(t, "git@github.com:docker/buildx.git", gitattrs[e])
-				}
-			}
-		})
-	}
-}
-
-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")
-	require.NoError(t, os.Mkdir("dir", 0755))
-	require.NoError(t, os.WriteFile(filepath.Join("dir", "Dockerfile"), df, 0644))
-
-	t.Setenv("BUILDX_GIT_LABELS", "true")
-	gitattrs, _ := getGitAttributes(context.Background(), ".", "Dockerfile")
-	assert.Equal(t, 5, len(gitattrs))
-
-	assert.Contains(t, gitattrs, "label:"+DockerfileLabel)
-	assert.Equal(t, "Dockerfile", gitattrs["label:"+DockerfileLabel])
-	assert.Contains(t, gitattrs, "label:"+specs.AnnotationSource)
-	assert.Equal(t, "git@github.com:docker/buildx.git", gitattrs["label:"+specs.AnnotationSource])
-	assert.Contains(t, gitattrs, "label:"+specs.AnnotationRevision)
-	assert.True(t, strings.HasSuffix(gitattrs["label:"+specs.AnnotationRevision], "-dirty"))
-
-	assert.Contains(t, gitattrs, "vcs:source")
-	assert.Equal(t, "git@github.com:docker/buildx.git", gitattrs["vcs:source"])
-	assert.Contains(t, gitattrs, "vcs:revision")
-	assert.True(t, strings.HasSuffix(gitattrs["vcs:revision"], "-dirty"))
-}

build/url.go

@@ -2,7 +2,7 @@ package build
 
 import (
 	"context"
-	"os"
+	"io/ioutil"
 	"path/filepath"
 
 	"github.com/docker/buildx/driver"
@@ -53,11 +53,11 @@ func createTempDockerfileFromURL(ctx context.Context, d driver.Driver, url strin
 		if err != nil {
 			return nil, err
 		}
-		dir, err := os.MkdirTemp("", "buildx")
+		dir, err := ioutil.TempDir("", "buildx")
 		if err != nil {
 			return nil, err
 		}
-		if err := os.WriteFile(filepath.Join(dir, "Dockerfile"), dt, 0600); err != nil {
+		if err := ioutil.WriteFile(filepath.Join(dir, "Dockerfile"), dt, 0600); err != nil {
 			return nil, err
 		}
 		out = dir

build/utils.go

@@ -11,14 +11,8 @@ import (
 	"github.com/pkg/errors"
 )
 
-const (
-	// archiveHeaderSize is the number of bytes in an archive header
-	archiveHeaderSize = 512
-	// mobyHostGatewayName defines a special string which users can append to
-	// --add-host to add an extra entry in /etc/hosts that maps
-	// host.docker.internal to the host IP
-	mobyHostGatewayName = "host-gateway"
-)
+// archiveHeaderSize is the number of bytes in an archive header
+const archiveHeaderSize = 512
 
 func isLocalDir(c string) bool {
 	st, err := os.Stat(c)
@@ -45,23 +39,18 @@ func isArchive(header []byte) bool {
 }
 
 // toBuildkitExtraHosts converts hosts from docker key:value format to buildkit's csv format
-func toBuildkitExtraHosts(inp []string, mobyDriver bool) (string, error) {
+func toBuildkitExtraHosts(inp []string) (string, error) {
 	if len(inp) == 0 {
 		return "", nil
 	}
 	hosts := make([]string, 0, len(inp))
 	for _, h := range inp {
-		host, ip, ok := strings.Cut(h, ":")
-		if !ok || host == "" || ip == "" {
+		parts := strings.Split(h, ":")
+
+		if len(parts) != 2 || parts[0] == "" || net.ParseIP(parts[1]) == nil {
 			return "", errors.Errorf("invalid host %s", h)
 		}
-		// 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)
-			}
-		}
-		hosts = append(hosts, host+"="+ip)
+		hosts = append(hosts, parts[0]+"="+parts[1])
 	}
 	return strings.Join(hosts, ","), nil
 }

builder/builder.go

@@ -1,292 +0,0 @@
-package builder
-
-import (
-	"context"
-	"os"
-	"sort"
-	"sync"
-
-	"github.com/docker/buildx/driver"
-	"github.com/docker/buildx/store"
-	"github.com/docker/buildx/store/storeutil"
-	"github.com/docker/buildx/util/dockerutil"
-	"github.com/docker/buildx/util/imagetools"
-	"github.com/docker/buildx/util/progress"
-	"github.com/docker/cli/cli/command"
-	"github.com/pkg/errors"
-	"golang.org/x/sync/errgroup"
-)
-
-// Builder represents an active builder object
-type Builder struct {
-	*store.NodeGroup
-	driverFactory driverFactory
-	nodes         []Node
-	opts          builderOpts
-	err           error
-}
-
-type builderOpts struct {
-	dockerCli       command.Cli
-	name            string
-	txn             *store.Txn
-	contextPathHash string
-	validate        bool
-}
-
-// Option provides a variadic option for configuring the builder.
-type Option func(b *Builder)
-
-// WithName sets builder name.
-func WithName(name string) Option {
-	return func(b *Builder) {
-		b.opts.name = name
-	}
-}
-
-// WithStore sets a store instance used at init.
-func WithStore(txn *store.Txn) Option {
-	return func(b *Builder) {
-		b.opts.txn = txn
-	}
-}
-
-// WithContextPathHash is used for determining pods in k8s driver instance.
-func WithContextPathHash(contextPathHash string) Option {
-	return func(b *Builder) {
-		b.opts.contextPathHash = contextPathHash
-	}
-}
-
-// WithSkippedValidation skips builder context validation.
-func WithSkippedValidation() Option {
-	return func(b *Builder) {
-		b.opts.validate = false
-	}
-}
-
-// New initializes a new builder client
-func New(dockerCli command.Cli, opts ...Option) (_ *Builder, err error) {
-	b := &Builder{
-		opts: builderOpts{
-			dockerCli: dockerCli,
-			validate:  true,
-		},
-	}
-	for _, opt := range opts {
-		opt(b)
-	}
-
-	if b.opts.txn == nil {
-		// if store instance is nil we create a short-lived one using the
-		// default store and ensure we release it on completion
-		var release func()
-		b.opts.txn, release, err = storeutil.GetStore(dockerCli)
-		if err != nil {
-			return nil, err
-		}
-		defer release()
-	}
-
-	if b.opts.name != "" {
-		if b.NodeGroup, err = storeutil.GetNodeGroup(b.opts.txn, dockerCli, b.opts.name); err != nil {
-			return nil, err
-		}
-	} else {
-		if b.NodeGroup, err = storeutil.GetCurrentInstance(b.opts.txn, dockerCli); err != nil {
-			return nil, err
-		}
-	}
-	if b.opts.validate {
-		if err = b.Validate(); err != nil {
-			return nil, err
-		}
-	}
-
-	return b, nil
-}
-
-// Validate validates builder context
-func (b *Builder) Validate() error {
-	if b.NodeGroup.DockerContext {
-		list, err := b.opts.dockerCli.ContextStore().List()
-		if err != nil {
-			return err
-		}
-		currentContext := b.opts.dockerCli.CurrentContext()
-		for _, l := range list {
-			if l.Name == b.Name && l.Name != currentContext {
-				return errors.Errorf("use `docker --context=%s buildx` to switch to context %q", l.Name, l.Name)
-			}
-		}
-	}
-	return nil
-}
-
-// ContextName returns builder context name if available.
-func (b *Builder) ContextName() string {
-	ctxbuilders, err := b.opts.dockerCli.ContextStore().List()
-	if err != nil {
-		return ""
-	}
-	for _, cb := range ctxbuilders {
-		if b.NodeGroup.Driver == "docker" && len(b.NodeGroup.Nodes) == 1 && b.NodeGroup.Nodes[0].Endpoint == cb.Name {
-			return cb.Name
-		}
-	}
-	return ""
-}
-
-// ImageOpt returns registry auth configuration
-func (b *Builder) ImageOpt() (imagetools.Opt, error) {
-	return storeutil.GetImageConfig(b.opts.dockerCli, b.NodeGroup)
-}
-
-// Boot bootstrap a builder
-func (b *Builder) Boot(ctx context.Context) (bool, error) {
-	toBoot := make([]int, 0, len(b.nodes))
-	for idx, d := range b.nodes {
-		if d.Err != nil || d.Driver == nil || d.DriverInfo == nil {
-			continue
-		}
-		if d.DriverInfo.Status != driver.Running {
-			toBoot = append(toBoot, idx)
-		}
-	}
-	if len(toBoot) == 0 {
-		return false, nil
-	}
-
-	printer, err := progress.NewPrinter(context.TODO(), os.Stderr, os.Stderr, progress.PrinterModeAuto)
-	if err != nil {
-		return false, err
-	}
-
-	baseCtx := ctx
-	eg, _ := errgroup.WithContext(ctx)
-	for _, idx := range toBoot {
-		func(idx int) {
-			eg.Go(func() error {
-				pw := progress.WithPrefix(printer, b.NodeGroup.Nodes[idx].Name, len(toBoot) > 1)
-				_, err := driver.Boot(ctx, baseCtx, b.nodes[idx].Driver, pw)
-				if err != nil {
-					b.nodes[idx].Err = err
-				}
-				return nil
-			})
-		}(idx)
-	}
-
-	err = eg.Wait()
-	err1 := printer.Wait()
-	if err == nil {
-		err = err1
-	}
-
-	return true, err
-}
-
-// Inactive checks if all nodes are inactive for this builder.
-func (b *Builder) Inactive() bool {
-	for _, d := range b.nodes {
-		if d.DriverInfo != nil && d.DriverInfo.Status == driver.Running {
-			return false
-		}
-	}
-	return true
-}
-
-// Err returns error if any.
-func (b *Builder) Err() error {
-	return b.err
-}
-
-type driverFactory struct {
-	driver.Factory
-	once sync.Once
-}
-
-// Factory returns the driver factory.
-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)
-			if err != nil {
-				return
-			}
-		} else {
-			// empty driver means nodegroup was implicitly created as a default
-			// driver for a docker context and allows falling back to a
-			// docker-container driver for older daemon that doesn't support
-			// buildkit (< 18.06).
-			ep := b.NodeGroup.Nodes[0].Endpoint
-			var dockerapi *dockerutil.ClientAPI
-			dockerapi, err = dockerutil.NewClientAPI(b.opts.dockerCli, b.NodeGroup.Nodes[0].Endpoint)
-			if err != nil {
-				return
-			}
-			// check if endpoint is healthy is needed to determine the driver type.
-			// if this fails then can't continue with driver selection.
-			if _, err = dockerapi.Ping(ctx); err != nil {
-				return
-			}
-			b.driverFactory.Factory, err = driver.GetDefaultFactory(ctx, ep, dockerapi, false)
-			if err != nil {
-				return
-			}
-			b.Driver = b.driverFactory.Factory.Name()
-		}
-	})
-	return b.driverFactory.Factory, err
-}
-
-// GetBuilders returns all builders
-func GetBuilders(dockerCli command.Cli, txn *store.Txn) ([]*Builder, error) {
-	storeng, err := txn.List()
-	if err != nil {
-		return nil, err
-	}
-
-	builders := make([]*Builder, len(storeng))
-	seen := make(map[string]struct{})
-	for i, ng := range storeng {
-		b, err := New(dockerCli,
-			WithName(ng.Name),
-			WithStore(txn),
-			WithSkippedValidation(),
-		)
-		if err != nil {
-			return nil, err
-		}
-		builders[i] = b
-		seen[b.NodeGroup.Name] = struct{}{}
-	}
-
-	contexts, err := dockerCli.ContextStore().List()
-	if err != nil {
-		return nil, err
-	}
-	sort.Slice(contexts, func(i, j int) bool {
-		return contexts[i].Name < contexts[j].Name
-	})
-
-	for _, c := range contexts {
-		// if a context has the same name as an instance from the store, do not
-		// add it to the builders list. An instance from the store takes
-		// precedence over context builders.
-		if _, ok := seen[c.Name]; ok {
-			continue
-		}
-		b, err := New(dockerCli,
-			WithName(c.Name),
-			WithStore(txn),
-			WithSkippedValidation(),
-		)
-		if err != nil {
-			return nil, err
-		}
-		builders = append(builders, b)
-	}
-
-	return builders, nil
-}

builder/node.go

@@ -1,202 +0,0 @@
-package builder
-
-import (
-	"context"
-
-	"github.com/docker/buildx/driver"
-	ctxkube "github.com/docker/buildx/driver/kubernetes/context"
-	"github.com/docker/buildx/store"
-	"github.com/docker/buildx/store/storeutil"
-	"github.com/docker/buildx/util/dockerutil"
-	"github.com/docker/buildx/util/imagetools"
-	"github.com/docker/buildx/util/platformutil"
-	"github.com/moby/buildkit/util/grpcerrors"
-	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"golang.org/x/sync/errgroup"
-	"google.golang.org/grpc/codes"
-)
-
-type Node struct {
-	store.Node
-	Driver      driver.Driver
-	DriverInfo  *driver.Info
-	Platforms   []ocispecs.Platform
-	ImageOpt    imagetools.Opt
-	ProxyConfig map[string]string
-	Version     string
-	Err         error
-}
-
-// Nodes returns nodes for this builder.
-func (b *Builder) Nodes() []Node {
-	return b.nodes
-}
-
-// 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, withData bool) (_ []Node, err error) {
-	eg, _ := errgroup.WithContext(ctx)
-	b.nodes = make([]Node, len(b.NodeGroup.Nodes))
-
-	defer func() {
-		if b.err == nil && err != nil {
-			b.err = err
-		}
-	}()
-
-	factory, err := b.Factory(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	imageopt, err := b.ImageOpt()
-	if err != nil {
-		return nil, err
-	}
-
-	for i, n := range b.NodeGroup.Nodes {
-		func(i int, n store.Node) {
-			eg.Go(func() error {
-				node := Node{
-					Node:        n,
-					ProxyConfig: storeutil.GetProxyConfig(b.opts.dockerCli),
-					Platforms:   n.Platforms,
-				}
-				defer func() {
-					b.nodes[i] = node
-				}()
-
-				dockerapi, err := dockerutil.NewClientAPI(b.opts.dockerCli, n.Endpoint)
-				if err != nil {
-					node.Err = err
-					return nil
-				}
-
-				contextStore := b.opts.dockerCli.ContextStore()
-
-				var kcc driver.KubeClientConfig
-				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.ConfigFromContext("default", contextStore)
-					if err != nil {
-						logrus.Error(err)
-					}
-				}
-
-				tryToUseKubeConfigInCluster := false
-				if kcc == nil {
-					tryToUseKubeConfigInCluster = true
-				} else {
-					if _, err := kcc.ClientConfig(); err != nil {
-						tryToUseKubeConfigInCluster = true
-					}
-				}
-				if tryToUseKubeConfigInCluster {
-					kccInCluster := driver.KubeClientConfigInCluster{}
-					if _, err := kccInCluster.ClientConfig(); err == nil {
-						logrus.Debug("using kube config in cluster")
-						kcc = kccInCluster
-					}
-				}
-
-				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
-				}
-				node.Driver = d
-				node.ImageOpt = imageopt
-
-				if withData {
-					if err := node.loadData(ctx); err != nil {
-						node.Err = err
-					}
-				}
-				return nil
-			})
-		}(i, n)
-	}
-
-	if err := eg.Wait(); err != nil {
-		return nil, err
-	}
-
-	// TODO: This should be done in the routine loading driver data
-	if withData {
-		kubernetesDriverCount := 0
-		for _, d := range b.nodes {
-			if d.DriverInfo != nil && len(d.DriverInfo.DynamicNodes) > 0 {
-				kubernetesDriverCount++
-			}
-		}
-
-		isAllKubernetesDrivers := len(b.nodes) == kubernetesDriverCount
-		if isAllKubernetesDrivers {
-			var nodes []Node
-			var dynamicNodes []store.Node
-			for _, di := range b.nodes {
-				// dynamic nodes are used in Kubernetes driver.
-				// Kubernetes' pods are dynamically mapped to BuildKit Nodes.
-				if di.DriverInfo != nil && len(di.DriverInfo.DynamicNodes) > 0 {
-					for i := 0; i < len(di.DriverInfo.DynamicNodes); i++ {
-						diClone := di
-						if pl := di.DriverInfo.DynamicNodes[i].Platforms; len(pl) > 0 {
-							diClone.Platforms = pl
-						}
-						nodes = append(nodes, di)
-					}
-					dynamicNodes = append(dynamicNodes, di.DriverInfo.DynamicNodes...)
-				}
-			}
-
-			// not append (remove the static nodes in the store)
-			b.NodeGroup.Nodes = dynamicNodes
-			b.nodes = nodes
-			b.NodeGroup.Dynamic = true
-		}
-	}
-
-	return b.nodes, nil
-}
-
-func (n *Node) loadData(ctx context.Context) error {
-	if n.Driver == nil {
-		return nil
-	}
-	info, err := n.Driver.Info(ctx)
-	if err != nil {
-		return err
-	}
-	n.DriverInfo = info
-	if n.DriverInfo.Status == driver.Running {
-		driverClient, err := n.Driver.Client(ctx)
-		if err != nil {
-			return err
-		}
-		workers, err := driverClient.ListWorkers(ctx)
-		if err != nil {
-			return errors.Wrap(err, "listing workers")
-		}
-		for _, w := range workers {
-			n.Platforms = append(n.Platforms, w.Platforms...)
-		}
-		n.Platforms = platformutil.Dedupe(n.Platforms)
-		inf, err := driverClient.Info(ctx)
-		if err != nil {
-			if st, ok := grpcerrors.AsGRPCStatus(err); ok && st.Code() == codes.Unimplemented {
-				n.Version, err = n.Driver.Version(ctx)
-				if err != nil {
-					return errors.Wrap(err, "getting version")
-				}
-			}
-		} else {
-			n.Version = inf.BuildkitVersion.Version
-		}
-	}
-	return nil
-}

cmd/buildx/main.go

@@ -15,8 +15,13 @@ import (
 	cliflags "github.com/docker/cli/cli/flags"
 	"github.com/moby/buildkit/solver/errdefs"
 	"github.com/moby/buildkit/util/stack"
+	"github.com/moby/buildkit/util/tracing/detect"
+	"go.opentelemetry.io/otel"
 
-	_ "k8s.io/client-go/plugin/pkg/client/auth/azure"
+	_ "github.com/moby/buildkit/util/tracing/detect/delegated"
+	_ "github.com/moby/buildkit/util/tracing/env"
+
+	// FIXME: "k8s.io/client-go/plugin/pkg/client/auth/azure" is excluded because of compilation error
 	_ "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"
@@ -24,67 +29,75 @@ import (
 	_ "github.com/docker/buildx/driver/docker"
 	_ "github.com/docker/buildx/driver/docker-container"
 	_ "github.com/docker/buildx/driver/kubernetes"
-	_ "github.com/docker/buildx/driver/remote"
 )
 
+var experimental string
+
 func init() {
 	seed.WithTimeAndRand()
 	stack.SetVersionInfo(version.Version, version.Revision)
-}
 
-func runStandalone(cmd *command.DockerCli) error {
-	if err := cmd.Initialize(cliflags.NewClientOptions()); err != nil {
-		return err
-	}
-	rootCmd := commands.NewRootCmd(os.Args[0], false, cmd)
-	return rootCmd.Execute()
-}
-
-func runPlugin(cmd *command.DockerCli) error {
-	rootCmd := commands.NewRootCmd("buildx", true, cmd)
-	return plugin.RunPlugin(cmd, rootCmd, manager.Metadata{
-		SchemaVersion: "0.1.0",
-		Vendor:        "Docker Inc.",
-		Version:       version.Version,
-	})
+	detect.ServiceName = "buildx"
+	// do not log tracing errors to stdio
+	otel.SetErrorHandler(skipErrors{})
 }
 
 func main() {
-	cmd, err := command.NewDockerCli()
+	if plugin.RunningStandalone() {
+		dockerCli, err := command.NewDockerCli()
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			os.Exit(1)
+		}
+		opts := cliflags.NewClientOptions()
+		dockerCli.Initialize(opts)
+		rootCmd := commands.NewRootCmd(os.Args[0], false, dockerCli)
+		if err := rootCmd.Execute(); err != nil {
+			os.Exit(1)
+		}
+		os.Exit(0)
+	}
+
+	dockerCli, err := command.NewDockerCli()
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
 
-	if plugin.RunningStandalone() {
-		err = runStandalone(cmd)
-	} else {
-		err = runPlugin(cmd)
-	}
-	if err == nil {
-		return
+	p := commands.NewRootCmd("buildx", true, dockerCli)
+	meta := manager.Metadata{
+		SchemaVersion: "0.1.0",
+		Vendor:        "Docker Inc.",
+		Version:       version.Version,
+		Experimental:  experimental != "",
 	}
 
-	if sterr, ok := err.(cli.StatusError); ok {
-		if sterr.Status != "" {
-			fmt.Fprintln(cmd.Err(), sterr.Status)
+	if err := plugin.RunPlugin(dockerCli, p, meta); err != nil {
+		if sterr, ok := err.(cli.StatusError); ok {
+			if sterr.Status != "" {
+				fmt.Fprintln(dockerCli.Err(), sterr.Status)
+			}
+			// StatusError should only be used for errors, and all errors should
+			// have a non-zero exit status, so never exit with 0
+			if sterr.StatusCode == 0 {
+				os.Exit(1)
+			}
+			os.Exit(sterr.StatusCode)
 		}
-		// StatusError should only be used for errors, and all errors should
-		// have a non-zero exit status, so never exit with 0
-		if sterr.StatusCode == 0 {
-			os.Exit(1)
+		for _, s := range errdefs.Sources(err) {
+			s.Print(dockerCli.Err())
 		}
-		os.Exit(sterr.StatusCode)
-	}
 
-	for _, s := range errdefs.Sources(err) {
-		s.Print(cmd.Err())
-	}
-	if debug.IsEnabled() {
-		fmt.Fprintf(cmd.Err(), "ERROR: %+v", stack.Formatter(err))
-	} else {
-		fmt.Fprintf(cmd.Err(), "ERROR: %v\n", err)
-	}
+		if debug.IsEnabled() {
+			fmt.Fprintf(dockerCli.Err(), "error: %+v", stack.Formatter(err))
+		} else {
+			fmt.Fprintf(dockerCli.Err(), "error: %v\n", err)
+		}
 
-	os.Exit(1)
+		os.Exit(1)
+	}
 }
+
+type skipErrors struct{}
+
+func (skipErrors) Handle(err error) {}

cmd/buildx/tracing.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"github.com/moby/buildkit/util/tracing/detect"
-	"go.opentelemetry.io/otel"
-
-	_ "github.com/moby/buildkit/util/tracing/detect/delegated"
-	_ "github.com/moby/buildkit/util/tracing/env"
-)
-
-func init() {
-	detect.ServiceName = "buildx"
-	// do not log tracing errors to stdio
-	otel.SetErrorHandler(skipErrors{})
-}
-
-type skipErrors struct{}
-
-func (skipErrors) Handle(err error) {}

commands/bake.go

@@ -9,10 +9,7 @@ import (
 	"github.com/containerd/containerd/platforms"
 	"github.com/docker/buildx/bake"
 	"github.com/docker/buildx/build"
-	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/util/buildflags"
 	"github.com/docker/buildx/util/confutil"
-	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/buildx/util/tracing"
 	"github.com/docker/cli/cli/command"
@@ -74,20 +71,11 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
 	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)))
-	}
-	if in.provenance != "" {
-		overrides = append(overrides, fmt.Sprintf("*.attest=%s", buildflags.CanonicalizeAttest("provenance", in.provenance)))
-	}
 	contextPathHash, _ := os.Getwd()
 
 	ctx2, cancel := context.WithCancel(context.TODO())
 	defer cancel()
-	printer, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, in.progress)
-	if err != nil {
-		return err
-	}
+	printer := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, in.progress)
 
 	defer func() {
 		if printer != nil {
@@ -98,30 +86,16 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
 		}
 	}()
 
-	var nodes []builder.Node
+	dis, err := getInstanceOrDefault(ctx, dockerCli, in.builder, contextPathHash)
+	if err != nil {
+		return err
+	}
+
 	var files []bake.File
 	var inp *bake.Input
 
-	// instance only needed for reading remote bake files or building
-	if url != "" || !in.printOnly {
-		b, err := builder.New(dockerCli,
-			builder.WithName(in.builder),
-			builder.WithContextPathHash(contextPathHash),
-		)
-		if err != nil {
-			return err
-		}
-		if err = updateLastActivity(dockerCli, b.NodeGroup); err != nil {
-			return errors.Wrapf(err, "failed to update builder last activity time")
-		}
-		nodes, err = b.LoadNodes(ctx, false)
-		if err != nil {
-			return err
-		}
-	}
-
 	if url != "" {
-		files, inp, err = bake.ReadRemoteFiles(ctx, nodes, url, in.files, printer)
+		files, inp, err = bake.ReadRemoteFiles(ctx, dis, url, in.files, printer)
 	} else {
 		files, err = bake.ReadLocalFiles(in.files)
 	}
@@ -130,8 +104,8 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
 	}
 
 	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
+		// Don't forget to update documentation if you add a new
+		// built-in variable: docs/reference/buildx_bake.md#built-in-variables
 		"BAKE_CMD_CONTEXT":    cmdContext,
 		"BAKE_LOCAL_PLATFORM": platforms.DefaultString(),
 	})
@@ -146,11 +120,17 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
 	}
 
 	if in.printOnly {
+		var defg map[string]*bake.Group
+		if len(grps) == 1 {
+			defg = map[string]*bake.Group{
+				"default": grps[0],
+			}
+		}
 		dt, err := json.MarshalIndent(struct {
 			Group  map[string]*bake.Group  `json:"group,omitempty"`
 			Target map[string]*bake.Target `json:"target"`
 		}{
-			grps,
+			defg,
 			tgts,
 		}, "", "  ")
 		if err != nil {
@@ -165,7 +145,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
 		return nil
 	}
 
-	resp, err := build.Build(ctx, nodes, bo, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), printer)
+	resp, err := build.Build(ctx, dis, bo, dockerAPI(dockerCli), confutil.ConfigDir(dockerCli), printer)
 	if err != nil {
 		return wrapBuildError(err, true)
 	}
@@ -209,8 +189,6 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	flags.BoolVar(&options.exportLoad, "load", false, `Shorthand for "--set=*.output=type=docker"`)
 	flags.BoolVar(&options.printOnly, "print", false, "Print the options without building")
 	flags.BoolVar(&options.exportPush, "push", false, `Shorthand for "--set=*.output=type=registry"`)
-	flags.StringVar(&options.sbom, "sbom", "", `Shorthand for "--set=*.attest=type=sbom"`)
-	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(&options.commonOptions, flags)

commands/build.go

@@ -4,32 +4,22 @@ import (
 	"bytes"
 	"context"
 	"encoding/base64"
-	"encoding/csv"
 	"encoding/json"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
-	"sync"
 
-	"github.com/containerd/console"
 	"github.com/docker/buildx/build"
-	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/monitor"
-	"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/buildx/util/tracing"
 	"github.com/docker/cli-docs-tool/annotation"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/config"
 	dockeropts "github.com/docker/cli/opts"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/pkg/ioutils"
@@ -52,10 +42,8 @@ const defaultTargetName = "default"
 type buildOptions struct {
 	contextPath    string
 	dockerfileName string
-	printFunc      string
 
 	allow         []string
-	attests       []string
 	buildArgs     []string
 	cacheFrom     []string
 	cacheTo       []string
@@ -63,7 +51,6 @@ type buildOptions struct {
 	contexts      []string
 	extraHosts    []string
 	imageIDFile   string
-	invoke        string
 	labels        []string
 	networkMode   string
 	noCacheFilter []string
@@ -86,11 +73,11 @@ type commonOptions struct {
 	progress     string
 	pull         *bool
 
+	// golangci-lint#826
+	// nolint:structcheck
 	exportPush bool
+	// nolint:structcheck
 	exportLoad bool
-
-	sbom       string
-	provenance string
 }
 
 func runBuild(dockerCli command.Cli, in buildOptions) (err error) {
@@ -117,7 +104,7 @@ func runBuild(dockerCli command.Cli, in buildOptions) (err error) {
 		return errors.Errorf("--no-cache and --no-cache-filter cannot currently be used together")
 	}
 
-	if in.quiet && in.progress != progress.PrinterModeAuto && in.progress != progress.PrinterModeQuiet {
+	if in.quiet && in.progress != "auto" && in.progress != "quiet" {
 		return errors.Errorf("progress=%s and quiet cannot be used together", in.progress)
 	} else if in.quiet {
 		in.progress = "quiet"
@@ -128,11 +115,6 @@ func runBuild(dockerCli command.Cli, in buildOptions) (err error) {
 		return err
 	}
 
-	printFunc, err := parsePrintFunc(in.printFunc)
-	if err != nil {
-		return err
-	}
-
 	opts := build.Options{
 		Inputs: build.Inputs{
 			ContextPath:    in.contextPath,
@@ -152,7 +134,6 @@ func runBuild(dockerCli command.Cli, in buildOptions) (err error) {
 		Tags:          in.tags,
 		Target:        in.target,
 		Ulimits:       in.ulimits,
-		PrintFunc:     printFunc,
 	}
 
 	platforms, err := platformutil.Parse(in.platforms)
@@ -161,8 +142,7 @@ func runBuild(dockerCli command.Cli, in buildOptions) (err error) {
 	}
 	opts.Platforms = platforms
 
-	dockerConfig := config.LoadDefaultConfigFile(os.Stderr)
-	opts.Session = append(opts.Session, authprovider.NewDockerAuthProvider(dockerConfig))
+	opts.Session = append(opts.Session, authprovider.NewDockerAuthProvider(os.Stderr))
 
 	secrets, err := buildflags.ParseSecretSpecs(in.secrets)
 	if err != nil {
@@ -218,19 +198,8 @@ func runBuild(dockerCli command.Cli, in buildOptions) (err error) {
 			}
 		}
 	}
-	opts.Exports = outputs
 
-	inAttests := append([]string{}, in.attests...)
-	if in.provenance != "" {
-		inAttests = append(inAttests, buildflags.CanonicalizeAttest("provenance", in.provenance))
-	}
-	if in.sbom != "" {
-		inAttests = append(inAttests, buildflags.CanonicalizeAttest("sbom", in.sbom))
-	}
-	opts.Attests, err = buildflags.ParseAttests(inAttests)
-	if err != nil {
-		return err
-	}
+	opts.Exports = outputs
 
 	cacheImports, err := buildflags.ParseCacheEntry(in.cacheFrom)
 	if err != nil {
@@ -256,147 +225,47 @@ func runBuild(dockerCli command.Cli, in buildOptions) (err error) {
 		contextPathHash = in.contextPath
 	}
 
-	b, err := builder.New(dockerCli,
-		builder.WithName(in.builder),
-		builder.WithContextPathHash(contextPathHash),
-	)
-	if err != nil {
-		return err
-	}
-	if err = updateLastActivity(dockerCli, b.NodeGroup); err != nil {
-		return errors.Wrapf(err, "failed to update builder last activity time")
-	}
-	nodes, err := b.LoadNodes(ctx, false)
-	if err != nil {
-		return err
-	}
-
-	imageID, res, err := buildTargets(ctx, dockerCli, nodes, map[string]build.Options{defaultTargetName: opts}, in.progress, in.metadataFile, in.invoke != "")
+	imageID, err := buildTargets(ctx, dockerCli, map[string]build.Options{defaultTargetName: opts}, in.progress, contextPathHash, in.builder, in.metadataFile)
 	err = wrapBuildError(err, false)
 	if err != nil {
 		return err
 	}
 
-	if in.invoke != "" {
-		cfg, err := parseInvokeConfig(in.invoke)
-		if err != nil {
-			return err
-		}
-		cfg.ResultCtx = res
-		con := console.Current()
-		if err := con.SetRaw(); err != nil {
-			return errors.Errorf("failed to configure terminal: %v", err)
-		}
-		err = monitor.RunMonitor(ctx, cfg, func(ctx context.Context) (*build.ResultContext, error) {
-			_, rr, err := buildTargets(ctx, dockerCli, nodes, map[string]build.Options{defaultTargetName: opts}, in.progress, in.metadataFile, true)
-			return rr, err
-		}, io.NopCloser(os.Stdin), nopCloser{os.Stdout}, nopCloser{os.Stderr})
-		if err != nil {
-			logrus.Warnf("failed to run monitor: %v", err)
-		}
-		con.Reset()
-	}
-
 	if in.quiet {
 		fmt.Println(imageID)
 	}
 	return nil
 }
 
-type nopCloser struct {
-	io.WriteCloser
-}
+func buildTargets(ctx context.Context, dockerCli command.Cli, opts map[string]build.Options, progressMode, contextPathHash, instance string, metadataFile string) (imageID string, err error) {
+	dis, err := getInstanceOrDefault(ctx, dockerCli, instance, contextPathHash)
+	if err != nil {
+		return "", err
+	}
 
-func (c nopCloser) Close() error { return nil }
-
-func buildTargets(ctx context.Context, dockerCli command.Cli, nodes []builder.Node, opts map[string]build.Options, progressMode string, metadataFile string, allowNoOutput bool) (imageID string, res *build.ResultContext, err error) {
 	ctx2, cancel := context.WithCancel(context.TODO())
 	defer cancel()
 
-	printer, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, progressMode)
-	if err != nil {
-		return "", nil, err
-	}
+	printer := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, progressMode)
 
-	var mu sync.Mutex
-	var idx int
-	resp, err := build.BuildWithResultHandler(ctx, nodes, opts, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), printer, func(driverIndex int, gotRes *build.ResultContext) {
-		mu.Lock()
-		defer mu.Unlock()
-		if res == nil || driverIndex < idx {
-			idx, res = driverIndex, gotRes
-		}
-	}, allowNoOutput)
+	resp, err := build.Build(ctx, dis, opts, dockerAPI(dockerCli), confutil.ConfigDir(dockerCli), printer)
 	err1 := printer.Wait()
 	if err == nil {
 		err = err1
 	}
 	if err != nil {
-		return "", nil, err
+		return "", err
 	}
 
 	if len(metadataFile) > 0 && resp != nil {
 		if err := writeMetadataFile(metadataFile, decodeExporterResponse(resp[defaultTargetName].ExporterResponse)); err != nil {
-			return "", nil, err
+			return "", err
 		}
 	}
 
 	printWarnings(os.Stderr, printer.Warnings(), progressMode)
 
-	for k := range resp {
-		if opts[k].PrintFunc != nil {
-			if err := printResult(opts[k].PrintFunc, resp[k].ExporterResponse); err != nil {
-				return "", nil, err
-			}
-		}
-	}
-
-	return resp[defaultTargetName].ExporterResponse["containerimage.digest"], res, err
-}
-
-func parseInvokeConfig(invoke string) (cfg build.ContainerConfig, err error) {
-	cfg.Tty = true
-	if invoke == "default" {
-		return cfg, nil
-	}
-
-	csvReader := csv.NewReader(strings.NewReader(invoke))
-	fields, err := csvReader.Read()
-	if err != nil {
-		return cfg, err
-	}
-	if len(fields) == 1 && !strings.Contains(fields[0], "=") {
-		cfg.Cmd = []string{fields[0]}
-		return cfg, nil
-	}
-	for _, field := range fields {
-		parts := strings.SplitN(field, "=", 2)
-		if len(parts) != 2 {
-			return cfg, errors.Errorf("invalid value %s", field)
-		}
-		key := strings.ToLower(parts[0])
-		value := parts[1]
-		switch key {
-		case "args":
-			cfg.Cmd = append(cfg.Cmd, value) // TODO: support JSON
-		case "entrypoint":
-			cfg.Entrypoint = append(cfg.Entrypoint, value) // TODO: support JSON
-		case "env":
-			cfg.Env = append(cfg.Env, value)
-		case "user":
-			cfg.User = &value
-		case "cwd":
-			cfg.Cwd = &value
-		case "tty":
-			cfg.Tty, err = strconv.ParseBool(value)
-			if err != nil {
-				return cfg, errors.Errorf("failed to parse tty: %v", err)
-			}
-		default:
-			return cfg, errors.Errorf("unknown key %q", key)
-		}
-	}
-	return cfg, nil
+	return resp[defaultTargetName].ExporterResponse["containerimage.digest"], err
 }
 
 func printWarnings(w io.Writer, warnings []client.VertexWarning, mode string) {
@@ -470,7 +339,7 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	flags := cmd.Flags()
 
 	flags.StringSliceVar(&options.extraHosts, "add-host", []string{}, `Add a custom host-to-IP mapping (format: "host:ip")`)
-	flags.SetAnnotation("add-host", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#add-host"})
+	flags.SetAnnotation("add-host", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#add-entries-to-container-hosts-file---add-host"})
 
 	flags.StringSliceVar(&options.allow, "allow", []string{}, `Allow extra privileged entitlement (e.g., "network.host", "security.insecure")`)
 
@@ -481,12 +350,12 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	flags.StringArrayVar(&options.cacheTo, "cache-to", []string{}, `Cache export destinations (e.g., "user/app:cache", "type=local,dest=path/to/dir")`)
 
 	flags.StringVar(&options.cgroupParent, "cgroup-parent", "", "Optional parent cgroup for the container")
-	flags.SetAnnotation("cgroup-parent", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#cgroup-parent"})
+	flags.SetAnnotation("cgroup-parent", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#use-a-custom-parent-cgroup---cgroup-parent"})
 
 	flags.StringArrayVar(&options.contexts, "build-context", []string{}, "Additional build contexts (e.g., name=path)")
 
 	flags.StringVarP(&options.dockerfileName, "file", "f", "", `Name of the Dockerfile (default: "PATH/Dockerfile")`)
-	flags.SetAnnotation("file", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#file"})
+	flags.SetAnnotation("file", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#specify-a-dockerfile--f"})
 
 	flags.StringVar(&options.imageIDFile, "iidfile", "", "Write the image ID to the file")
 
@@ -502,10 +371,6 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 
 	flags.StringArrayVar(&options.platforms, "platform", platformsDefault, "Set target platform for build")
 
-	if isExperimental() {
-		flags.StringVar(&options.printFunc, "print", "", "Print result of information request (e.g., outline, targets) [experimental]")
-	}
-
 	flags.BoolVar(&options.exportPush, "push", false, `Shorthand for "--output=type=registry"`)
 
 	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Suppress the build output and print image ID on success")
@@ -517,21 +382,13 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	flags.StringArrayVar(&options.ssh, "ssh", []string{}, `SSH agent socket or keys to expose to the build (format: "default|<id>[=<socket>|<key>[,<key>]]")`)
 
 	flags.StringArrayVarP(&options.tags, "tag", "t", []string{}, `Name and optionally a tag (format: "name:tag")`)
-	flags.SetAnnotation("tag", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#tag"})
+	flags.SetAnnotation("tag", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#tag-an-image--t"})
 
 	flags.StringVar(&options.target, "target", "", "Set the target build stage to build")
-	flags.SetAnnotation("target", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#target"})
+	flags.SetAnnotation("target", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#specifying-target-build-stage---target"})
 
 	flags.Var(options.ulimits, "ulimit", "Ulimit options")
 
-	flags.StringArrayVar(&options.attests, "attest", []string{}, `Attestation parameters (format: "type=sbom,generator=image")`)
-	flags.StringVar(&options.sbom, "sbom", "", `Shorthand for "--attest=type=sbom"`)
-	flags.StringVar(&options.provenance, "provenance", "", `Shortand for "--attest=type=provenance"`)
-
-	if isExperimental() {
-		flags.StringVar(&options.invoke, "invoke", "", "Invoke a command after the build [experimental]")
-	}
-
 	// hidden flags
 	var ignore string
 	var ignoreSlice []string
@@ -643,34 +500,6 @@ func parseContextNames(values []string) (map[string]build.NamedContext, error) {
 	return result, nil
 }
 
-func parsePrintFunc(str string) (*build.PrintFunc, error) {
-	if str == "" {
-		return nil, nil
-	}
-	csvReader := csv.NewReader(strings.NewReader(str))
-	fields, err := csvReader.Read()
-	if err != nil {
-		return nil, err
-	}
-	f := &build.PrintFunc{}
-	for _, field := range fields {
-		parts := strings.SplitN(field, "=", 2)
-		if len(parts) == 2 {
-			if parts[0] == "format" {
-				f.Format = parts[1]
-			} else {
-				return nil, errors.Errorf("invalid print field: %s", field)
-			}
-		} else {
-			if f.Name != "" {
-				return nil, errors.Errorf("invalid print value: %s", str)
-			}
-			f.Name = field
-		}
-	}
-	return f, nil
-}
-
 func writeMetadataFile(filename string, dt interface{}) error {
 	b, err := json.MarshalIndent(dt, "", "  ")
 	if err != nil {
@@ -727,20 +556,3 @@ func (w *wrapped) Error() string {
 func (w *wrapped) Unwrap() error {
 	return w.err
 }
-
-func isExperimental() bool {
-	if v, ok := os.LookupEnv("BUILDX_EXPERIMENTAL"); ok {
-		vv, _ := strconv.ParseBool(v)
-		return vv
-	}
-	return false
-}
-
-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)
-}

commands/create.go

@@ -10,17 +10,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/driver"
-	remoteutil "github.com/docker/buildx/driver/remote/util"
 	"github.com/docker/buildx/store"
 	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/cobrautil"
-	"github.com/docker/buildx/util/confutil"
-	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	dopts "github.com/docker/cli/opts"
 	"github.com/google/shlex"
 	"github.com/moby/buildkit/util/appcontext"
 	"github.com/pkg/errors"
@@ -65,6 +60,22 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 		}
 	}
 
+	driverName := in.driver
+	if driverName == "" {
+		f, err := driver.GetDefaultFactory(ctx, dockerCli.Client(), true)
+		if err != nil {
+			return err
+		}
+		if f == nil {
+			return errors.Errorf("no valid drivers found")
+		}
+		driverName = f.Name()
+	}
+
+	if driver.GetFactory(driverName, true) == nil {
+		return errors.Errorf("failed to find driver %q", in.driver)
+	}
+
 	txn, release, err := storeutil.GetStore(dockerCli)
 	if err != nil {
 		return err
@@ -79,19 +90,6 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 		}
 	}
 
-	if !in.actionLeave && !in.actionAppend {
-		contexts, err := dockerCli.ContextStore().List()
-		if err != nil {
-			return err
-		}
-		for _, c := range contexts {
-			if c.Name == name {
-				logrus.Warnf("instance name %q already exists as context builder", name)
-				break
-			}
-		}
-	}
-
 	ng, err := txn.NodeGroupByName(name)
 	if err != nil {
 		if os.IsNotExist(errors.Cause(err)) {
@@ -99,62 +97,29 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 				logrus.Warnf("failed to find %q for append, creating a new instance instead", in.name)
 			}
 			if in.actionLeave {
-				return errors.Errorf("failed to find instance %q for leave", in.name)
+				return errors.Errorf("failed to find instance %q for leave", name)
 			}
 		} else {
 			return err
 		}
 	}
 
-	buildkitHost := os.Getenv("BUILDKIT_HOST")
-
-	driverName := in.driver
-	if driverName == "" {
-		if ng != nil {
-			driverName = ng.Driver
-		} else if len(args) == 0 && buildkitHost != "" {
-			driverName = "remote"
-		} else {
-			var arg string
-			if len(args) > 0 {
-				arg = args[0]
-			}
-			f, err := driver.GetDefaultFactory(ctx, arg, dockerCli.Client(), true)
-			if err != nil {
-				return err
-			}
-			if f == nil {
-				return errors.Errorf("no valid drivers found")
-			}
-			driverName = f.Name()
-		}
-	}
-
 	if ng != nil {
 		if in.nodeName == "" && !in.actionAppend {
-			return errors.Errorf("existing instance for %q but no append mode, specify --node to make changes for existing instances", name)
+			return errors.Errorf("existing instance for %s but no append mode, specify --node to make changes for existing instances", name)
 		}
-		if driverName != ng.Driver {
-			return errors.Errorf("existing instance for %q but has mismatched driver %q", name, ng.Driver)
-		}
-	}
-
-	if _, err := driver.GetFactory(driverName, true); err != nil {
-		return err
-	}
-
-	ngOriginal := ng
-	if ngOriginal != nil {
-		ngOriginal = ngOriginal.Copy()
 	}
 
 	if ng == nil {
 		ng = &store.NodeGroup{
-			Name:   name,
-			Driver: driverName,
+			Name: name,
 		}
 	}
 
+	if ng.Driver == "" || in.driver != "" {
+		ng.Driver = driverName
+	}
+
 	var flags []string
 	if in.flags != "" {
 		flags, err = shlex.Split(in.flags)
@@ -164,72 +129,44 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 	}
 
 	var ep string
-	var setEp bool
 	if in.actionLeave {
 		if err := ng.Leave(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])
+		if len(args) > 0 {
+			ep, err = validateEndpoint(dockerCli, args[0])
+			if err != nil {
+				return err
 			}
+		} else {
+			if dockerCli.CurrentContext() == "default" && dockerCli.DockerEndpoint().TLSData != nil {
+				return errors.Errorf("could not create a builder instance with TLS data loaded from environment. Please use `docker context create <context-name>` to create a context for current environment and then create a builder instance with `docker buildx create <context-name>`")
+			}
+
+			ep, err = storeutil.GetCurrentEndpoint(dockerCli)
+			if err != nil {
+				return err
+			}
+		}
+
+		if in.driver == "kubernetes" {
 			// naming endpoint to make --append works
 			ep = (&url.URL{
-				Scheme: driverName,
+				Scheme: in.driver,
 				Path:   "/" + in.name,
 				RawQuery: (&url.Values{
 					"deployment": {in.nodeName},
 					"kubeconfig": {os.Getenv("KUBECONFIG")},
 				}).Encode(),
 			}).String()
-			setEp = false
-		case driverName == "remote":
-			if len(args) > 0 {
-				ep = args[0]
-			} else if buildkitHost != "" {
-				ep = buildkitHost
-			} else {
-				return errors.Errorf("no remote endpoint provided")
-			}
-			ep, err = validateBuildkitEndpoint(ep)
-			if err != nil {
-				return err
-			}
-			setEp = true
-		case len(args) > 0:
-			ep, err = validateEndpoint(dockerCli, args[0])
-			if err != nil {
-				return err
-			}
-			setEp = true
-		default:
-			if dockerCli.CurrentContext() == "default" && dockerCli.DockerEndpoint().TLSData != nil {
-				return errors.Errorf("could not create a builder instance with TLS data loaded from environment. Please use `docker context create <context-name>` to create a context for current environment and then create a builder instance with `docker buildx create <context-name>`")
-			}
-			ep, err = dockerutil.GetCurrentEndpoint(dockerCli)
-			if err != nil {
-				return err
-			}
-			setEp = false
 		}
 
 		m, err := csvToMap(in.driverOpts)
 		if err != nil {
 			return err
 		}
-
-		if in.configFile == "" {
-			// if buildkit config is not provided, check if the default one is
-			// available and use it
-			if f, ok := confutil.DefaultConfigFile(dockerCli); ok {
-				logrus.Warnf("Using default BuildKit config in %s", f)
-				in.configFile = f
-			}
-		}
-
-		if err := ng.Update(in.nodeName, ep, in.platform, setEp, in.actionAppend, flags, in.configFile, m); err != nil {
+		if err := ng.Update(in.nodeName, ep, in.platform, len(args) > 0, in.actionAppend, flags, in.configFile, m); err != nil {
 			return err
 		}
 	}
@@ -238,41 +175,8 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 		return err
 	}
 
-	b, err := builder.New(dockerCli,
-		builder.WithName(ng.Name),
-		builder.WithStore(txn),
-		builder.WithSkippedValidation(),
-	)
-	if err != nil {
-		return err
-	}
-
-	timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
-	defer cancel()
-
-	nodes, err := b.LoadNodes(timeoutCtx, true)
-	if err != nil {
-		return err
-	}
-
-	for _, node := range nodes {
-		if err := node.Err; err != nil {
-			err := errors.Errorf("failed to initialize builder %s (%s): %s", ng.Name, node.Name, err)
-			var err2 error
-			if ngOriginal == nil {
-				err2 = txn.Remove(ng.Name)
-			} else {
-				err2 = txn.Save(ngOriginal)
-			}
-			if err2 != nil {
-				logrus.Warnf("Could not rollback to previous state: %s", err2)
-			}
-			return err
-		}
-	}
-
 	if in.use && ep != "" {
-		current, err := dockerutil.GetCurrentEndpoint(dockerCli)
+		current, err := storeutil.GetCurrentEndpoint(dockerCli)
 		if err != nil {
 			return err
 		}
@@ -281,8 +185,17 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 		}
 	}
 
+	ngi := &nginfo{ng: ng}
+
+	timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
+	defer cancel()
+
+	if err = loadNodeGroupData(timeoutCtx, dockerCli, ngi); err != nil {
+		return err
+	}
+
 	if in.bootstrap {
-		if _, err = b.Boot(ctx); err != nil {
+		if _, err = boot(ctx, ngi); err != nil {
 			return err
 		}
 	}
@@ -295,7 +208,7 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
 	var options createOptions
 
 	var drivers bytes.Buffer
-	for _, d := range driver.GetFactories(true) {
+	for _, d := range driver.GetFactories() {
 		if len(drivers.String()) > 0 {
 			drivers.WriteString(", ")
 		}
@@ -333,9 +246,6 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
 }
 
 func csvToMap(in []string) (map[string]string, error) {
-	if len(in) == 0 {
-		return nil, nil
-	}
 	m := make(map[string]string, len(in))
 	for _, s := range in {
 		csvReader := csv.NewReader(strings.NewReader(s))
@@ -353,27 +263,3 @@ func csvToMap(in []string) (map[string]string, error) {
 	}
 	return m, nil
 }
-
-// validateEndpoint validates that endpoint is either a context or a docker host
-func validateEndpoint(dockerCli command.Cli, ep string) (string, error) {
-	dem, err := dockerutil.GetDockerEndpoint(dockerCli, ep)
-	if err == nil && dem != nil {
-		if ep == "default" {
-			return dem.Host, nil
-		}
-		return ep, nil
-	}
-	h, err := dopts.ParseHost(true, ep)
-	if err != nil {
-		return "", errors.Wrapf(err, "failed to parse endpoint %s", ep)
-	}
-	return h, nil
-}
-
-// validateBuildkitEndpoint validates that endpoint is a valid buildkit host
-func validateBuildkitEndpoint(ep string) (string, error) {
-	if err := remoteutil.IsValidEndpoint(ep); err != nil {
-		return "", err
-	}
-	return ep, nil
-}

commands/create_test.go

@@ -1,26 +0,0 @@
-package commands
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestCsvToMap(t *testing.T) {
-	d := []string{
-		"\"tolerations=key=foo,value=bar;key=foo2,value=bar2\",replicas=1",
-		"namespace=default",
-	}
-	r, err := csvToMap(d)
-
-	require.NoError(t, err)
-
-	require.Contains(t, r, "tolerations")
-	require.Equal(t, r["tolerations"], "key=foo,value=bar;key=foo2,value=bar2")
-
-	require.Contains(t, r, "replicas")
-	require.Equal(t, r["replicas"], "1")
-
-	require.Contains(t, r, "namespace")
-	require.Equal(t, r["namespace"], "default")
-}

commands/diskusage.go

@@ -8,7 +8,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/docker/buildx/builder"
+	"github.com/docker/buildx/build"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/opts"
@@ -33,29 +33,25 @@ func runDiskUsage(dockerCli command.Cli, opts duOptions) error {
 		return err
 	}
 
-	b, err := builder.New(dockerCli, builder.WithName(opts.builder))
+	dis, err := getInstanceOrDefault(ctx, dockerCli, opts.builder, "")
 	if err != nil {
 		return err
 	}
 
-	nodes, err := b.LoadNodes(ctx, false)
-	if err != nil {
-		return err
-	}
-	for _, node := range nodes {
-		if node.Err != nil {
-			return node.Err
+	for _, di := range dis {
+		if di.Err != nil {
+			return err
 		}
 	}
 
-	out := make([][]*client.UsageInfo, len(nodes))
+	out := make([][]*client.UsageInfo, len(dis))
 
 	eg, ctx := errgroup.WithContext(ctx)
-	for i, node := range nodes {
-		func(i int, node builder.Node) {
+	for i, di := range dis {
+		func(i int, di build.DriverInfo) {
 			eg.Go(func() error {
-				if node.Driver != nil {
-					c, err := node.Driver.Client(ctx)
+				if di.Driver != nil {
+					c, err := di.Driver.Client(ctx)
 					if err != nil {
 						return err
 					}
@@ -68,7 +64,7 @@ func runDiskUsage(dockerCli command.Cli, opts duOptions) error {
 				}
 				return nil
 			})
-		}(i, node)
+		}(i, di)
 	}
 
 	if err := eg.Wait(); err != nil {

commands/imagetools/create.go

@@ -1,15 +1,14 @@
 package commands
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
-	"os"
+	"io/ioutil"
 	"strings"
 
-	"github.com/docker/buildx/builder"
+	"github.com/docker/buildx/store"
+	"github.com/docker/buildx/store/storeutil"
 	"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"
@@ -26,7 +25,6 @@ type createOptions struct {
 	tags         []string
 	dryrun       bool
 	actionAppend bool
-	progress     string
 }
 
 func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
@@ -40,7 +38,7 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 
 	fileArgs := make([]string, len(in.files))
 	for i, f := range in.files {
-		dt, err := os.ReadFile(f)
+		dt, err := ioutil.ReadFile(f)
 		if err != nil {
 			return err
 		}
@@ -80,43 +78,53 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 	if len(repos) == 0 {
 		return errors.Errorf("no repositories specified, please set a reference in tag or source")
 	}
+	if len(repos) > 1 {
+		return errors.Errorf("multiple repositories currently not supported, found %v", repos)
+	}
 
-	var defaultRepo *string
-	if len(repos) == 1 {
-		for repo := range repos {
-			defaultRepo = &repo
-		}
+	var repo string
+	for r := range repos {
+		repo = r
 	}
 
 	for i, s := range srcs {
-		if s.Ref == nil {
-			if defaultRepo == nil {
-				return errors.Errorf("multiple repositories specified, cannot infer repository for %q", args[i])
-			}
-			n, err := reference.ParseNormalizedNamed(*defaultRepo)
+		if s.Ref == nil && s.Desc.MediaType == "" && s.Desc.Digest != "" {
+			n, err := reference.ParseNormalizedNamed(repo)
 			if err != nil {
 				return err
 			}
-			if s.Desc.MediaType == "" && s.Desc.Digest != "" {
-				r, err := reference.WithDigest(n, s.Desc.Digest)
-				if err != nil {
-					return err
-				}
-				srcs[i].Ref = r
-				sourceRefs = true
-			} else {
-				srcs[i].Ref = reference.TagNameOnly(n)
+			r, err := reference.WithDigest(n, s.Desc.Digest)
+			if err != nil {
+				return err
 			}
+			srcs[i].Ref = r
+			sourceRefs = true
 		}
 	}
 
 	ctx := appcontext.Context()
 
-	b, err := builder.New(dockerCli, builder.WithName(in.builder))
+	txn, release, err := storeutil.GetStore(dockerCli)
 	if err != nil {
 		return err
 	}
-	imageopt, err := b.ImageOpt()
+	defer release()
+
+	var ng *store.NodeGroup
+
+	if in.builder != "" {
+		ng, err = storeutil.GetNodeGroup(txn, dockerCli, in.builder)
+		if err != nil {
+			return err
+		}
+	} else {
+		ng, err = storeutil.GetCurrentInstance(txn, dockerCli)
+		if err != nil {
+			return err
+		}
+	}
+
+	imageopt, err := storeutil.GetImageConfig(dockerCli, ng)
 	if err != nil {
 		return err
 	}
@@ -135,6 +143,7 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 					if err != nil {
 						return err
 					}
+					srcs[i].Ref = nil
 					if srcs[i].Desc.Digest == "" {
 						srcs[i].Desc = desc
 					} else {
@@ -153,7 +162,12 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 		}
 	}
 
-	dt, desc, err := r.Combine(ctx, srcs)
+	descs := make([]ocispec.Descriptor, len(srcs))
+	for i := range descs {
+		descs[i] = srcs[i].Desc
+	}
+
+	dt, desc, err := r.Combine(ctx, repo, descs)
 	if err != nil {
 		return err
 	}
@@ -166,52 +180,23 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 	// new resolver cause need new auth
 	r = imagetools.New(imageopt)
 
-	ctx2, cancel := context.WithCancel(context.TODO())
-	defer cancel()
-	printer, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, in.progress)
-	if err != nil {
-		return err
-	}
-
-	eg, _ := errgroup.WithContext(ctx)
-	pw := progress.WithPrefix(printer, "internal", true)
-
 	for _, t := range tags {
-		t := t
-		eg.Go(func() error {
-			return progress.Wrap(fmt.Sprintf("pushing %s", t.String()), pw.Write, func(sub progress.SubLogger) error {
-				eg2, _ := errgroup.WithContext(ctx)
-				for _, s := range srcs {
-					if reference.Domain(s.Ref) == reference.Domain(t) && reference.Path(s.Ref) == reference.Path(t) {
-						continue
-					}
-					s := s
-					eg2.Go(func() error {
-						sub.Log(1, []byte(fmt.Sprintf("copying %s from %s to %s\n", s.Desc.Digest.String(), s.Ref.String(), t.String())))
-						return r.Copy(ctx, s, t)
-					})
-				}
-
-				if err := eg2.Wait(); err != nil {
-					return err
-				}
-				sub.Log(1, []byte(fmt.Sprintf("pushing %s to %s\n", desc.Digest.String(), t.String())))
-				return r.Push(ctx, t, desc, dt)
-			})
-		})
+		if err := r.Push(ctx, t, desc, dt); err != nil {
+			return err
+		}
+		fmt.Println(t.String())
 	}
 
-	err = eg.Wait()
-	err1 := printer.Wait()
-	if err == nil {
-		err = err1
-	}
-
-	return err
+	return nil
 }
 
-func parseSources(in []string) ([]*imagetools.Source, error) {
-	out := make([]*imagetools.Source, len(in))
+type src struct {
+	Desc ocispec.Descriptor
+	Ref  reference.Named
+}
+
+func parseSources(in []string) ([]*src, error) {
+	out := make([]*src, len(in))
 	for i, in := range in {
 		s, err := parseSource(in)
 		if err != nil {
@@ -234,11 +219,11 @@ func parseRefs(in []string) ([]reference.Named, error) {
 	return refs, nil
 }
 
-func parseSource(in string) (*imagetools.Source, error) {
+func parseSource(in string) (*src, error) {
 	// source can be a digest, reference or a descriptor JSON
 	dgst, err := digest.Parse(in)
 	if err == nil {
-		return &imagetools.Source{
+		return &src{
 			Desc: ocispec.Descriptor{
 				Digest: dgst,
 			},
@@ -249,14 +234,14 @@ func parseSource(in string) (*imagetools.Source, error) {
 
 	ref, err := reference.ParseNormalizedNamed(in)
 	if err == nil {
-		return &imagetools.Source{
+		return &src{
 			Ref: ref,
 		}, nil
 	} else if !strings.HasPrefix(in, "{") {
 		return nil, err
 	}
 
-	var s imagetools.Source
+	var s src
 	if err := json.Unmarshal([]byte(in), &s.Desc); err != nil {
 		return nil, errors.WithStack(err)
 	}
@@ -270,7 +255,7 @@ func createCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
 		Use:   "create [OPTIONS] [SOURCE] [SOURCE...]",
 		Short: "Create a new image based on source images",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			options.builder = *opts.Builder
+			options.builder = opts.Builder
 			return runCreate(dockerCli, options, args)
 		},
 	}
@@ -280,7 +265,6 @@ func createCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
 	flags.StringArrayVarP(&options.tags, "tag", "t", []string{}, "Set reference for new image")
 	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`)
 
 	return cmd
 }

commands/imagetools/inspect.go

@@ -1,7 +1,8 @@
 package commands
 
 import (
-	"github.com/docker/buildx/builder"
+	"github.com/docker/buildx/store"
+	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/cli-docs-tool/annotation"
 	"github.com/docker/cli/cli"
@@ -24,11 +25,27 @@ func runInspect(dockerCli command.Cli, in inspectOptions, name string) error {
 		return errors.Errorf("format and raw cannot be used together")
 	}
 
-	b, err := builder.New(dockerCli, builder.WithName(in.builder))
+	txn, release, err := storeutil.GetStore(dockerCli)
 	if err != nil {
 		return err
 	}
-	imageopt, err := b.ImageOpt()
+	defer release()
+
+	var ng *store.NodeGroup
+
+	if in.builder != "" {
+		ng, err = storeutil.GetNodeGroup(txn, dockerCli, in.builder)
+		if err != nil {
+			return err
+		}
+	} else {
+		ng, err = storeutil.GetCurrentInstance(txn, dockerCli)
+		if err != nil {
+			return err
+		}
+	}
+
+	imageopt, err := storeutil.GetImageConfig(dockerCli, ng)
 	if err != nil {
 		return err
 	}
@@ -49,7 +66,7 @@ func inspectCmd(dockerCli command.Cli, rootOpts RootOptions) *cobra.Command {
 		Short: "Show details of an image in the registry",
 		Args:  cli.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			options.builder = *rootOpts.Builder
+			options.builder = rootOpts.Builder
 			return runInspect(dockerCli, options, args[0])
 		},
 	}

commands/imagetools/root.go

@@ -6,7 +6,7 @@ import (
 )
 
 type RootOptions struct {
-	Builder *string
+	Builder string
 }
 
 func RootCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {

commands/inspect.go

@@ -8,7 +8,8 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/docker/buildx/builder"
+	"github.com/docker/buildx/store"
+	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/platformutil"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
@@ -24,71 +25,87 @@ type inspectOptions struct {
 func runInspect(dockerCli command.Cli, in inspectOptions) error {
 	ctx := appcontext.Context()
 
-	b, err := builder.New(dockerCli,
-		builder.WithName(in.builder),
-		builder.WithSkippedValidation(),
-	)
+	txn, release, err := storeutil.GetStore(dockerCli)
 	if err != nil {
 		return err
 	}
+	defer release()
+
+	var ng *store.NodeGroup
+
+	if in.builder != "" {
+		ng, err = storeutil.GetNodeGroup(txn, dockerCli, in.builder)
+		if err != nil {
+			return err
+		}
+	} else {
+		ng, err = storeutil.GetCurrentInstance(txn, dockerCli)
+		if err != nil {
+			return err
+		}
+	}
+
+	if ng == nil {
+		ng = &store.NodeGroup{
+			Name: "default",
+			Nodes: []store.Node{{
+				Name:     "default",
+				Endpoint: "default",
+			}},
+		}
+	}
+
+	ngi := &nginfo{ng: ng}
 
 	timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
 	defer cancel()
 
-	nodes, err := b.LoadNodes(timeoutCtx, true)
+	err = loadNodeGroupData(timeoutCtx, dockerCli, ngi)
+
+	var bootNgi *nginfo
 	if in.bootstrap {
 		var ok bool
-		ok, err = b.Boot(ctx)
+		ok, err = boot(ctx, ngi)
 		if err != nil {
 			return err
 		}
+		bootNgi = ngi
 		if ok {
-			nodes, err = b.LoadNodes(timeoutCtx, true)
+			ngi = &nginfo{ng: ng}
+			err = loadNodeGroupData(ctx, dockerCli, ngi)
 		}
 	}
 
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
-	fmt.Fprintf(w, "Name:\t%s\n", b.Name)
-	fmt.Fprintf(w, "Driver:\t%s\n", b.Driver)
-	if !b.NodeGroup.LastActivity.IsZero() {
-		fmt.Fprintf(w, "Last Activity:\t%v\n", b.NodeGroup.LastActivity)
-	}
-
+	fmt.Fprintf(w, "Name:\t%s\n", ngi.ng.Name)
+	fmt.Fprintf(w, "Driver:\t%s\n", ngi.ng.Driver)
 	if err != nil {
 		fmt.Fprintf(w, "Error:\t%s\n", err.Error())
-	} else if b.Err() != nil {
-		fmt.Fprintf(w, "Error:\t%s\n", b.Err().Error())
+	} else if ngi.err != nil {
+		fmt.Fprintf(w, "Error:\t%s\n", ngi.err.Error())
 	}
 	if err == nil {
 		fmt.Fprintln(w, "")
 		fmt.Fprintln(w, "Nodes:")
 
-		for i, n := range nodes {
+		for i, n := range ngi.ng.Nodes {
 			if i != 0 {
 				fmt.Fprintln(w, "")
 			}
 			fmt.Fprintf(w, "Name:\t%s\n", n.Name)
 			fmt.Fprintf(w, "Endpoint:\t%s\n", n.Endpoint)
-
-			var driverOpts []string
-			for k, v := range n.DriverOpts {
-				driverOpts = append(driverOpts, fmt.Sprintf("%s=%q", k, v))
-			}
-			if len(driverOpts) > 0 {
-				fmt.Fprintf(w, "Driver Options:\t%s\n", strings.Join(driverOpts, " "))
-			}
-
-			if err := n.Err; err != nil {
+			if err := ngi.drivers[i].di.Err; err != nil {
 				fmt.Fprintf(w, "Error:\t%s\n", err.Error())
+			} else if err := ngi.drivers[i].err; err != nil {
+				fmt.Fprintf(w, "Error:\t%s\n", err.Error())
+			} else if bootNgi != nil && len(bootNgi.drivers) > i && bootNgi.drivers[i].err != nil {
+				fmt.Fprintf(w, "Error:\t%s\n", bootNgi.drivers[i].err.Error())
 			} else {
-				fmt.Fprintf(w, "Status:\t%s\n", nodes[i].DriverInfo.Status)
+				fmt.Fprintf(w, "Status:\t%s\n", ngi.drivers[i].info.Status)
 				if len(n.Flags) > 0 {
 					fmt.Fprintf(w, "Flags:\t%s\n", strings.Join(n.Flags, " "))
 				}
-				if nodes[i].Version != "" {
-					fmt.Fprintf(w, "Buildkit:\t%s\n", nodes[i].Version)
-				}
-				fmt.Fprintf(w, "Platforms:\t%s\n", strings.Join(platformutil.FormatInGroups(n.Node.Platforms, n.Platforms), ", "))
+				fmt.Fprintf(w, "Platforms:\t%s\n", strings.Join(platformutil.FormatInGroups(n.Platforms, ngi.drivers[i].platforms), ", "))
 			}
 		}
 	}

commands/ls.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"os"
 	"strings"
 	"text/tabwriter"
 	"time"
 
-	"github.com/docker/buildx/builder"
+	"github.com/docker/buildx/store"
 	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/cobrautil"
 	"github.com/docker/buildx/util/platformutil"
@@ -31,24 +32,45 @@ func runLs(dockerCli command.Cli, in lsOptions) error {
 	}
 	defer release()
 
-	current, err := storeutil.GetCurrentInstance(txn, dockerCli)
-	if err != nil {
-		return err
-	}
-
-	builders, err := builder.GetBuilders(dockerCli, txn)
-	if err != nil {
-		return err
-	}
-
-	timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
+	ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
 	defer cancel()
 
-	eg, _ := errgroup.WithContext(timeoutCtx)
+	ll, err := txn.List()
+	if err != nil {
+		return err
+	}
+
+	builders := make([]*nginfo, len(ll))
+	for i, ng := range ll {
+		builders[i] = &nginfo{ng: ng}
+	}
+
+	list, err := dockerCli.ContextStore().List()
+	if err != nil {
+		return err
+	}
+	ctxbuilders := make([]*nginfo, len(list))
+	for i, l := range list {
+		ctxbuilders[i] = &nginfo{ng: &store.NodeGroup{
+			Name: l.Name,
+			Nodes: []store.Node{{
+				Name:     l.Name,
+				Endpoint: l.Name,
+			}},
+		}}
+	}
+
+	builders = append(builders, ctxbuilders...)
+
+	eg, _ := errgroup.WithContext(ctx)
+
 	for _, b := range builders {
-		func(b *builder.Builder) {
+		func(b *nginfo) {
 			eg.Go(func() error {
-				_, _ = b.LoadNodes(timeoutCtx, true)
+				err = loadNodeGroupData(ctx, dockerCli, b)
+				if b.err == nil && err != nil {
+					b.err = err
+				}
 				return nil
 			})
 		}(b)
@@ -58,62 +80,61 @@ func runLs(dockerCli command.Cli, in lsOptions) error {
 		return err
 	}
 
-	w := tabwriter.NewWriter(dockerCli.Out(), 0, 0, 1, ' ', 0)
-	fmt.Fprintf(w, "NAME/NODE\tDRIVER/ENDPOINT\tSTATUS\tBUILDKIT\tPLATFORMS\n")
+	currentName := "default"
+	current, err := storeutil.GetCurrentInstance(txn, dockerCli)
+	if err != nil {
+		return err
+	}
+	if current != nil {
+		currentName = current.Name
+		if current.Name == "default" {
+			currentName = current.Nodes[0].Endpoint
+		}
+	}
 
-	printErr := false
+	w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
+	fmt.Fprintf(w, "NAME/NODE\tDRIVER/ENDPOINT\tSTATUS\tPLATFORMS\n")
+
+	currentSet := false
 	for _, b := range builders {
-		if current.Name == b.Name {
-			b.Name += " *"
-		}
-		if ok := printBuilder(w, b); !ok {
-			printErr = true
+		if !currentSet && b.ng.Name == currentName {
+			b.ng.Name += " *"
+			currentSet = true
 		}
+		printngi(w, b)
 	}
 
 	w.Flush()
 
-	if printErr {
-		_, _ = fmt.Fprintf(dockerCli.Err(), "\n")
-		for _, b := range builders {
-			if b.Err() != nil {
-				_, _ = fmt.Fprintf(dockerCli.Err(), "Cannot load builder %s: %s\n", b.Name, strings.TrimSpace(b.Err().Error()))
-			} else {
-				for _, d := range b.Nodes() {
-					if d.Err != nil {
-						_, _ = fmt.Fprintf(dockerCli.Err(), "Failed to get status for %s (%s): %s\n", b.Name, d.Name, strings.TrimSpace(d.Err.Error()))
-					}
-				}
-			}
-		}
-	}
-
 	return nil
 }
 
-func printBuilder(w io.Writer, b *builder.Builder) (ok bool) {
-	ok = true
+func printngi(w io.Writer, ngi *nginfo) {
 	var err string
-	if b.Err() != nil {
-		ok = false
-		err = "error"
+	if ngi.err != nil {
+		err = ngi.err.Error()
 	}
-	fmt.Fprintf(w, "%s\t%s\t%s\t\t\n", b.Name, b.Driver, err)
-	if b.Err() == nil {
-		for _, n := range b.Nodes() {
-			var status string
-			if n.DriverInfo != nil {
-				status = n.DriverInfo.Status.String()
+	fmt.Fprintf(w, "%s\t%s\t%s\t\n", ngi.ng.Name, ngi.ng.Driver, err)
+	if ngi.err == nil {
+		for idx, n := range ngi.ng.Nodes {
+			d := ngi.drivers[idx]
+			var err string
+			if d.err != nil {
+				err = d.err.Error()
+			} else if d.di.Err != nil {
+				err = d.di.Err.Error()
 			}
-			if n.Err != nil {
-				ok = false
-				fmt.Fprintf(w, "  %s\t%s\t%s\t\t\n", n.Name, n.Endpoint, "error")
+			var status string
+			if d.info != nil {
+				status = d.info.Status.String()
+			}
+			if err != "" {
+				fmt.Fprintf(w, "  %s\t%s\t%s\n", n.Name, n.Endpoint, err)
 			} else {
-				fmt.Fprintf(w, "  %s\t%s\t%s\t%s\t%s\n", n.Name, n.Endpoint, status, n.Version, strings.Join(platformutil.FormatInGroups(n.Node.Platforms, n.Platforms), ", "))
+				fmt.Fprintf(w, "  %s\t%s\t%s\t%s\n", n.Name, n.Endpoint, status, strings.Join(platformutil.FormatInGroups(n.Platforms, d.platforms), ", "))
 			}
 		}
 	}
-	return
 }
 
 func lsCmd(dockerCli command.Cli) *cobra.Command {

commands/print.go

@@ -1,48 +0,0 @@
-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)
-}

commands/prune.go

@@ -7,7 +7,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/docker/buildx/builder"
+	"github.com/docker/buildx/build"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/opts"
@@ -54,18 +54,14 @@ func runPrune(dockerCli command.Cli, opts pruneOptions) error {
 		return nil
 	}
 
-	b, err := builder.New(dockerCli, builder.WithName(opts.builder))
+	dis, err := getInstanceOrDefault(ctx, dockerCli, opts.builder, "")
 	if err != nil {
 		return err
 	}
 
-	nodes, err := b.LoadNodes(ctx, false)
-	if err != nil {
-		return err
-	}
-	for _, node := range nodes {
-		if node.Err != nil {
-			return node.Err
+	for _, di := range dis {
+		if di.Err != nil {
+			return err
 		}
 	}
 
@@ -94,11 +90,11 @@ func runPrune(dockerCli command.Cli, opts pruneOptions) error {
 	}()
 
 	eg, ctx := errgroup.WithContext(ctx)
-	for _, node := range nodes {
-		func(node builder.Node) {
+	for _, di := range dis {
+		func(di build.DriverInfo) {
 			eg.Go(func() error {
-				if node.Driver != nil {
-					c, err := node.Driver.Client(ctx)
+				if di.Driver != nil {
+					c, err := di.Driver.Client(ctx)
 					if err != nil {
 						return err
 					}
@@ -113,7 +109,7 @@ func runPrune(dockerCli command.Cli, opts pruneOptions) error {
 				}
 				return nil
 			})
-		}(node)
+		}(di)
 	}
 
 	if err := eg.Wait(); err != nil {
@@ -142,7 +138,7 @@ func pruneCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.BoolVarP(&options.all, "all", "a", false, "Include internal/frontend images")
+	flags.BoolVarP(&options.all, "all", "a", false, "Remove all unused images, not just dangling ones")
 	flags.Var(&options.filter, "filter", `Provide filter values (e.g., "until=24h")`)
 	flags.Var(&options.keepStorage, "keep-storage", "Amount of disk space to keep for cache")
 	flags.BoolVar(&options.verbose, "verbose", false, "Provide a more verbose output")
@@ -159,9 +155,9 @@ func toBuildkitPruneInfo(f filters.Args) (*client.PruneInfo, error) {
 	if len(untilValues) > 0 && len(unusedForValues) > 0 {
 		return nil, errors.Errorf("conflicting filters %q and %q", "until", "unused-for")
 	}
-	untilKey := "until"
+	filterKey := "until"
 	if len(unusedForValues) > 0 {
-		untilKey = "unused-for"
+		filterKey = "unused-for"
 	}
 	untilValues = append(untilValues, unusedForValues...)
 
@@ -172,27 +168,23 @@ func toBuildkitPruneInfo(f filters.Args) (*client.PruneInfo, error) {
 		var err error
 		until, err = time.ParseDuration(untilValues[0])
 		if err != nil {
-			return nil, errors.Wrapf(err, "%q filter expects a duration (e.g., '24h')", untilKey)
+			return nil, errors.Wrapf(err, "%q filter expects a duration (e.g., '24h')", filterKey)
 		}
 	default:
 		return nil, errors.Errorf("filters expect only one value")
 	}
 
-	filters := make([]string, 0, f.Len())
-	for _, filterKey := range f.Keys() {
-		if filterKey == untilKey {
-			continue
-		}
-
-		values := f.Get(filterKey)
+	bkFilter := make([]string, 0, f.Len())
+	for _, field := range f.Keys() {
+		values := f.Get(field)
 		switch len(values) {
 		case 0:
-			filters = append(filters, filterKey)
+			bkFilter = append(bkFilter, field)
 		case 1:
-			if filterKey == "id" {
-				filters = append(filters, filterKey+"~="+values[0])
+			if field == "id" {
+				bkFilter = append(bkFilter, field+"~="+values[0])
 			} else {
-				filters = append(filters, filterKey+"=="+values[0])
+				bkFilter = append(bkFilter, field+"=="+values[0])
 			}
 		default:
 			return nil, errors.Errorf("filters expect only one value")
@@ -200,6 +192,6 @@ func toBuildkitPruneInfo(f filters.Args) (*client.PruneInfo, error) {
 	}
 	return &client.PruneInfo{
 		KeepDuration: until,
-		Filter:       []string{strings.Join(filters, ",")},
+		Filter:       []string{strings.Join(bkFilter, ",")},
 	}, nil
 }

commands/rm.go

@@ -2,10 +2,8 @@ package commands
 
 import (
 	"context"
-	"fmt"
 	"time"
 
-	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/store"
 	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/cli/cli"
@@ -45,33 +43,30 @@ func runRm(dockerCli command.Cli, in rmOptions) error {
 		return rmAllInactive(ctx, txn, dockerCli, in)
 	}
 
-	b, err := builder.New(dockerCli,
-		builder.WithName(in.builder),
-		builder.WithStore(txn),
-		builder.WithSkippedValidation(),
-	)
-	if err != nil {
-		return err
-	}
-
-	nodes, err := b.LoadNodes(ctx, false)
-	if err != nil {
-		return err
-	}
-
-	if cb := b.ContextName(); cb != "" {
-		return errors.Errorf("context builder cannot be removed, run `docker context rm %s` to remove this context", cb)
-	}
-
-	err1 := rm(ctx, nodes, in)
-	if err := txn.Remove(b.Name); err != nil {
-		return err
-	}
-	if err1 != nil {
+	if in.builder != "" {
+		ng, err := storeutil.GetNodeGroup(txn, dockerCli, in.builder)
+		if err != nil {
+			return err
+		}
+		err1 := rm(ctx, dockerCli, in, ng)
+		if err := txn.Remove(ng.Name); err != nil {
+			return err
+		}
+		return err1
+	}
+
+	ng, err := storeutil.GetCurrentInstance(txn, dockerCli)
+	if err != nil {
+		return err
+	}
+	if ng != nil {
+		err1 := rm(ctx, dockerCli, in, ng)
+		if err := txn.Remove(ng.Name); err != nil {
+			return err
+		}
 		return err1
 	}
 
-	_, _ = fmt.Fprintf(dockerCli.Err(), "%s removed\n", b.Name)
 	return nil
 }
 
@@ -103,53 +98,60 @@ func rmCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	return cmd
 }
 
-func rm(ctx context.Context, nodes []builder.Node, in rmOptions) (err error) {
-	for _, node := range nodes {
-		if node.Driver == nil {
+func rm(ctx context.Context, dockerCli command.Cli, in rmOptions, ng *store.NodeGroup) error {
+	dis, err := driversForNodeGroup(ctx, dockerCli, ng, "")
+	if err != nil {
+		return err
+	}
+	for _, di := range dis {
+		if di.Driver == nil {
 			continue
 		}
 		// Do not stop the buildkitd daemon when --keep-daemon is provided
 		if !in.keepDaemon {
-			if err := node.Driver.Stop(ctx, true); err != nil {
+			if err := di.Driver.Stop(ctx, true); err != nil {
 				return err
 			}
 		}
-		if err := node.Driver.Rm(ctx, true, !in.keepState, !in.keepDaemon); err != nil {
+		if err := di.Driver.Rm(ctx, true, !in.keepState, !in.keepDaemon); err != nil {
 			return err
 		}
-		if node.Err != nil {
-			err = node.Err
+		if di.Err != nil {
+			err = di.Err
 		}
 	}
 	return err
 }
 
 func rmAllInactive(ctx context.Context, txn *store.Txn, dockerCli command.Cli, in rmOptions) error {
-	builders, err := builder.GetBuilders(dockerCli, txn)
+	ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
+	defer cancel()
+
+	ll, err := txn.List()
 	if err != nil {
 		return err
 	}
 
-	timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
-	defer cancel()
+	builders := make([]*nginfo, len(ll))
+	for i, ng := range ll {
+		builders[i] = &nginfo{ng: ng}
+	}
 
-	eg, _ := errgroup.WithContext(timeoutCtx)
+	eg, _ := errgroup.WithContext(ctx)
 	for _, b := range builders {
-		func(b *builder.Builder) {
+		func(b *nginfo) {
 			eg.Go(func() error {
-				nodes, err := b.LoadNodes(timeoutCtx, true)
-				if err != nil {
-					return errors.Wrapf(err, "cannot load %s", b.Name)
+				if err := loadNodeGroupData(ctx, dockerCli, b); err != nil {
+					return errors.Wrapf(err, "cannot load %s", b.ng.Name)
 				}
-				if b.Dynamic {
+				if b.ng.Dynamic {
 					return nil
 				}
-				if b.Inactive() {
-					rmerr := rm(ctx, nodes, in)
-					if err := txn.Remove(b.Name); err != nil {
+				if b.inactive() {
+					rmerr := rm(ctx, dockerCli, in, b.ng)
+					if err := txn.Remove(b.ng.Name); err != nil {
 						return err
 					}
-					_, _ = fmt.Fprintf(dockerCli.Err(), "%s removed\n", b.Name)
 					return rmerr
 				}
 				return nil

commands/root.go

@@ -6,7 +6,6 @@ import (
 	imagetoolscmd "github.com/docker/buildx/commands/imagetools"
 	"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/sirupsen/logrus"
@@ -27,14 +26,6 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
 		cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
 			return plugin.PersistentPreRunE(cmd, args)
 		}
-	} else {
-		// match plugin behavior for standalone mode
-		// https://github.com/docker/cli/blob/6c9eb708fa6d17765d71965f90e1c59cea686ee9/cli-plugins/plugin/plugin.go#L117-L127
-		cmd.SilenceUsage = true
-		cmd.SilenceErrors = true
-		cmd.TraverseChildren = true
-		cmd.DisableFlagsInUseLine = true
-		cli.DisableFlagsInUseLine(cmd)
 	}
 
 	logrus.SetFormatter(&logutil.Formatter{})
@@ -55,7 +46,6 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
 		logrus.WarnLevel,
 	},
 		"commandConn.CloseWrite:",
-		"commandConn.CloseRead:",
 	))
 
 	addCommands(cmd, dockerCli)
@@ -84,7 +74,7 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		versionCmd(dockerCli),
 		pruneCmd(dockerCli, opts),
 		duCmd(dockerCli, opts),
-		imagetoolscmd.RootCmd(dockerCli, imagetoolscmd.RootOptions{Builder: &opts.builder}),
+		imagetoolscmd.RootCmd(dockerCli, imagetoolscmd.RootOptions{Builder: opts.builder}),
 	)
 }
 

commands/stop.go

@@ -3,7 +3,8 @@ package commands
 import (
 	"context"
 
-	"github.com/docker/buildx/builder"
+	"github.com/docker/buildx/store"
+	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/appcontext"
@@ -17,19 +18,32 @@ type stopOptions struct {
 func runStop(dockerCli command.Cli, in stopOptions) error {
 	ctx := appcontext.Context()
 
-	b, err := builder.New(dockerCli,
-		builder.WithName(in.builder),
-		builder.WithSkippedValidation(),
-	)
+	txn, release, err := storeutil.GetStore(dockerCli)
 	if err != nil {
 		return err
 	}
-	nodes, err := b.LoadNodes(ctx, false)
-	if err != nil {
-		return err
+	defer release()
+
+	if in.builder != "" {
+		ng, err := storeutil.GetNodeGroup(txn, dockerCli, in.builder)
+		if err != nil {
+			return err
+		}
+		if err := stop(ctx, dockerCli, ng); err != nil {
+			return err
+		}
+		return nil
 	}
 
-	return stop(ctx, nodes)
+	ng, err := storeutil.GetCurrentInstance(txn, dockerCli)
+	if err != nil {
+		return err
+	}
+	if ng != nil {
+		return stop(ctx, dockerCli, ng)
+	}
+
+	return stopCurrent(ctx, dockerCli)
 }
 
 func stopCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
@@ -51,15 +65,37 @@ func stopCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	return cmd
 }
 
-func stop(ctx context.Context, nodes []builder.Node) (err error) {
-	for _, node := range nodes {
-		if node.Driver != nil {
-			if err := node.Driver.Stop(ctx, true); err != nil {
+func stop(ctx context.Context, dockerCli command.Cli, ng *store.NodeGroup) error {
+	dis, err := driversForNodeGroup(ctx, dockerCli, ng, "")
+	if err != nil {
+		return err
+	}
+	for _, di := range dis {
+		if di.Driver != nil {
+			if err := di.Driver.Stop(ctx, true); err != nil {
 				return err
 			}
 		}
-		if node.Err != nil {
-			err = node.Err
+		if di.Err != nil {
+			err = di.Err
+		}
+	}
+	return err
+}
+
+func stopCurrent(ctx context.Context, dockerCli command.Cli) error {
+	dis, err := getDefaultDrivers(ctx, dockerCli, false, "")
+	if err != nil {
+		return err
+	}
+	for _, di := range dis {
+		if di.Driver != nil {
+			if err := di.Driver.Stop(ctx, true); err != nil {
+				return err
+			}
+		}
+		if di.Err != nil {
+			err = di.Err
 		}
 	}
 	return err

commands/use.go

@@ -4,7 +4,6 @@ import (
 	"os"
 
 	"github.com/docker/buildx/store/storeutil"
-	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
@@ -30,7 +29,7 @@ func runUse(dockerCli command.Cli, in useOptions) error {
 				return errors.Errorf("run `docker context use default` to switch to default context")
 			}
 			if in.builder == "default" || in.builder == dockerCli.CurrentContext() {
-				ep, err := dockerutil.GetCurrentEndpoint(dockerCli)
+				ep, err := storeutil.GetCurrentEndpoint(dockerCli)
 				if err != nil {
 					return err
 				}
@@ -53,7 +52,7 @@ func runUse(dockerCli command.Cli, in useOptions) error {
 		return errors.Wrapf(err, "failed to find instance %q", in.builder)
 	}
 
-	ep, err := dockerutil.GetCurrentEndpoint(dockerCli)
+	ep, err := storeutil.GetCurrentEndpoint(dockerCli)
 	if err != nil {
 		return err
 	}

commands/util.go

@@ -0,0 +1,443 @@
+package commands
+
+import (
+	"context"
+	"net/url"
+	"os"
+	"strings"
+
+	"github.com/docker/buildx/build"
+	"github.com/docker/buildx/driver"
+	ctxkube "github.com/docker/buildx/driver/kubernetes/context"
+	"github.com/docker/buildx/store"
+	"github.com/docker/buildx/store/storeutil"
+	"github.com/docker/buildx/util/platformutil"
+	"github.com/docker/buildx/util/progress"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/context/docker"
+	ctxstore "github.com/docker/cli/cli/context/store"
+	dopts "github.com/docker/cli/opts"
+	dockerclient "github.com/docker/docker/client"
+	specs "github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"golang.org/x/sync/errgroup"
+	"k8s.io/client-go/tools/clientcmd"
+)
+
+// validateEndpoint validates that endpoint is either a context or a docker host
+func validateEndpoint(dockerCli command.Cli, ep string) (string, error) {
+	de, err := storeutil.GetDockerEndpoint(dockerCli, ep)
+	if err == nil && de != "" {
+		if ep == "default" {
+			return de, nil
+		}
+		return ep, nil
+	}
+	h, err := dopts.ParseHost(true, ep)
+	if err != nil {
+		return "", errors.Wrapf(err, "failed to parse endpoint %s", ep)
+	}
+	return h, nil
+}
+
+// driversForNodeGroup returns drivers for a nodegroup instance
+func driversForNodeGroup(ctx context.Context, dockerCli command.Cli, ng *store.NodeGroup, contextPathHash string) ([]build.DriverInfo, error) {
+	eg, _ := errgroup.WithContext(ctx)
+
+	dis := make([]build.DriverInfo, len(ng.Nodes))
+
+	var f driver.Factory
+	if ng.Driver != "" {
+		f = driver.GetFactory(ng.Driver, true)
+		if f == nil {
+			return nil, errors.Errorf("failed to find driver %q", f)
+		}
+	} else {
+		dockerapi, err := clientForEndpoint(dockerCli, ng.Nodes[0].Endpoint)
+		if err != nil {
+			return nil, err
+		}
+		f, err = driver.GetDefaultFactory(ctx, dockerapi, false)
+		if err != nil {
+			return nil, err
+		}
+		ng.Driver = f.Name()
+	}
+	imageopt, err := storeutil.GetImageConfig(dockerCli, ng)
+	if err != nil {
+		return nil, err
+	}
+
+	for i, n := range ng.Nodes {
+		func(i int, n store.Node) {
+			eg.Go(func() error {
+				di := build.DriverInfo{
+					Name:        n.Name,
+					Platform:    n.Platforms,
+					ProxyConfig: storeutil.GetProxyConfig(dockerCli),
+				}
+				defer func() {
+					dis[i] = di
+				}()
+				dockerapi, err := clientForEndpoint(dockerCli, n.Endpoint)
+				if err != nil {
+					di.Err = err
+					return nil
+				}
+				// TODO: replace the following line with dockerclient.WithAPIVersionNegotiation option in clientForEndpoint
+				dockerapi.NegotiateAPIVersion(ctx)
+
+				contextStore := dockerCli.ContextStore()
+
+				var kcc driver.KubeClientConfig
+				kcc, err = 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: n should retain real context name.
+					kcc, err = configFromContext("default", contextStore)
+					if err != nil {
+						logrus.Error(err)
+					}
+				}
+
+				tryToUseKubeConfigInCluster := false
+				if kcc == nil {
+					tryToUseKubeConfigInCluster = true
+				} else {
+					if _, err := kcc.ClientConfig(); err != nil {
+						tryToUseKubeConfigInCluster = true
+					}
+				}
+				if tryToUseKubeConfigInCluster {
+					kccInCluster := driver.KubeClientConfigInCluster{}
+					if _, err := kccInCluster.ClientConfig(); err == nil {
+						logrus.Debug("using kube config in cluster")
+						kcc = kccInCluster
+					}
+				}
+
+				d, err := driver.GetDriver(ctx, "buildx_buildkit_"+n.Name, f, dockerapi, imageopt.Auth, kcc, n.Flags, n.Files, n.DriverOpts, n.Platforms, contextPathHash)
+				if err != nil {
+					di.Err = err
+					return nil
+				}
+				di.Driver = d
+				di.ImageOpt = imageopt
+				return nil
+			})
+		}(i, n)
+	}
+
+	if err := eg.Wait(); err != nil {
+		return nil, err
+	}
+
+	return dis, nil
+}
+
+func configFromContext(endpointName string, s ctxstore.Reader) (clientcmd.ClientConfig, error) {
+	if strings.HasPrefix(endpointName, "kubernetes://") {
+		u, _ := url.Parse(endpointName)
+		if kubeconfig := u.Query().Get("kubeconfig"); kubeconfig != "" {
+			_ = os.Setenv(clientcmd.RecommendedConfigPathEnvVar, kubeconfig)
+		}
+		rules := clientcmd.NewDefaultClientConfigLoadingRules()
+		apiConfig, err := rules.Load()
+		if err != nil {
+			return nil, err
+		}
+		return clientcmd.NewDefaultClientConfig(*apiConfig, &clientcmd.ConfigOverrides{}), nil
+	}
+	return ctxkube.ConfigFromContext(endpointName, s)
+}
+
+// clientForEndpoint returns a docker client for an endpoint
+func clientForEndpoint(dockerCli command.Cli, name string) (dockerclient.APIClient, error) {
+	list, err := dockerCli.ContextStore().List()
+	if err != nil {
+		return nil, err
+	}
+	for _, l := range list {
+		if l.Name == name {
+			dep, ok := l.Endpoints["docker"]
+			if !ok {
+				return nil, errors.Errorf("context %q does not have a Docker endpoint", name)
+			}
+			epm, ok := dep.(docker.EndpointMeta)
+			if !ok {
+				return nil, errors.Errorf("endpoint %q is not of type EndpointMeta, %T", dep, dep)
+			}
+			ep, err := docker.WithTLSData(dockerCli.ContextStore(), name, epm)
+			if err != nil {
+				return nil, err
+			}
+			clientOpts, err := ep.ClientOpts()
+			if err != nil {
+				return nil, err
+			}
+			return dockerclient.NewClientWithOpts(clientOpts...)
+		}
+	}
+
+	ep := docker.Endpoint{
+		EndpointMeta: docker.EndpointMeta{
+			Host: name,
+		},
+	}
+
+	clientOpts, err := ep.ClientOpts()
+	if err != nil {
+		return nil, err
+	}
+
+	return dockerclient.NewClientWithOpts(clientOpts...)
+}
+
+func getInstanceOrDefault(ctx context.Context, dockerCli command.Cli, instance, contextPathHash string) ([]build.DriverInfo, error) {
+	var defaultOnly bool
+
+	if instance == "default" && instance != dockerCli.CurrentContext() {
+		return nil, errors.Errorf("use `docker --context=default buildx` to switch to default context")
+	}
+	if instance == "default" || instance == dockerCli.CurrentContext() {
+		instance = ""
+		defaultOnly = true
+	}
+	list, err := dockerCli.ContextStore().List()
+	if err != nil {
+		return nil, err
+	}
+	for _, l := range list {
+		if l.Name == instance {
+			return nil, errors.Errorf("use `docker --context=%s buildx` to switch to context %s", instance, instance)
+		}
+	}
+
+	if instance != "" {
+		return getInstanceByName(ctx, dockerCli, instance, contextPathHash)
+	}
+	return getDefaultDrivers(ctx, dockerCli, defaultOnly, contextPathHash)
+}
+
+func getInstanceByName(ctx context.Context, dockerCli command.Cli, instance, contextPathHash string) ([]build.DriverInfo, error) {
+	txn, release, err := storeutil.GetStore(dockerCli)
+	if err != nil {
+		return nil, err
+	}
+	defer release()
+
+	ng, err := txn.NodeGroupByName(instance)
+	if err != nil {
+		return nil, err
+	}
+	return driversForNodeGroup(ctx, dockerCli, ng, contextPathHash)
+}
+
+// getDefaultDrivers returns drivers based on current cli config
+func getDefaultDrivers(ctx context.Context, dockerCli command.Cli, defaultOnly bool, contextPathHash string) ([]build.DriverInfo, error) {
+	txn, release, err := storeutil.GetStore(dockerCli)
+	if err != nil {
+		return nil, err
+	}
+	defer release()
+
+	if !defaultOnly {
+		ng, err := storeutil.GetCurrentInstance(txn, dockerCli)
+		if err != nil {
+			return nil, err
+		}
+
+		if ng != nil {
+			return driversForNodeGroup(ctx, dockerCli, ng, contextPathHash)
+		}
+	}
+
+	imageopt, err := storeutil.GetImageConfig(dockerCli, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	d, err := driver.GetDriver(ctx, "buildx_buildkit_default", nil, dockerCli.Client(), imageopt.Auth, nil, nil, nil, nil, nil, contextPathHash)
+	if err != nil {
+		return nil, err
+	}
+	return []build.DriverInfo{
+		{
+			Name:        "default",
+			Driver:      d,
+			ImageOpt:    imageopt,
+			ProxyConfig: storeutil.GetProxyConfig(dockerCli),
+		},
+	}, nil
+}
+
+func loadInfoData(ctx context.Context, d *dinfo) error {
+	if d.di.Driver == nil {
+		return nil
+	}
+	info, err := d.di.Driver.Info(ctx)
+	if err != nil {
+		return err
+	}
+	d.info = info
+	if info.Status == driver.Running {
+		c, err := d.di.Driver.Client(ctx)
+		if err != nil {
+			return err
+		}
+		workers, err := c.ListWorkers(ctx)
+		if err != nil {
+			return errors.Wrap(err, "listing workers")
+		}
+		for _, w := range workers {
+			d.platforms = append(d.platforms, w.Platforms...)
+		}
+		d.platforms = platformutil.Dedupe(d.platforms)
+	}
+	return nil
+}
+
+func loadNodeGroupData(ctx context.Context, dockerCli command.Cli, ngi *nginfo) error {
+	eg, _ := errgroup.WithContext(ctx)
+
+	dis, err := driversForNodeGroup(ctx, dockerCli, ngi.ng, "")
+	if err != nil {
+		return err
+	}
+	ngi.drivers = make([]dinfo, len(dis))
+	for i, di := range dis {
+		d := di
+		ngi.drivers[i].di = &d
+		func(d *dinfo) {
+			eg.Go(func() error {
+				if err := loadInfoData(ctx, d); err != nil {
+					d.err = err
+				}
+				return nil
+			})
+		}(&ngi.drivers[i])
+	}
+
+	if eg.Wait(); err != nil {
+		return err
+	}
+
+	kubernetesDriverCount := 0
+
+	for _, di := range ngi.drivers {
+		if di.info != nil && len(di.info.DynamicNodes) > 0 {
+			kubernetesDriverCount++
+		}
+	}
+
+	isAllKubernetesDrivers := len(ngi.drivers) == kubernetesDriverCount
+
+	if isAllKubernetesDrivers {
+		var drivers []dinfo
+		var dynamicNodes []store.Node
+
+		for _, di := range ngi.drivers {
+			// dynamic nodes are used in Kubernetes driver.
+			// Kubernetes pods are dynamically mapped to BuildKit Nodes.
+			if di.info != nil && len(di.info.DynamicNodes) > 0 {
+				for i := 0; i < len(di.info.DynamicNodes); i++ {
+					// all []dinfo share *build.DriverInfo and *driver.Info
+					diClone := di
+					if pl := di.info.DynamicNodes[i].Platforms; len(pl) > 0 {
+						diClone.platforms = pl
+					}
+					drivers = append(drivers, di)
+				}
+				dynamicNodes = append(dynamicNodes, di.info.DynamicNodes...)
+			}
+		}
+
+		// not append (remove the static nodes in the store)
+		ngi.ng.Nodes = dynamicNodes
+		ngi.drivers = drivers
+		ngi.ng.Dynamic = true
+	}
+
+	return nil
+}
+
+func dockerAPI(dockerCli command.Cli) *api {
+	return &api{dockerCli: dockerCli}
+}
+
+type api struct {
+	dockerCli command.Cli
+}
+
+func (a *api) DockerAPI(name string) (dockerclient.APIClient, error) {
+	if name == "" {
+		name = a.dockerCli.CurrentContext()
+	}
+	return clientForEndpoint(a.dockerCli, name)
+}
+
+type dinfo struct {
+	di        *build.DriverInfo
+	info      *driver.Info
+	platforms []specs.Platform
+	err       error
+}
+
+type nginfo struct {
+	ng      *store.NodeGroup
+	drivers []dinfo
+	err     error
+}
+
+// inactive checks if all nodes are inactive for this builder
+func (n *nginfo) inactive() bool {
+	for idx := range n.ng.Nodes {
+		d := n.drivers[idx]
+		if d.info != nil && d.info.Status == driver.Running {
+			return false
+		}
+	}
+	return true
+}
+
+func boot(ctx context.Context, ngi *nginfo) (bool, error) {
+	toBoot := make([]int, 0, len(ngi.drivers))
+	for i, d := range ngi.drivers {
+		if d.err != nil || d.di.Err != nil || d.di.Driver == nil || d.info == nil {
+			continue
+		}
+		if d.info.Status != driver.Running {
+			toBoot = append(toBoot, i)
+		}
+	}
+	if len(toBoot) == 0 {
+		return false, nil
+	}
+
+	printer := progress.NewPrinter(context.TODO(), os.Stderr, os.Stderr, "auto")
+
+	baseCtx := ctx
+	eg, _ := errgroup.WithContext(ctx)
+	for _, idx := range toBoot {
+		func(idx int) {
+			eg.Go(func() error {
+				pw := progress.WithPrefix(printer, ngi.ng.Nodes[idx].Name, len(toBoot) > 1)
+				_, err := driver.Boot(ctx, baseCtx, ngi.drivers[idx].di.Driver, pw)
+				if err != nil {
+					ngi.drivers[idx].err = err
+				}
+				return nil
+			})
+		}(idx)
+	}
+
+	err := eg.Wait()
+	err1 := printer.Wait()
+	if err == nil {
+		err = err1
+	}
+
+	return true, err
+}

docker-bake.hcl

@@ -1,14 +1,17 @@
 variable "GO_VERSION" {
-  default = "1.19"
+  default = "1.17"
+}
+variable "BIN_OUT" {
+  default = "./bin"
+}
+variable "RELEASE_OUT" {
+  default = "./release-out"
 }
 variable "DOCS_FORMATS" {
   default = "md"
 }
-variable "DESTDIR" {
-  default = "./bin"
-}
 
-# Special target: https://github.com/docker/metadata-action#bake-definition
+// Special target: https://github.com/docker/metadata-action#bake-definition
 target "meta-helper" {
   tags = ["docker/buildx-bin:local"]
 }
@@ -45,7 +48,6 @@ target "validate-docs" {
   inherits = ["_common"]
   args = {
     FORMATS = DOCS_FORMATS
-    BUILDX_EXPERIMENTAL = 1 // enables experimental cmds/flags for docs generation
   }
   dockerfile = "./hack/dockerfiles/docs.Dockerfile"
   target = "validate"
@@ -70,7 +72,6 @@ target "update-docs" {
   inherits = ["_common"]
   args = {
     FORMATS = DOCS_FORMATS
-    BUILDX_EXPERIMENTAL = 1 // enables experimental cmds/flags for docs generation
   }
   dockerfile = "./hack/dockerfiles/docs.Dockerfile"
   target = "update"
@@ -88,20 +89,24 @@ target "mod-outdated" {
   inherits = ["_common"]
   dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
   target = "outdated"
-  no-cache-filter = ["outdated"]
+  args = {
+    // used to invalidate cache for outdated run stage
+    // can be dropped when https://github.com/moby/buildkit/issues/1213 fixed
+    _RANDOM = uuidv4()
+  }
   output = ["type=cacheonly"]
 }
 
 target "test" {
   inherits = ["_common"]
   target = "test-coverage"
-  output = ["${DESTDIR}/coverage"]
+  output = ["./coverage"]
 }
 
 target "binaries" {
   inherits = ["_common"]
   target = "binaries"
-  output = ["${DESTDIR}/build"]
+  output = [BIN_OUT]
   platforms = ["local"]
 }
 
@@ -125,7 +130,7 @@ target "binaries-cross" {
 target "release" {
   inherits = ["binaries-cross"]
   target = "release"
-  output = ["${DESTDIR}/release"]
+  output = [RELEASE_OUT]
 }
 
 target "image" {

docs/bake-reference.md

@@ -1,818 +0,0 @@
-# Bake file reference
-
-The Bake file is a file for defining workflows that you run using `docker buildx bake`.
-
-## File format
-
-You can define your Bake file in the following file formats:
-
-- HashiCorp Configuration Language (HCL)
-- JSON
-- YAML (Compose file)
-
-By default, Bake uses the following lookup order to find the configuration file:
-
-1. `docker-bake.override.hcl`
-2. `docker-bake.hcl`
-3. `docker-bake.override.json`
-4. `docker-bake.json`
-5. `docker-compose.yaml`
-6. `docker-compose.yml`
-
-Bake searches for the file in the current working directory.
-You can specify the file location explicitly using the `--file` flag:
-
-```console
-$ docker buildx bake --file=../docker/bake.hcl --print
-```
-
-## Syntax
-
-The Bake file supports the following property types:
-
-- `target`: build targets
-- `group`: collections of build targets
-- `variable`: build arguments and variables
-- `function`: custom Bake functions
-
-You define properties as hierarchical blocks in the Bake file.
-You can assign one or more attributes to a property.
-
-The following snippet shows a JSON representation of a simple Bake file.
-This Bake file defines three properties: a variable, a group, and a target.
-
-```json
-{
-  "variable": {
-    "TAG": {
-      "default": "latest"
-    }
-  },
-  "group": {
-    "default": {
-      "targets": ["webapp"]
-    }
-  },
-  "target": {
-    "webapp": {
-      "dockerfile": "Dockerfile",
-      "tags": ["docker.io/username/webapp:${TAG}"]
-    }
-  }
-}
-```
-
-In the JSON representation of a Bake file, properties are objects,
-and attributes are values assigned to those objects.
-
-The following example shows the same Bake file in the HCL format:
-
-```hcl
-variable "TAG" {
-  "default" = "latest"
-}
-
-group "default" {
-  "targets" = ["latest"]
-}
-
-target "webapp" {
-  "dockerfile" = "Dockerfile"
-  "tags" = ["docker.io/username/webapp:${TAG}"]
-}
-```
-
-HCL is the preferred format for Bake files.
-Aside from syntactic differences,
-HCL lets you use features that the JSON and YAML formats don't support.
-
-The examples in this document use the HCL format.
-
-## Target
-
-A target reflects a single `docker build` invocation.
-Consider the following build command:
-
-```console
-$ docker build \
-  --file=Dockerfile.webapp \
-  --tag=docker.io/username/webapp:latest \
-  https://github.com/username/webapp
-```
-
-You can express this command in a Bake file as follows:
-
-```hcl
-target "webapp" {
-  dockerfile = "Dockerfile.webapp"
-  tags = ["docker.io/username/webapp:latest"]
-  context = "https://github.com/username/webapp"
-}
-```
-
-The following table shows the complete list of attributes that you can assign to a target:
-
-| Name                                            | Type    | Description                                                          |
-| ----------------------------------------------- | ------- | -------------------------------------------------------------------- |
-| [`args`](#targetargs)                           | Map     | Build arguments                                                      |
-| [`attest`](#targetattest)                       | List    | Build attestations                                                   |
-| [`cache-from`](#targetcache-from)               | List    | External cache sources                                               |
-| [`cache-to`](#targetcache-to)                   | List    | External cache destinations                                          |
-| [`context`](#targetcontext)                     | String  | Set of files located in the specified path or URL                    |
-| [`contexts`](#targetcontexts)                   | Map     | Additional build contexts                                            |
-| [`dockerfile-inline`](#targetdockerfile-inline) | String  | Inline Dockerfile string                                             |
-| [`dockerfile`](#targetdockerfile)               | String  | Dockerfile location                                                  |
-| [`inherits`](#targetinherits)                   | List    | Inherit attributes from other targets                                |
-| [`labels`](#targetlabels)                       | Map     | Metadata for images                                                  |
-| [`no-cache-filter`](#targetno-cache-filter)     | List    | Disable build cache for specific stages                              |
-| [`no-cache`](#targetno-cache)                   | Boolean | Disable build cache completely                                       |
-| [`output`](#targetoutput)                       | List    | Output destinations                                                  |
-| [`platforms`](#targetplatforms)                 | List    | Target platforms                                                     |
-| [`pull`](#targetpull)                           | Boolean | Always pull images                                                   |
-| [`secret`](#targetsecret)                       | List    | Secrets to expose to the build                                       |
-| [`ssh`](#targetssh)                             | List    | SSH agent sockets or keys to expose to the build                     |
-| [`tags`](#targettags)                           | List    | Image names and tags                                                 |
-| [`target`](#targettarget)                       | String  | Target build stage                                                   |
-
-### `target.args`
-
-Use the `args` attribute to define build arguments for the target.
-This has the same effect as passing a [`--build-arg`][build-arg] flag to the build command.
-
-```hcl
-target "default" {
-  args = {
-    VERSION = "0.0.0+unknown"
-  }
-}
-```
-
-You can set `args` attributes to use `null` values.
-Doing so forces the `target` to use the `ARG` value specified in the Dockerfile.
-
-```hcl
-variable "GO_VERSION" {
-  default = "1.20.3"
-}
-
-target "webapp" {
-  dockerfile = "webapp.Dockerfile"
-  tags = ["docker.io/username/webapp"]
-}
-
-target "db" {
-  args = {
-    GO_VERSION = null
-  }
-  dockerfile = "db.Dockerfile"
-  tags = ["docker.io/username/db"]
-}
-```
-
-### `target.attest`
-
-The `attest` attribute lets you apply [build attestations][attestations] to the target.
-This attribute accepts the long-form CSV version of attestation parameters.
-
-```hcl
-target "default" {
-  attest = [
-    "type=provenance,mode=min",
-    "type=sbom"
-  ]
-}
-```
-
-### `target.cache-from`
-
-Build cache sources.
-The builder imports cache from the locations you specify.
-It uses the [Buildx cache storage backends][cache-backends],
-and it works the same way as the [`--cache-from`][cache-from] flag.
-This takes a list value, so you can specify multiple cache sources.
-
-```hcl
-target "app" {
-  cache-from = [
-    "type=s3,region=eu-west-1,bucket=mybucket",
-    "user/repo:cache",
-  ]
-}
-```
-
-### `target.cache-to`
-
-Build cache export destinations.
-The builder exports its build cache to the locations you specify.
-It uses the [Buildx cache storage backends][cache-backends],
-and it works the same way as the [`--cache-to` flag][cache-to].
-This takes a list value, so you can specify multiple cache export targets.
-
-```hcl
-target "app" {
-  cache-to = [
-    "type=s3,region=eu-west-1,bucket=mybucket",
-    "type=inline"
-  ]
-}
-```
-
-### `target.context`
-
-Specifies the location of the build context to use for this target.
-Accepts a URL or a directory path.
-This is the same as the [build context][context] positional argument
-that you pass to the build command.
-
-```hcl
-target "app" {
-  context = "./src/www"
-}
-```
-
-This resolves to the current working directory (`"."`) by default.
-
-```console
-$ docker buildx bake --print -f - <<< 'target "default" {}'
-[+] Building 0.0s (0/0)
-{
-  "target": {
-    "default": {
-      "context": ".",
-      "dockerfile": "Dockerfile"
-    }
-  }
-}
-```
-
-### `target.contexts`
-
-Additional build contexts.
-This is the same as the [`--build-context` flag][build-context].
-This attribute takes a map, where keys result in named contexts that you can
-reference in your builds.
-
-You can specify different types of contexts, such local directories, Git URLs,
-and even other Bake targets. Bake automatically determines the type of
-a context based on the pattern of the context value.
-
-| Context type    | Example                                   |
-| --------------- | ----------------------------------------- |
-| Container image | `docker-image://alpine@sha256:0123456789` |
-| Git URL         | `https://github.com/user/proj.git`        |
-| HTTP URL        | `https://example.com/files`               |
-| Local directory | `../path/to/src`                          |
-| Bake target     | `target:base`                             |
-
-#### Pin an image version
-
-```hcl
-# docker-bake.hcl
-target "app" {
-    contexts = {
-        alpine = "docker-image://alpine:3.13"
-    }
-}
-```
-
-```Dockerfile
-# Dockerfile
-FROM alpine
-RUN echo "Hello world"
-```
-
-#### Use a local directory
-
-```hcl
-# docker-bake.hcl
-target "app" {
-    contexts = {
-        src = "../path/to/source"
-    }
-}
-```
-
-```Dockerfile
-# Dockerfile
-FROM scratch AS src
-FROM golang
-COPY --from=src . .
-```
-
-#### Use another target as base
-
-> **Note**
->
-> You should prefer to use regular multi-stage builds over this option. You can
-> Use this feature when you have multiple Dockerfiles that can't be easily
-> merged into one.
-
-```hcl
-# docker-bake.hcl
-target "base" {
-    dockerfile = "baseapp.Dockerfile"
-}
-target "app" {
-    contexts = {
-        baseapp = "target:base"
-    }
-}
-```
-
-```Dockerfile
-# Dockerfile
-FROM baseapp
-RUN echo "Hello world"
-```
-
-### `target.dockerfile-inline`
-
-Uses the string value as an inline Dockerfile for the build target.
-
-```hcl
-target "default" {
-  dockerfile-inline = "FROM alpine\nENTRYPOINT [\"echo\", \"hello\"]"
-}
-```
-
-The `dockerfile-inline` takes precedence over the `dockerfile` attribute.
-If you specify both, Bake uses the inline version.
-
-### `target.dockerfile`
-
-Name of the Dockerfile to use for the build.
-This is the same as the [`--file` flag][file] for the `docker build` command.
-
-```hcl
-target "default" {
-  dockerfile = "./src/www/Dockerfile"
-}
-```
-
-Resolves to `"Dockerfile"` by default.
-
-```console
-$ docker buildx bake --print -f - <<< 'target "default" {}'
-[+] Building 0.0s (0/0)
-{
-  "target": {
-    "default": {
-      "context": ".",
-      "dockerfile": "Dockerfile"
-    }
-  }
-}
-```
-
-### `target.inherits`
-
-A target can inherit attributes from other targets.
-Use `inherits` to reference from one target to another.
-
-In the following example,
-the `app-dev` target specifies an image name and tag.
-The `app-release` target uses `inherits` to reuse the tag name.
-
-```hcl
-variable "TAG" {
-  default = "latest"
-}
-
-target "app-dev" {
-  tags = ["docker.io/username/myapp:${TAG}"]
-}
-
-target "app-release" {
-  inherits = ["app-dev"]
-  platforms = ["linux/amd64", "linux/arm64"]
-}
-```
-
-The `inherits` attribute is a list,
-meaning you can reuse attributes from multiple other targets.
-In the following example, the `app-release` target reuses attributes
-from both the `app-dev` and `_release` targets.
-
-```hcl
-target "app-dev" {
-  args = {
-    GO_VERSION = "1.20"
-    BUILDX_EXPERIMENTAL = 1
-  }
-  tags = ["docker.io/username/myapp"]
-  dockerfile = "app.Dockerfile"
-  labels = {
-    "org.opencontainers.image.source" = "https://github.com/username/myapp"
-  }
-}
-
-target "_release" {
-  args = {
-    BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1
-    BUILDX_EXPERIMENTAL = 0
-  }
-}
-
-target "app-release" {
-  inherits = ["app-dev", "_release"]
-  platforms = ["linux/amd64", "linux/arm64"]
-}
-```
-
-When inheriting attributes from multiple targets and there's a conflict,
-the target that appears last in the `inherits` list takes precedence.
-The previous example defines the `BUILDX_EXPERIMENTAL` argument twice for the `app-release` target.
-It resolves to `0` because the `_release` target appears last in the inheritance chain:
-
-```console
-$ docker buildx bake --print app-release
-[+] Building 0.0s (0/0)
-{
-  "group": {
-    "default": {
-      "targets": [
-        "app-release"
-      ]
-    }
-  },
-  "target": {
-    "app-release": {
-      "context": ".",
-      "dockerfile": "app.Dockerfile",
-      "args": {
-        "BUILDKIT_CONTEXT_KEEP_GIT_DIR": "1",
-        "BUILDX_EXPERIMENTAL": "0",
-        "GO_VERSION": "1.20"
-      },
-      "labels": {
-        "org.opencontainers.image.source": "https://github.com/username/myapp"
-      },
-      "tags": [
-        "docker.io/username/myapp"
-      ],
-      "platforms": [
-        "linux/amd64",
-        "linux/arm64"
-      ]
-    }
-  }
-}
-```
-
-### `target.labels`
-
-Assigns image labels to the build.
-This is the same as the `--label` flag for `docker build`.
-
-```hcl
-target "default" {
-  labels = {
-    "org.opencontainers.image.source" = "https://github.com/username/myapp"
-    "com.docker.image.source.entrypoint" = "Dockerfile"
-  }
-}
-```
-
-It's possible to use a `null` value for labels.
-If you do, the builder uses the label value specified in the Dockerfile.
-
-### `target.no-cache-filter`
-
-Don't use build cache for the specified stages.
-This is the same as the `--no-cache-filter` flag for `docker build`.
-The following example avoids build cache for the `foo` build stage.
-
-```hcl
-target "default" {
-  no-cache-filter = ["foo"]
-}
-```
-
-### `target.no-cache`
-
-Don't use cache when building the image.
-This is the same as the `--no-cache` flag for `docker build`.
-
-```hcl
-target "default" {
-  no-cache = 1
-}
-```
-
-### `target.output`
-
-Configuration for exporting the build output.
-This is the same as the [`--output` flag][output].
-The following example configures the target to use a cache-only output,
-
-```hcl
-target "default" {
-  output = ["type=cacheonly"]
-}
-```
-
-### `target.platforms`
-
-Set target platforms for the build target.
-This is the same as the [`--platform` flag][platform].
-The following example creates a multi-platform build for three architectures.
-
-```hcl
-target "default" {
-  platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"]
-}
-```
-
-### `target.pull`
-
-Configures whether the builder should attempt to pull images when building the target.
-This is the same as the `--pull` flag for `docker build`.
-The following example forces the builder to always pull all images referenced in the build target.
-
-```hcl
-target "default" {
-  pull = "always"
-}
-```
-
-### `target.secret`
-
-Defines secrets to expose to the build target.
-This is the same as the [`--secret` flag][secret].
-
-```hcl
-variable "HOME" {
-  default = null
-}
-
-target "default" {
-  secret = [
-    "type=env,id=KUBECONFIG",
-    "type=file,id=aws,src=${HOME}/.aws/credentials"
-  ]
-}
-```
-
-This lets you [mount the secret][run_mount_secret] in your Dockerfile.
-
-```dockerfile
-RUN --mount=type=secret,id=aws,target=/root/.aws/credentials \
-    aws cloudfront create-invalidation ...
-RUN --mount=type=secret,id=KUBECONFIG \
-    KUBECONFIG=$(cat /run/secrets/KUBECONFIG) helm upgrade --install
-```
-
-### `target.ssh`
-
-Defines SSH agent sockets or keys to expose to the build.
-This is the same as the [`--ssh` flag][ssh].
-This can be useful if you need to access private repositories during a build.
-
-```hcl
-target "default" {
-  ssh = ["default"]
-}
-```
-
-```dockerfile
-FROM alpine
-RUN --mount=type=ssh \
-    apk add git openssh-client \
-    && install -m 0700 -d ~/.ssh \
-    && ssh-keyscan github.com >> ~/.ssh/known_hosts \
-    && git clone git@github.com:user/my-private-repo.git
-```
-
-### `target.tags`
-
-Image names and tags to use for the build target.
-This is the same as the [`--tag` flag][tag].
-
-```hcl
-target "default" {
-  tags = [
-    "org/repo:latest",
-    "myregistry.azurecr.io/team/image:v1"
-  ]
-}
-```
-
-### `target.target`
-
-Set the target build stage to build.
-This is the same as the [`--target` flag][target].
-
-```hcl
-target "default" {
-  target = "binaries"
-}
-```
-
-## Group
-
-Groups allow you to invoke multiple builds (targets) at once.
-
-```hcl
-group "default" {
-  targets = ["db", "webapp-dev"]
-}
-
-target "webapp-dev" {
-  dockerfile = "Dockerfile.webapp"
-  tags = ["docker.io/username/webapp:latest"]
-}
-
-target "db" {
-  dockerfile = "Dockerfile.db"
-  tags = ["docker.io/username/db"]
-}
-```
-
-Groups take precedence over targets, if both exist with the same name.
-The following bake file builds the `default` group.
-Bake ignores the `default` target.
-
-```hcl
-target "default" {
-  dockerfile-inline = "FROM ubuntu"
-}
-
-group "default" {
-  targets = ["alpine", "debian"]
-}
-target "alpine" {
-  dockerfile-inline = "FROM alpine"
-}
-target "debian" {
-  dockerfile-inline = "FROM debian"
-}
-```
-
-## Variable
-
-The HCL file format supports variable block definitions.
-You can use variables as build arguments in your Dockerfile,
-or interpolate them in attribute values in your Bake file.
-
-```hcl
-variable "TAG" {
-  default = "latest"
-}
-
-target "webapp-dev" {
-  dockerfile = "Dockerfile.webapp"
-  tags = ["docker.io/username/webapp:${TAG}"]
-}
-```
-
-You can assign a default value for a variable in the Bake file,
-or assign a `null` value to it. If you assign a `null` value,
-Buildx uses the default value from the Dockerfile instead.
-
-You can override variable defaults set in the Bake file using environment variables.
-The following example sets the `TAG` variable to `dev`,
-overriding the default `latest` value shown in the previous example.
-
-```console
-$ TAG=dev docker buildx bake webapp-dev
-```
-
-### Built-in variables
-
-The following variables are built-ins that you can use with Bake without having
-to define them.
-
-| Variable              | Description                                                                         |
-| --------------------- | ----------------------------------------------------------------------------------- |
-| `BAKE_CMD_CONTEXT`    | Holds the main context when building using a remote Bake file.                      |
-| `BAKE_LOCAL_PLATFORM` | Returns the current platform’s default platform specification (e.g. `linux/amd64`). |
-
-### Use environment variable as default
-
-You can set a Bake variable to use the value of an environment variable as a default value:
-
-```hcl
-variable "HOME" {
-  default = "$HOME"
-}
-```
-
-### Interpolate variables into attributes
-
-To interpolate a variable into an attribute string value,
-you must use curly brackets.
-The following doesn't work:
-
-```hcl
-variable "HOME" {
-  default = "$HOME"
-}
-
-target "default" {
-  ssh = ["default=$HOME/.ssh/id_rsa"]
-}
-```
-
-Wrap the variable in curly brackets where you want to insert it:
-
-```diff
-  variable "HOME" {
-    default = "$HOME"
-  }
-
-  target "default" {
--   ssh = ["default=$HOME/.ssh/id_rsa"]
-+   ssh = ["default=${HOME}/.ssh/id_rsa"]
-  }
-```
-
-Before you can interpolate a variable into an attribute,
-first you must declare it in the bake file,
-as demonstrated in the following example.
-
-```console
-$ cat docker-bake.hcl
-target "default" {
-  dockerfile-inline = "FROM ${BASE_IMAGE}"
-}
-$ docker buildx bake
-[+] Building 0.0s (0/0)
-docker-bake.hcl:2
---------------------
-   1 |     target "default" {
-   2 | >>>   dockerfile-inline = "FROM ${BASE_IMAGE}"
-   3 |     }
-   4 |
---------------------
-ERROR: docker-bake.hcl:2,31-41: Unknown variable; There is no variable named "BASE_IMAGE"., and 1 other diagnostic(s)
-$ cat >> docker-bake.hcl
-
-variable "BASE_IMAGE" {
-  default = "alpine"
-}
-
-$ docker buildx bake
-[+] Building 0.6s (5/5) FINISHED
-```
-
-## Function
-
-A [set of general-purpose functions][bake_stdlib]
-provided by [go-cty][go-cty]
-are available for use in HCL files:
-
-```hcl
-# docker-bake.hcl
-target "webapp-dev" {
-  dockerfile = "Dockerfile.webapp"
-  tags = ["docker.io/username/webapp:latest"]
-  args = {
-    buildno = "${add(123, 1)}"
-  }
-}
-```
-
-In addition, [user defined functions][userfunc]
-are also supported:
-
-```hcl
-# docker-bake.hcl
-function "increment" {
-  params = [number]
-  result = number + 1
-}
-
-target "webapp-dev" {
-  dockerfile = "Dockerfile.webapp"
-  tags = ["docker.io/username/webapp:latest"]
-  args = {
-    buildno = "${increment(123)}"
-  }
-}
-```
-
-> **Note**
->
-> See [User defined HCL functions][hcl-funcs] page for more details.
-
-<!-- external links -->
-
-[attestations]: https://docs.docker.com/build/attestations/
-[bake_stdlib]: https://github.com/docker/buildx/blob/master/bake/hclparser/stdlib.go
-[build-arg]: https://docs.docker.com/engine/reference/commandline/build/#build-arg
-[build-context]: https://docs.docker.com/engine/reference/commandline/buildx_build/#build-context
-[cache-backends]: https://docs.docker.com/build/cache/backends/
-[cache-from]: https://docs.docker.com/engine/reference/commandline/buildx_build/#cache-from
-[cache-to]: https://docs.docker.com/engine/reference/commandline/buildx_build/#cache-to
-[context]: https://docs.docker.com/engine/reference/commandline/buildx_build/#build-context
-[file]: https://docs.docker.com/engine/reference/commandline/build/#file
-[go-cty]: https://github.com/zclconf/go-cty/tree/main/cty/function/stdlib
-[hcl-funcs]: https://docs.docker.com/build/bake/hcl-funcs/
-[output]: https://docs.docker.com/engine/reference/commandline/buildx_build/#output
-[platform]: https://docs.docker.com/engine/reference/commandline/buildx_build/#platform
-[run_mount_secret]: https://docs.docker.com/engine/reference/builder/#run---mounttypesecret
-[secret]: https://docs.docker.com/engine/reference/commandline/buildx_build/#secret
-[ssh]: https://docs.docker.com/engine/reference/commandline/buildx_build/#ssh
-[tag]: https://docs.docker.com/engine/reference/commandline/build/#tag
-[target]: https://docs.docker.com/engine/reference/commandline/build/#target
-[userfunc]: https://github.com/hashicorp/hcl/tree/main/ext/userfunc

docs/generate.go

@@ -16,7 +16,6 @@ import (
 	_ "github.com/docker/buildx/driver/docker"
 	_ "github.com/docker/buildx/driver/docker-container"
 	_ "github.com/docker/buildx/driver/kubernetes"
-	_ "github.com/docker/buildx/driver/remote"
 )
 
 const defaultSourcePath = "docs/reference/"

docs/guides/cicd.md

@@ -19,13 +19,13 @@ jobs:
     steps:
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2 
+        uses: docker/login-action@v1 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -40,7 +40,7 @@ jobs:
 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).
+default the `docker-container` [builder driver](../reference/buildx_create.md#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.

docs/guides/cni-networking.md

@@ -11,7 +11,7 @@ Now build this image:
 $ docker buildx build --tag buildkit-cni:local --load .
 ```
 
-Then [create a `docker-container` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/) that
+Then [create a `docker-container` builder](../reference/buildx_create.md) that
 will use this image:
 
 ```console

docs/guides/color-output.md

@@ -1,20 +0,0 @@
-# Color output controls
-
-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).

docs/guides/custom-network.md

@@ -7,8 +7,8 @@ named `foonet`:
 $ 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:
+[Create a `docker-container` builder](../reference/buildx_create.md) named
+`mybuilder` that will use this network:
 
 ```console
 $ docker buildx create --use \
@@ -17,7 +17,7 @@ $ docker buildx create --use \
   --driver-opt "network=foonet"
 ```
 
-Boot and [inspect `mybuilder`](https://docs.docker.com/engine/reference/commandline/buildx_inspect/):
+Boot and [inspect `mybuilder`](../reference/buildx_inspect.md):
 
 ```console
 $ docker buildx inspect --bootstrap
@@ -26,9 +26,23 @@ $ 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 %}
+
+## What's `buildx_buildkit_mybuilder0`?
+
+`buildx_buildkit_mybuilder0` is the container name. It can be broken down like this:
+
+* `buildx_buildkit_` is a hardcoded prefix
+* `mybuilder0` is the name of the node (defaults to builder name + position in the list of nodes)
+
+```console
+$ docker buildx ls
+NAME/NODE     DRIVER/ENDPOINT                        STATUS                 PLATFORMS
+mybuilder *   docker-container
+  mybuilder0  unix:///var/run/docker.sock            running                linux/amd64, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/mips64le, linux/mips64, linux/arm/v7, linux/arm/v6     
+default       docker
+  default     default                                running                linux/amd64, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6
+```

docs/guides/custom-registry-config.md

@@ -1,6 +1,6 @@
 # Using a custom registry configuration
 
-If you [create a `docker-container` or `kubernetes` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/) and
+If you [create a `docker-container` or `kubernetes` builder](../reference/buildx_create.md) 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.
@@ -8,8 +8,7 @@ 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
+```toml"
 debug = true
 [registry."myregistry.com"]
   ca=["/etc/certs/myregistry.pem"]
@@ -17,10 +16,11 @@ debug = true
     key="/etc/certs/myregistry_key.pem"
     cert="/etc/certs/myregistry_cert.pem"
 ```
+> `/etc/buildkitd.toml`
 
 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/)
+Now [create a `docker-container` builder](../reference/buildx_create.md)
 that will use this BuildKit configuration:
 
 ```console

docs/guides/opentelemetry.md

@@ -9,7 +9,7 @@ First create a Jaeger container:
 $ 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/)
+Then [create a `docker-container` builder](../reference/buildx_create.md)
 that will use the Jaeger instance via the `JAEGER_TRACE` env var:
 
 ```console
@@ -20,7 +20,7 @@ $ docker buildx create --use \
   --driver-opt "env.JAEGER_TRACE=localhost:6831"
 ```
 
-Boot and [inspect `mybuilder`](https://docs.docker.com/engine/reference/commandline/buildx_inspect/):
+Boot and [inspect `mybuilder`](../reference/buildx_inspect.md):
 
 ```console
 $ docker buildx inspect --bootstrap
@@ -28,4 +28,4 @@ $ 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)
+![](https://user-images.githubusercontent.com/1951866/124468052-ef085400-dd98-11eb-84ab-7ac8e261dd52.png)

docs/guides/registry-mirror.md

@@ -1,21 +1,19 @@
 # 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).
+while creating a builder with the [`--config` flags](../reference/buildx_create.md#config).
 
 ```toml
-# /etc/buildkitd.toml
 debug = true
 [registry."docker.io"]
   mirrors = ["mirror.gcr.io"]
 ```
+> `/etc/buildkitd.toml`
 
-> **Note**
->
-> `debug = true` has been added to be able to debug requests
-> in the BuildKit daemon and see if the mirror is effectively used.
+> :information_source: `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/)
+Then [create a `docker-container` builder](../reference/buildx_create.md)
 that will use this BuildKit configuration:
 
 ```console
@@ -25,7 +23,7 @@ $ docker buildx create --use \
   --config /etc/buildkitd.toml
 ```
 
-Boot and [inspect `mybuilder`](https://docs.docker.com/engine/reference/commandline/buildx_inspect/):
+Boot and [inspect `mybuilder`](../reference/buildx_inspect.md):
 
 ```console
 $ docker buildx inspect --bootstrap

docs/guides/resource-limiting.md

@@ -4,15 +4,15 @@
 
 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).
+while creating a builder with the [`--config` flags](../reference/buildx_create.md#config).
 
 ```toml
-# /etc/buildkitd.toml
 [worker.oci]
   max-parallelism = 4
 ```
+> `/etc/buildkitd.toml`
 
-Now you can [create a `docker-container` builder](https://docs.docker.com/engine/reference/commandline/buildx_create/)
+Now you can [create a `docker-container` builder](../reference/buildx_create.md)
 that will use this BuildKit configuration to limit parallelism.
 
 ```console

docs/manuals/README.md

@@ -1,14 +0,0 @@
-# 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!

docs/manuals/bake/build-contexts.md

@@ -1,3 +0,0 @@
-# Defining additional build contexts and linking targets
-
-Moved to [docs.docker.com](https://docs.docker.com/build/bake/build-contexts)

docs/manuals/bake/compose-file.md

@@ -1,3 +0,0 @@
-# Building from Compose file
-
-Moved to [docs.docker.com](https://docs.docker.com/build/bake/compose-file)

docs/manuals/bake/configuring-build.md

@@ -1,3 +0,0 @@
-# Configuring builds
-
-Moved to [docs.docker.com](https://docs.docker.com/build/bake/configuring-build)

docs/manuals/bake/file-definition.md

@@ -1,3 +0,0 @@
-# Bake file definition
-
-This page has moved to [docs/bake-reference.md](../../bake-reference.md)

docs/manuals/bake/hcl-funcs.md

@@ -1,3 +0,0 @@
-# User defined HCL functions
-
-Moved to [docs.docker.com](https://docs.docker.com/build/bake/hcl-funcs)

docs/manuals/bake/index.md

@@ -1,3 +0,0 @@
-# High-level build options with Bake
-
-Moved to [docs.docker.com](https://docs.docker.com/build/bake)

docs/manuals/cache/backends/azblob.md

@@ -1,3 +0,0 @@
-# Azure Blob Storage cache storage
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends/azblob)

docs/manuals/cache/backends/gha.md

@@ -1,3 +0,0 @@
-# GitHub Actions cache storage
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends/gha)

docs/manuals/cache/backends/index.md

@@ -1,3 +0,0 @@
-# Cache storage backends
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends)

docs/manuals/cache/backends/inline.md

@@ -1,3 +0,0 @@
-# Inline cache storage
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends/inline)

docs/manuals/cache/backends/local.md

@@ -1,3 +0,0 @@
-# Local cache storage
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends/local)

docs/manuals/cache/backends/registry.md

@@ -1,3 +0,0 @@
-# Registry cache storage
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends/registry)

docs/manuals/cache/backends/s3.md

@@ -1,3 +0,0 @@
-# Amazon S3 cache storage
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/cache/backends/s3)

docs/manuals/drivers/docker-container.md

@@ -1,3 +0,0 @@
-# Docker container driver
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/drivers/docker-container)

docs/manuals/drivers/docker.md

@@ -1,3 +0,0 @@
-# Docker driver
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/drivers/docker)

docs/manuals/drivers/index.md

@@ -1,3 +0,0 @@
-# Buildx drivers overview
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/drivers)

docs/manuals/drivers/kubernetes.md

@@ -1,3 +0,0 @@
-# Kubernetes driver
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/drivers/kubernetes)

docs/manuals/drivers/remote.md

@@ -1,3 +0,0 @@
-# Remote driver
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/drivers/remote)

docs/manuals/exporters/image-registry.md

@@ -1,3 +0,0 @@
-# Image and registry exporters
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/exporters/image-registry)

docs/manuals/exporters/index.md

@@ -1,3 +0,0 @@
-# Exporters overview
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/exporters)

docs/manuals/exporters/local-tar.md

@@ -1,3 +0,0 @@
-# Local and tar exporters
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/exporters/local-tar)

docs/manuals/exporters/oci-docker.md

@@ -1,3 +0,0 @@
-# OCI and Docker exporters
-
-Moved to [docs.docker.com](https://docs.docker.com/build/building/exporters/oci-docker)

docs/reference/buildx.md

@@ -9,29 +9,29 @@ Extended build capabilities with BuildKit
 
 ### Subcommands
 
-| Name                                 | Description                                |
-|:-------------------------------------|:-------------------------------------------|
-| [`bake`](buildx_bake.md)             | Build from a file                          |
-| [`build`](buildx_build.md)           | Start a build                              |
-| [`create`](buildx_create.md)         | Create a new builder instance              |
-| [`du`](buildx_du.md)                 | Disk usage                                 |
-| [`imagetools`](buildx_imagetools.md) | Commands to work on images in registry     |
-| [`inspect`](buildx_inspect.md)       | Inspect current builder instance           |
-| [`install`](buildx_install.md)       | Install buildx as a 'docker builder' alias |
-| [`ls`](buildx_ls.md)                 | List builder instances                     |
-| [`prune`](buildx_prune.md)           | Remove build cache                         |
-| [`rm`](buildx_rm.md)                 | Remove a builder instance                  |
-| [`stop`](buildx_stop.md)             | Stop builder instance                      |
-| [`uninstall`](buildx_uninstall.md)   | Uninstall the 'docker builder' alias       |
-| [`use`](buildx_use.md)               | Set the current builder instance           |
-| [`version`](buildx_version.md)       | Show buildx version information            |
+| Name | Description |
+| --- | --- |
+| [`bake`](buildx_bake.md) | Build from a file |
+| [`build`](buildx_build.md) | Start a build |
+| [`create`](buildx_create.md) | Create a new builder instance |
+| [`du`](buildx_du.md) | Disk usage |
+| [`imagetools`](buildx_imagetools.md) | Commands to work on images in registry |
+| [`inspect`](buildx_inspect.md) | Inspect current builder instance |
+| [`install`](buildx_install.md) | Install buildx as a 'docker builder' alias |
+| [`ls`](buildx_ls.md) | List builder instances |
+| [`prune`](buildx_prune.md) | Remove build cache |
+| [`rm`](buildx_rm.md) | Remove a builder instance |
+| [`stop`](buildx_stop.md) | Stop builder instance |
+| [`uninstall`](buildx_uninstall.md) | Uninstall the 'docker builder' alias |
+| [`use`](buildx_use.md) | Set the current builder instance |
+| [`version`](buildx_version.md) | Show buildx version information |
 
 
 ### Options
 
-| Name                    | Type     | Default | Description                              |
-|:------------------------|:---------|:--------|:-----------------------------------------|
-| [`--builder`](#builder) | `string` |         | Override the configured builder instance |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_build.md

@@ -9,52 +9,44 @@ Start a build
 
 ### Aliases
 
-`docker buildx build`, `docker buildx b`
+`build`, `b`
 
 ### Options
 
-| Name                                                                                                                                                   | Type          | Default   | Description                                                                                         |
-|:-------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------|:----------|:----------------------------------------------------------------------------------------------------|
-| [`--add-host`](https://docs.docker.com/engine/reference/commandline/build/#add-host)                                                                   | `stringSlice` |           | Add a custom host-to-IP mapping (format: `host:ip`)                                                 |
-| [`--allow`](#allow)                                                                                                                                    | `stringSlice` |           | Allow extra privileged entitlement (e.g., `network.host`, `security.insecure`)                      |
-| [`--attest`](#attest)                                                                                                                                  | `stringArray` |           | Attestation parameters (format: `type=sbom,generator=image`)                                        |
-| [`--build-arg`](#build-arg)                                                                                                                            | `stringArray` |           | Set build-time variables                                                                            |
-| [`--build-context`](#build-context)                                                                                                                    | `stringArray` |           | Additional build contexts (e.g., name=path)                                                         |
-| [`--builder`](#builder)                                                                                                                                | `string`      |           | Override the configured builder instance                                                            |
-| [`--cache-from`](#cache-from)                                                                                                                          | `stringArray` |           | External cache sources (e.g., `user/app:cache`, `type=local,src=path/to/dir`)                       |
-| [`--cache-to`](#cache-to)                                                                                                                              | `stringArray` |           | Cache export destinations (e.g., `user/app:cache`, `type=local,dest=path/to/dir`)                   |
-| [`--cgroup-parent`](https://docs.docker.com/engine/reference/commandline/build/#cgroup-parent)                                                         | `string`      |           | Optional parent cgroup for the container                                                            |
-| [`-f`](https://docs.docker.com/engine/reference/commandline/build/#file), [`--file`](https://docs.docker.com/engine/reference/commandline/build/#file) | `string`      |           | Name of the Dockerfile (default: `PATH/Dockerfile`)                                                 |
-| `--iidfile`                                                                                                                                            | `string`      |           | Write the image ID to the file                                                                      |
-| `--invoke`                                                                                                                                             | `string`      |           | Invoke a command after the build [experimental]                                                     |
-| `--label`                                                                                                                                              | `stringArray` |           | Set metadata for an image                                                                           |
-| [`--load`](#load)                                                                                                                                      |               |           | Shorthand for `--output=type=docker`                                                                |
-| [`--metadata-file`](#metadata-file)                                                                                                                    | `string`      |           | Write build result metadata to the file                                                             |
-| `--network`                                                                                                                                            | `string`      | `default` | Set the networking mode for the `RUN` instructions during build                                     |
-| `--no-cache`                                                                                                                                           |               |           | Do not use cache when building the image                                                            |
-| `--no-cache-filter`                                                                                                                                    | `stringArray` |           | Do not cache specified stages                                                                       |
-| [`-o`](#output), [`--output`](#output)                                                                                                                 | `stringArray` |           | Output destination (format: `type=local,dest=path`)                                                 |
-| [`--platform`](#platform)                                                                                                                              | `stringArray` |           | Set target platform for build                                                                       |
-| `--print`                                                                                                                                              | `string`      |           | Print result of information request (e.g., outline, targets) [experimental]                         |
-| [`--progress`](#progress)                                                                                                                              | `string`      | `auto`    | Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output            |
-| [`--provenance`](#provenance)                                                                                                                          | `string`      |           | Shortand for `--attest=type=provenance`                                                             |
-| `--pull`                                                                                                                                               |               |           | Always attempt to pull all referenced images                                                        |
-| [`--push`](#push)                                                                                                                                      |               |           | Shorthand for `--output=type=registry`                                                              |
-| `-q`, `--quiet`                                                                                                                                        |               |           | Suppress the build output and print image ID on success                                             |
-| [`--sbom`](#sbom)                                                                                                                                      | `string`      |           | Shorthand for `--attest=type=sbom`                                                                  |
-| [`--secret`](#secret)                                                                                                                                  | `stringArray` |           | Secret to expose to the build (format: `id=mysecret[,src=/local/secret]`)                           |
-| [`--shm-size`](#shm-size)                                                                                                                              | `bytes`       | `0`       | Size of `/dev/shm`                                                                                  |
-| [`--ssh`](#ssh)                                                                                                                                        | `stringArray` |           | SSH agent socket or keys to expose to the build (format: `default\|<id>[=<socket>\|<key>[,<key>]]`) |
-| [`-t`](https://docs.docker.com/engine/reference/commandline/build/#tag), [`--tag`](https://docs.docker.com/engine/reference/commandline/build/#tag)    | `stringArray` |           | Name and optionally a tag (format: `name:tag`)                                                      |
-| [`--target`](https://docs.docker.com/engine/reference/commandline/build/#target)                                                                       | `string`      |           | Set the target build stage to build                                                                 |
-| [`--ulimit`](#ulimit)                                                                                                                                  | `ulimit`      |           | Ulimit options                                                                                      |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--add-host`](https://docs.docker.com/engine/reference/commandline/build/#add-entries-to-container-hosts-file---add-host) | `stringSlice` |  | Add a custom host-to-IP mapping (format: `host:ip`) |
+| [`--allow`](#allow) | `stringSlice` |  | Allow extra privileged entitlement (e.g., `network.host`, `security.insecure`) |
+| [`--build-arg`](#build-arg) | `stringArray` |  | Set build-time variables |
+| [`--build-context`](#build-context) | `stringArray` |  | Additional build contexts (e.g., name=path) |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`--cache-from`](#cache-from) | `stringArray` |  | External cache sources (e.g., `user/app:cache`, `type=local,src=path/to/dir`) |
+| [`--cache-to`](#cache-to) | `stringArray` |  | Cache export destinations (e.g., `user/app:cache`, `type=local,dest=path/to/dir`) |
+| [`--cgroup-parent`](https://docs.docker.com/engine/reference/commandline/build/#use-a-custom-parent-cgroup---cgroup-parent) | `string` |  | Optional parent cgroup for the container |
+| [`-f`](https://docs.docker.com/engine/reference/commandline/build/#specify-a-dockerfile--f), [`--file`](https://docs.docker.com/engine/reference/commandline/build/#specify-a-dockerfile--f) | `string` |  | Name of the Dockerfile (default: `PATH/Dockerfile`) |
+| `--iidfile` | `string` |  | Write the image ID to the file |
+| `--label` | `stringArray` |  | Set metadata for an image |
+| [`--load`](#load) |  |  | Shorthand for `--output=type=docker` |
+| [`--metadata-file`](#metadata-file) | `string` |  | Write build result metadata to the file |
+| `--network` | `string` | `default` | Set the networking mode for the `RUN` instructions during build |
+| `--no-cache` |  |  | Do not use cache when building the image |
+| `--no-cache-filter` | `stringArray` |  | Do not cache specified stages |
+| [`-o`](#output), [`--output`](#output) | `stringArray` |  | Output destination (format: `type=local,dest=path`) |
+| [`--platform`](#platform) | `stringArray` |  | Set target platform for build |
+| [`--progress`](#progress) | `string` | `auto` | Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output |
+| `--pull` |  |  | Always attempt to pull all referenced images |
+| [`--push`](#push) |  |  | Shorthand for `--output=type=registry` |
+| `-q`, `--quiet` |  |  | Suppress the build output and print image ID on success |
+| [`--secret`](#secret) | `stringArray` |  | Secret to expose to the build (format: `id=mysecret[,src=/local/secret]`) |
+| [`--shm-size`](#shm-size) | `bytes` | `0` | Size of `/dev/shm` |
+| [`--ssh`](#ssh) | `stringArray` |  | SSH agent socket or keys to expose to the build (format: `default\|<id>[=<socket>\|<key>[,<key>]]`) |
+| [`-t`](https://docs.docker.com/engine/reference/commandline/build/#tag-an-image--t), [`--tag`](https://docs.docker.com/engine/reference/commandline/build/#tag-an-image--t) | `stringArray` |  | Name and optionally a tag (format: `name:tag`) |
+| [`--target`](https://docs.docker.com/engine/reference/commandline/build/#specifying-target-build-stage---target) | `string` |  | Set the target build stage to build |
+| [`--ulimit`](#ulimit) | `ulimit` |  | Ulimit options |
 
 
 <!---MARKER_GEN_END-->
 
-Flags marked with `[experimental]` need to be explicitly enabled by setting the
-`BUILDX_EXPERIMENTAL=1` environment variable.
-
 ## Description
 
 The `buildx build` command starts a build using BuildKit. This command is similar
@@ -66,33 +58,6 @@ here we'll document a subset of the new flags.
 
 ## Examples
 
-### <a name="attest"></a> Create attestations (--attest)
-
-```
---attest=type=sbom,...
---attest=type=provenance,...
-```
-
-Create [image attestations](https://docs.docker.com/build/attestations/).
-BuildKit currently supports:
-
-- `sbom` - Software Bill of Materials.
-
-  Use `--attest=type=sbom` to generate an SBOM for an image at build-time.
-  Alternatively, you can use the [`--sbom` shorthand](#sbom).
-
-  For more information, see [here](https://docs.docker.com/build/attestations/sbom/).
-
-- `provenance` - SLSA Provenance
-
-  Use `--attest=type=provenance` to generate provenance for an image at
-  build-time. Alternatively, you can use the [`--provenance` shorthand](#provenance).
-
-  By default, a minimal provenance attestation will be created for the build
-  result, which will only be attached for images pushed to registries.
-
-  For more information, see [here](https://docs.docker.com/build/attestations/slsa-provenance/).
-
 ### <a name="allow"></a> Allow extra privileged entitlement (--allow)
 
 ```
@@ -103,7 +68,7 @@ Allow extra privileged entitlement. List of entitlements:
 
 - `network.host` - Allows executions with host networking.
 - `security.insecure` - Allows executions without sandbox. See
-  [related Dockerfile extensions](https://docs.docker.com/engine/reference/builder/#run---securitysandbox).
+  [related Dockerfile extensions](https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/experimental.md#run---securityinsecuresandbox).
 
 For entitlements to be enabled, the `buildkitd` daemon also needs to allow them
 with `--allow-insecure-entitlement` (see [`create --buildkitd-flags`](buildx_create.md#buildkitd-flags))
@@ -117,22 +82,20 @@ $ docker buildx build --allow security.insecure .
 
 ### <a name="build-arg"></a> Set build-time variables (--build-arg)
 
-Same as [`docker build` command](https://docs.docker.com/engine/reference/commandline/build/#build-arg).
+Same as [`docker build` command](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg).
 
 There are also useful built-in build args like:
 
 * `BUILDKIT_CONTEXT_KEEP_GIT_DIR=<bool>` trigger git context to keep the `.git` directory
 * `BUILDKIT_INLINE_BUILDINFO_ATTRS=<bool>` inline build info attributes in image config or not
 * `BUILDKIT_INLINE_CACHE=<bool>` inline cache metadata to image config or not
-* `BUILDKIT_MULTI_PLATFORM=<bool>` opt into deterministic output regardless of multi-platform output or not
+* `BUILDKIT_MULTI_PLATFORM=<bool>` opt into determnistic output regardless of multi-platform output or not
 
 ```console
 $ docker buildx build --build-arg BUILDKIT_MULTI_PLATFORM=1 .
 ```
 
-> **Note**
->
-> More built-in build args can be found in [Dockerfile reference docs](https://docs.docker.com/engine/reference/builder/#buildkit-built-in-build-args).
+More built-in build args can be found in [dockerfile frontend docs](https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/syntax.md#built-in-build-args).
 
 ### <a name="build-context"></a> Additional build contexts (--build-context)
 
@@ -143,7 +106,7 @@ $ docker buildx build --build-arg BUILDKIT_MULTI_PLATFORM=1 .
 Define additional build context with specified contents. In Dockerfile the context can be accessed when `FROM name` or `--from=name` is used.
 When Dockerfile defines a stage with the same name it is overwritten.
 
-The value can be a local source directory, [local OCI layout compliant directory](https://github.com/opencontainers/image-spec/blob/main/image-layout.md), container image (with docker-image:// prefix), Git or HTTP URL.
+The value can be a local source directory, container image (with docker-image:// prefix), Git or HTTP URL.
 
 Replace `alpine:latest` with a pinned one:
 
@@ -158,34 +121,11 @@ $ docker buildx build --build-context project=path/to/project/source .
 # docker buildx build --build-context project=https://github.com/myuser/project.git .
 ```
 
-```dockerfile
-# syntax=docker/dockerfile:1
+```Dockerfile
 FROM alpine
 COPY --from=project myfile /
 ```
 
-#### <a name="source-oci-layout"></a> Source image from OCI layout directory
-
-Source an image from a local [OCI layout compliant directory](https://github.com/opencontainers/image-spec/blob/main/image-layout.md),
-either by tag, or by digest:
-
-```console
-$ docker buildx build --build-context foo=oci-layout:///path/to/local/layout:<tag>
-$ docker buildx build --build-context foo=oci-layout:///path/to/local/layout@sha256:<digest>
-```
-
-```dockerfile
-# syntax=docker/dockerfile:1
-FROM alpine
-RUN apk add git
-COPY --from=foo myfile /
-
-FROM foo
-```
-
-The OCI layout directory must be compliant with the [OCI layout specification](https://github.com/opencontainers/image-spec/blob/main/image-layout.md).
-You can reference an image in the layout using either tags, or the exact digest.
-
 ### <a name="builder"></a> Override the configured builder instance (--builder)
 
 Same as [`buildx --builder`](buildx.md#builder).
@@ -197,7 +137,7 @@ Same as [`buildx --builder`](buildx.md#builder).
 ```
 
 Use an external cache source for a build. Supported types are `registry`,
-`local`, `gha` and `s3`.
+`local` and `gha`.
 
 - [`registry` source](https://github.com/moby/buildkit#registry-push-image-and-cache-separately)
   can import cache from a cache manifest or (special) image configuration on the
@@ -207,9 +147,6 @@ Use an external cache source for a build. Supported types are `registry`,
 - [`gha` source](https://github.com/moby/buildkit#github-actions-cache-experimental)
   can import cache from a previously exported cache with `--cache-to` in your
   GitHub repository
-- [`s3` source](https://github.com/moby/buildkit#s3-cache-experimental)
-  can import cache from a previously exported cache with `--cache-to` in your
-  S3 bucket
 
 If no type is specified, `registry` exporter is used with a specified reference.
 
@@ -221,7 +158,6 @@ $ docker buildx build --cache-from=user/app .
 $ docker buildx build --cache-from=type=registry,ref=user/app .
 $ docker buildx build --cache-from=type=local,src=path/to/cache .
 $ docker buildx build --cache-from=type=gha .
-$ docker buildx build --cache-from=type=s3,region=eu-west-1,bucket=mybucket .
 ```
 
 More info about cache exporters and available attributes: https://github.com/moby/buildkit#export-cache
@@ -233,17 +169,15 @@ More info about cache exporters and available attributes: https://github.com/mob
 ```
 
 Export build cache to an external cache destination. Supported types are
-`registry`, `local`, `inline`, `gha` and `s3`.
+`registry`, `local`, `inline` and `gha`.
 
 - [`registry` type](https://github.com/moby/buildkit#registry-push-image-and-cache-separately) exports build cache to a cache manifest in the registry.
-- [`local` type](https://github.com/moby/buildkit#local-directory-1) exports
-  cache to a local directory on the client.
+- [`local` type](https://github.com/moby/buildkit#local-directory-1) type
+  exports cache to a local directory on the client.
 - [`inline` type](https://github.com/moby/buildkit#inline-push-image-and-cache-together)
-  writes the cache metadata into the image configuration.
+  type writes the cache metadata into the image configuration.
 - [`gha` type](https://github.com/moby/buildkit#github-actions-cache-experimental)
-  exports cache through the [GitHub Actions Cache service API](https://github.com/tonistiigi/go-actions-cache/blob/master/api.md#authentication).
-- [`s3` type](https://github.com/moby/buildkit#s3-cache-experimental) exports
-  cache to a S3 bucket.
+  type exports cache through the [Github Actions Cache service API](https://github.com/tonistiigi/go-actions-cache/blob/master/api.md#authentication).
 
 `docker` driver currently only supports exporting inline cache metadata to image
 configuration. Alternatively, `--build-arg BUILDKIT_INLINE_CACHE=1` can be used
@@ -261,7 +195,6 @@ $ docker buildx build --cache-to=type=inline .
 $ docker buildx build --cache-to=type=registry,ref=user/app .
 $ docker buildx build --cache-to=type=local,dest=path/to/cache .
 $ docker buildx build --cache-to=type=gha .
-$ docker buildx build --cache-to=type=s3,region=eu-west-1,bucket=mybucket .
 ```
 
 More info about cache exporters and available attributes: https://github.com/moby/buildkit#export-cache
@@ -414,13 +347,8 @@ The `registry` exporter is a shortcut for `type=image,push=true`.
 
 Set the target platform for the build. All `FROM` commands inside the Dockerfile
 without their own `--platform` flag will pull base images for this platform and
-this value will also be the platform of the resulting image.
-
-The default value is the platform of the BuildKit daemon where the build runs.
-The value takes the form of `os/arch` or `os/arch/variant`. For example,
-`linux/amd64` or `linux/arm/v7`. Additionally, the `--platform` flag also supports
-a special `local` value, which tells BuildKit to use the platform of the BuildKit
-client that invokes the build.
+this value will also be the platform of the resulting image. The default value
+will be the current platform of the buildkit daemon.
 
 When using `docker-container` driver with `buildx`, this flag can accept multiple
 values as an input separated by a comma. With multiple values the result will be
@@ -459,9 +387,8 @@ $ docker buildx build --platform=darwin .
 Set type of progress output (auto, plain, tty). Use plain to show container
 output (default "auto").
 
-> **Note**
->
-> You can also use the `BUILDKIT_PROGRESS` environment variable to set its value.
+> You can also use the `BUILDKIT_PROGRESS` environment variable to set
+> its value.
 
 The following example uses `plain` output during the build:
 
@@ -478,46 +405,11 @@ $ docker buildx build --load --progress=plain .
 ...
 ```
 
-> **Note**
->
-> Check also our [Color output controls guide](https://github.com/docker/buildx/blob/master/docs/guides/color-output.md)
-> for modifying the colors that are used to output information to the terminal.
-
-### <a name="provenance"></a> Create provenance attestations (--provenance)
-
-Shorthand for [`--attest=type=provenance`](#attest), used to configure
-provenance attestations for the build result. For example,
-`--provenance=mode=max` can be used as an abbreviation for
-`--attest=type=provenance,mode=max`.
-
-Additionally, `--provenance` can be used with boolean values to broadly enable
-or disable provenance attestations. For example, `--provenance=false` can be
-used to disable all provenance attestations, while `--provenance=true` can be
-used to enable all provenance attestations.
-
-By default, a minimal provenance attestation will be created for the build
-result, which will only be attached for images pushed to registries.
-
-For more information, see [here](https://docs.docker.com/build/attestations/slsa-provenance/).
-
 ### <a name="push"></a> Push the build result to a registry (--push)
 
 Shorthand for [`--output=type=registry`](#registry). Will automatically push the
 build result to registry.
 
-### <a name="sbom"></a> Create SBOM attestations (--sbom)
-
-Shorthand for [`--attest=type=sbom`](#attest), used to configure SBOM
-attestations for the build result. For example,
-`--sbom=generator=<user>/<generator-image>` can be used as an abbreviation for
-`--attest=type=sbom,generator=<user>/<generator-image>`.
-
-Additionally, `--sbom` can be used with boolean values to broadly enable or
-disable SBOM attestations. For example, `--sbom=false` can be used to disable
-all SBOM attestations.
-
-For more information, see [here](https://docs.docker.com/build/attestations/sbom/).
-
 ### <a name="secret"></a> Secret to expose to the build (--secret)
 
 ```
@@ -525,7 +417,7 @@ For more information, see [here](https://docs.docker.com/build/attestations/sbom
 ```
 
 Exposes secret to the build. The secret can be used by the build using
-[`RUN --mount=type=secret` mount](https://docs.docker.com/engine/reference/builder/#run---mounttypesecret).
+[`RUN --mount=type=secret` mount](https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/syntax.md#run---mounttypesecret).
 
 If `type` is unset it will be detected. Supported types are:
 
@@ -537,7 +429,7 @@ Attribute keys:
 - `src`, `source` - Secret filename. `id` used if unset.
 
 ```dockerfile
-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile:1.3
 FROM python:3
 RUN pip install awscli
 RUN --mount=type=secret,id=aws,target=/root/.aws/credentials \
@@ -556,7 +448,7 @@ Attribute keys:
 - `env` - Secret environment variable. `id` used if unset, otherwise will look for `src`, `source` if `id` unset.
 
 ```dockerfile
-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile:1.3
 FROM node:alpine
 RUN --mount=type=bind,target=. \
   --mount=type=secret,id=SECRET_TOKEN \
@@ -583,12 +475,12 @@ This can be useful when some commands in your Dockerfile need specific SSH
 authentication (e.g., cloning a private repository).
 
 `--ssh` exposes SSH agent socket or keys to the build and can be used with the
-[`RUN --mount=type=ssh` mount](https://docs.docker.com/engine/reference/builder/#run---mounttypessh).
+[`RUN --mount=type=ssh` mount](https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/syntax.md#run---mounttypessh).
 
 Example to access Gitlab using an SSH agent socket:
 
 ```dockerfile
-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile:1.3
 FROM alpine
 RUN apk add --no-cache openssh-client
 RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan gitlab.com >> ~/.ssh/known_hosts

docs/reference/buildx_create.md

@@ -9,19 +9,19 @@ Create a new builder instance
 
 ### Options
 
-| Name                                    | Type          | Default | Description                                                           |
-|:----------------------------------------|:--------------|:--------|:----------------------------------------------------------------------|
-| [`--append`](#append)                   |               |         | Append a node to builder instead of changing it                       |
-| `--bootstrap`                           |               |         | Boot builder after creation                                           |
-| [`--buildkitd-flags`](#buildkitd-flags) | `string`      |         | Flags for buildkitd daemon                                            |
-| [`--config`](#config)                   | `string`      |         | BuildKit config file                                                  |
-| [`--driver`](#driver)                   | `string`      |         | Driver to use (available: `docker-container`, `kubernetes`, `remote`) |
-| [`--driver-opt`](#driver-opt)           | `stringArray` |         | Options for the driver                                                |
-| [`--leave`](#leave)                     |               |         | Remove a node from builder instead of changing it                     |
-| [`--name`](#name)                       | `string`      |         | Builder instance name                                                 |
-| [`--node`](#node)                       | `string`      |         | Create/modify node with given name                                    |
-| [`--platform`](#platform)               | `stringArray` |         | Fixed platforms for current node                                      |
-| [`--use`](#use)                         |               |         | Set the current builder instance                                      |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--append`](#append) |  |  | Append a node to builder instead of changing it |
+| `--bootstrap` |  |  | Boot builder after creation |
+| [`--buildkitd-flags`](#buildkitd-flags) | `string` |  | Flags for buildkitd daemon |
+| [`--config`](#config) | `string` |  | BuildKit config file |
+| [`--driver`](#driver) | `string` |  | Driver to use (available: `docker`, `docker-container`, `kubernetes`) |
+| [`--driver-opt`](#driver-opt) | `stringArray` |  | Options for the driver |
+| [`--leave`](#leave) |  |  | Remove a node from builder instead of changing it |
+| [`--name`](#name) | `string` |  | Builder instance name |
+| [`--node`](#node) | `string` |  | Create/modify node with given name |
+| [`--platform`](#platform) | `stringArray` |  | Fixed platforms for current node |
+| [`--use`](#use) |  |  | Set the current builder instance |
 
 
 <!---MARKER_GEN_END-->
@@ -79,11 +79,6 @@ Specifies the configuration file for the buildkitd daemon to use. The configurat
 can be overridden by [`--buildkitd-flags`](#buildkitd-flags).
 See an [example buildkitd configuration file](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md).
 
-If the configuration file is not specified, will look for one by default in:
-* `$BUILDX_CONFIG/buildkitd.default.toml`
-* `$DOCKER_CONFIG/buildx/buildkitd.default.toml`
-* `~/.docker/buildx/buildkitd.default.toml`
-
 Note that if you create a `docker-container` builder and have specified
 certificates for registries in the `buildkitd.toml` configuration, the files
 will be copied into the container under `/etc/buildkit/certs` and configuration
@@ -123,59 +118,32 @@ Unlike `docker` driver, built images will not automatically appear in
 `docker images` and [`build --load`](buildx_build.md#load) needs to be used
 to achieve that.
 
-#### `remote` driver
-
-Uses a remote instance of buildkitd over an arbitrary connection. With this
-driver, you manually create and manage instances of buildkit yourself, and
-configure buildx to point at it.
-
-Unlike `docker` driver, built images will not automatically appear in
-`docker images` and [`build --load`](buildx_build.md#load) needs to be used
-to achieve that.
-
 ### <a name="driver-opt"></a> Set additional driver-specific options (--driver-opt)
 
 ```
 --driver-opt OPTIONS
 ```
 
-Passes additional driver-specific options.
+Passes additional driver-specific options. Details for each driver:
 
-Note: When using quoted values for example for the `nodeselector` or
-`tolerations` options, ensure that quotes are escaped correctly for your shell.
-
-#### `docker` driver
-
-No driver options.
-
-#### `docker-container` driver
-
-- `image=IMAGE` - Sets the container image to be used for running buildkit.
-- `network=NETMODE` - Sets the network mode for running the buildkit container.
-- `cgroup-parent=CGROUP` - Sets the cgroup parent of the buildkit container if docker is using the "cgroupfs" driver. Defaults to `/docker/buildx`.
-
-#### `kubernetes` driver
-
-- `image=IMAGE` - Sets the container image to be used for running buildkit.
-- `namespace=NS` - Sets the Kubernetes namespace. Defaults to the current namespace.
-- `replicas=N` - Sets the number of `Pod` replicas. Defaults to 1.
-- `requests.cpu` - Sets the request CPU value specified in units of Kubernetes CPU. Example `requests.cpu=100m`, `requests.cpu=2`
-- `requests.memory` - Sets the request memory value specified in bytes or with a valid suffix. Example `requests.memory=500Mi`, `requests.memory=4G`
-- `limits.cpu` - Sets the limit CPU value specified in units of Kubernetes CPU. Example `limits.cpu=100m`, `limits.cpu=2`
-- `limits.memory` - Sets the limit memory value specified in bytes or with a valid suffix. Example `limits.memory=500Mi`, `limits.memory=4G`
-- `"nodeselector=label1=value1,label2=value2"` - Sets the kv of `Pod` nodeSelector. No Defaults. Example `nodeselector=kubernetes.io/arch=arm64`
-- `"tolerations=key=foo,value=bar;key=foo2,operator=exists;key=foo3,effect=NoSchedule"` - Sets the `Pod` tolerations. Accepts the same values as the kube manifest tolera>tions. Key-value pairs are separated by `,`, tolerations are separated by `;`. No Defaults. Example `tolerations=operator=exists`
-- `rootless=(true|false)` - Run the container as a non-root user without `securityContext.privileged`. Needs Kubernetes 1.19 or later. [Using Ubuntu host kernel is recommended](https://github.com/moby/buildkit/blob/master/docs/rootless.md). Defaults to false.
-- `loadbalance=(sticky|random)` - Load-balancing strategy. If set to "sticky", the pod is chosen using the hash of the context path. Defaults to "sticky"
-- `qemu.install=(true|false)` - Install QEMU emulation for multi platforms support.
-- `qemu.image=IMAGE` - Sets the QEMU emulation image. Defaults to `tonistiigi/binfmt:latest`
-
-#### `remote` driver
-
-- `key=KEY` - Sets the TLS client key.
-- `cert=CERT` - Sets the TLS client certificate to present to buildkitd.
-- `cacert=CACERT` - Sets the TLS certificate authority used for validation.
-- `servername=SERVER` - Sets the TLS server name to be used in requests (defaults to the endpoint hostname).
+- `docker` - No driver options
+- `docker-container`
+  - `image=IMAGE` - Sets the container image to be used for running buildkit.
+  - `network=NETMODE` - Sets the network mode for running the buildkit container.
+  - `cgroup-parent=CGROUP` - Sets the cgroup parent of the buildkit container if docker is using the "cgroupfs" driver. Defaults to `/docker/buildx`.
+- `kubernetes`
+  - `image=IMAGE` - Sets the container image to be used for running buildkit.
+  - `namespace=NS` - Sets the Kubernetes namespace. Defaults to the current namespace.
+  - `replicas=N` - Sets the number of `Pod` replicas. Defaults to 1.
+  - `requests.cpu` - Sets the request CPU value specified in units of Kubernetes CPU. Example `requests.cpu=100m`, `requests.cpu=2`
+  - `requests.memory` - Sets the request memory value specified in bytes or with a valid suffix. Example `requests.memory=500Mi`, `requests.memory=4G`
+  - `limits.cpu` - Sets the limit CPU value specified in units of Kubernetes CPU. Example `limits.cpu=100m`, `limits.cpu=2`
+  - `limits.memory` - Sets the limit memory value specified in bytes or with a valid suffix. Example `limits.memory=500Mi`, `limits.memory=4G`
+  - `nodeselector="label1=value1,label2=value2"` - Sets the kv of `Pod` nodeSelector. No Defaults. Example `nodeselector=kubernetes.io/arch=arm64`
+  - `rootless=(true|false)` - Run the container as a non-root user without `securityContext.privileged`. [Using Ubuntu host kernel is recommended](https://github.com/moby/buildkit/blob/master/docs/rootless.md). Defaults to false.
+  - `loadbalance=(sticky|random)` - Load-balancing strategy. If set to "sticky", the pod is chosen using the hash of the context path. Defaults to "sticky"
+  - `qemu.install=(true|false)` - Install QEMU emulation for multi platforms support.
+  - `qemu.image=IMAGE` - Sets the QEMU emulation image. Defaults to `tonistiigi/binfmt:latest`
 
 ### <a name="leave"></a> Remove a node from a builder (--leave)
 

docs/reference/buildx_du.md

@@ -9,11 +9,11 @@ Disk usage
 
 ### Options
 
-| Name                    | Type     | Default | Description                              |
-|:------------------------|:---------|:--------|:-----------------------------------------|
-| [`--builder`](#builder) | `string` |         | Override the configured builder instance |
-| `--filter`              | `filter` |         | Provide filter values                    |
-| `--verbose`             |          |         | Provide a more verbose output            |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| `--filter` | `filter` |  | Provide filter values |
+| `--verbose` |  |  | Provide a more verbose output |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_imagetools.md

@@ -9,17 +9,17 @@ Commands to work on images in registry
 
 ### Subcommands
 
-| Name                                      | Description                               |
-|:------------------------------------------|:------------------------------------------|
-| [`create`](buildx_imagetools_create.md)   | Create a new image based on source images |
-| [`inspect`](buildx_imagetools_inspect.md) | Show details of an image in the registry  |
+| Name | Description |
+| --- | --- |
+| [`create`](buildx_imagetools_create.md) | Create a new image based on source images |
+| [`inspect`](buildx_imagetools_inspect.md) | Show details of an image in the registry |
 
 
 ### Options
 
-| Name                    | Type     | Default | Description                              |
-|:------------------------|:---------|:--------|:-----------------------------------------|
-| [`--builder`](#builder) | `string` |         | Override the configured builder instance |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_imagetools_create.md

@@ -9,14 +9,13 @@ Create a new image based on source images
 
 ### Options
 
-| Name                             | Type          | Default | Description                                                                              |
-|:---------------------------------|:--------------|:--------|:-----------------------------------------------------------------------------------------|
-| [`--append`](#append)            |               |         | Append to existing manifest                                                              |
-| [`--builder`](#builder)          | `string`      |         | Override the configured builder instance                                                 |
-| [`--dry-run`](#dry-run)          |               |         | Show final image instead of pushing                                                      |
-| [`-f`](#file), [`--file`](#file) | `stringArray` |         | Read source descriptor from file                                                         |
-| `--progress`                     | `string`      | `auto`  | Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output |
-| [`-t`](#tag), [`--tag`](#tag)    | `stringArray` |         | Set reference for new image                                                              |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--append`](#append) |  |  | Append to existing manifest |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`--dry-run`](#dry-run) |  |  | Show final image instead of pushing |
+| [`-f`](#file), [`--file`](#file) | `stringArray` |  | Read source descriptor from file |
+| [`-t`](#tag), [`--tag`](#tag) | `stringArray` |  | Set reference for new image |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_imagetools_inspect.md

@@ -9,11 +9,11 @@ Show details of an image in the registry
 
 ### Options
 
-| Name                    | Type     | Default         | Description                                   |
-|:------------------------|:---------|:----------------|:----------------------------------------------|
-| [`--builder`](#builder) | `string` |                 | Override the configured builder instance      |
-| [`--format`](#format)   | `string` | `{{.Manifest}}` | Format the output using the given Go template |
-| [`--raw`](#raw)         |          |                 | Show original, unformatted JSON manifest      |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`--format`](#format) | `string` | `{{.Manifest}}` | Format the output using the given Go template |
+| [`--raw`](#raw) |  |  | Show original, unformatted JSON manifest |
 
 
 <!---MARKER_GEN_END-->
@@ -72,6 +72,7 @@ unset. Following fields are available:
 * `.Name`: provides the reference of the image
 * `.Manifest`: provides the manifest or manifest list
 * `.Image`: provides the image config
+* `.BuildInfo`: provides [build info from image config](https://github.com/moby/buildkit/blob/master/docs/build-repro.md#image-config)
 
 #### `.Name`
 
@@ -121,6 +122,39 @@ Manifests:
   Platform:  linux/riscv64
 ```
 
+#### `.BuildInfo`
+
+```console
+$ docker buildx imagetools inspect crazymax/buildx:buildinfo --format "{{.BuildInfo}}"
+Name: docker.io/crazymax/buildx:buildinfo
+Frontend: dockerfile.v0
+Attrs:
+  filename:      Dockerfile
+  source:        docker/dockerfile-upstream:master-labs
+  build-arg:bar: foo
+  build-arg:foo: bar
+Sources:
+  Type: docker-image
+  Ref:  docker.io/docker/buildx-bin:0.6.1@sha256:a652ced4a4141977c7daaed0a074dcd9844a78d7d2615465b12f433ae6dd29f0
+  Pin:  sha256:a652ced4a4141977c7daaed0a074dcd9844a78d7d2615465b12f433ae6dd29f0
+
+  Type: docker-image
+  Ref:  docker.io/library/alpine:3.13
+  Pin:  sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c
+
+  Type: docker-image
+  Ref:  docker.io/moby/buildkit:v0.9.0
+  Pin:  sha256:8dc668e7f66db1c044aadbed306020743516a94848793e0f81f94a087ee78cab
+
+  Type: docker-image
+  Ref:  docker.io/tonistiigi/xx@sha256:21a61be4744f6531cb5f33b0e6f40ede41fa3a1b8c82d5946178f80cc84bfc04
+  Pin:  sha256:21a61be4744f6531cb5f33b0e6f40ede41fa3a1b8c82d5946178f80cc84bfc04
+
+  Type: http
+  Ref:  https://raw.githubusercontent.com/moby/moby/master/README.md
+  Pin:  sha256:419455202b0ef97e480d7f8199b26a721a417818bc0e2d106975f74323f25e6c
+```
+
 #### JSON output
 
 A `json` go template func is also available if you want to render fields as
@@ -132,7 +166,7 @@ $ docker buildx imagetools inspect crazymax/loop --format "{{json .Manifest}}"
 ```json
 {
   "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
-  "digest": "sha256:a9ca35b798e0b198f9be7f3b8b53982e9a6cf96814cb10d78083f40ad8c127f1",
+  "digest": "sha256:08602e7340970e92bde5e0a2e887c1fde4d9ae753d1e05efb4c8ef3b609f97f1",
   "size": 949
 }
 ```
@@ -143,23 +177,23 @@ $ docker buildx imagetools inspect moby/buildkit:master --format "{{json .Manife
 ```json
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.index.v1+json",
-  "digest": "sha256:d895e8fdcf5e2bb39acb5966f97fc4cd87a2d13d27c939c320025eb4aca5440c",
-  "size": 4654,
+  "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
+  "digest": "sha256:79d97f205e2799d99a3a8ae2a1ef17acb331e11784262c3faada847dc6972c52",
+  "size": 2010,
   "manifests": [
     {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:ac9dd4fbec9e36b562f910618975a2936533f8e411a3fea2858aacc0ac972e1c",
-      "size": 1054,
+      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+      "digest": "sha256:bd1e78f06de26610fadf4eb9d04b1a45a545799d6342701726e952cc0c11c912",
+      "size": 1158,
       "platform": {
         "architecture": "amd64",
         "os": "linux"
       }
     },
     {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:0f4dc6797db467372cbf52c7236816203654a839f64a6542c9135d1973c9d744",
-      "size": 1054,
+      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+      "digest": "sha256:d37dcced63ec0965824fca644f0ac9efad8569434ec15b4c83adfcb3dcfc743b",
+      "size": 1158,
       "platform": {
         "architecture": "arm",
         "os": "linux",
@@ -167,356 +201,260 @@ $ docker buildx imagetools inspect moby/buildkit:master --format "{{json .Manife
       }
     },
     {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:d62bb533d95afe17c4a9caf1e7c57a3b0a7a67409ccfa7af947aeb0f670ffb87",
-      "size": 1054,
+      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+      "digest": "sha256:ce142eb2255e6af46f2809e159fd03081697c7605a3de03b9cbe9a52ddb244bf",
+      "size": 1158,
       "platform": {
         "architecture": "arm64",
         "os": "linux"
       }
     },
     {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:b4944057e0c68203cdcc3dceff3b2df3c7d9e3dd801724fa977b01081da7771e",
-      "size": 1054,
+      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+      "digest": "sha256:f59bfb5062fff76ce464bfa4e25ebaaaac887d6818238e119d68613c456d360c",
+      "size": 1158,
       "platform": {
         "architecture": "s390x",
         "os": "linux"
       }
     },
     {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:825702a51eb4234904fc9253d8b0bf0a584787ffd8fc3fd6fa374188233ce399",
-      "size": 1054,
+      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+      "digest": "sha256:cc96426e0c50a78105d5637d31356db5dd6ec594f21b24276e534a32da09645c",
+      "size": 1159,
       "platform": {
         "architecture": "ppc64le",
         "os": "linux"
       }
     },
     {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:dfb27c6acc9b9f3a7c9d47366d137089565062f43c8063c9f5e408d34c87ee4a",
-      "size": 1054,
+      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+      "digest": "sha256:39f9c1e2878e6c333acb23187d6b205ce82ed934c60da326cb2c698192631478",
+      "size": 1158,
       "platform": {
         "architecture": "riscv64",
         "os": "linux"
       }
-    },
-    {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:f2fe69bccc878e658caf21dfc99eaf726fb20d28f17398c1d66a90e62cc019f9",
-      "size": 1113,
-      "annotations": {
-        "vnd.docker.reference.digest": "sha256:ac9dd4fbec9e36b562f910618975a2936533f8e411a3fea2858aacc0ac972e1c",
-        "vnd.docker.reference.type": "attestation-manifest"
-      },
-      "platform": {
-        "architecture": "unknown",
-        "os": "unknown"
-      }
-    },
-    {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:9e112f8d4e383186f36369fba7b454e246d2e9ca5def797f1b84ede265e9f3ca",
-      "size": 1113,
-      "annotations": {
-        "vnd.docker.reference.digest": "sha256:0f4dc6797db467372cbf52c7236816203654a839f64a6542c9135d1973c9d744",
-        "vnd.docker.reference.type": "attestation-manifest"
-      },
-      "platform": {
-        "architecture": "unknown",
-        "os": "unknown"
-      }
-    },
-    {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:09d593587f8665269ec6753eaed7fbdb09968f71587dd53e06519502cbc16775",
-      "size": 1113,
-      "annotations": {
-        "vnd.docker.reference.digest": "sha256:d62bb533d95afe17c4a9caf1e7c57a3b0a7a67409ccfa7af947aeb0f670ffb87",
-        "vnd.docker.reference.type": "attestation-manifest"
-      },
-      "platform": {
-        "architecture": "unknown",
-        "os": "unknown"
-      }
-    },
-    {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:985a3f4544dfb042db6a8703f5f76438667dd7958aba14cb04bebe3b4cbd9307",
-      "size": 1113,
-      "annotations": {
-        "vnd.docker.reference.digest": "sha256:b4944057e0c68203cdcc3dceff3b2df3c7d9e3dd801724fa977b01081da7771e",
-        "vnd.docker.reference.type": "attestation-manifest"
-      },
-      "platform": {
-        "architecture": "unknown",
-        "os": "unknown"
-      }
-    },
-    {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:cfccb6afeede7dc29bf8abef4815d56f2723fa482ea63c9cd519cd991c379294",
-      "size": 1113,
-      "annotations": {
-        "vnd.docker.reference.digest": "sha256:825702a51eb4234904fc9253d8b0bf0a584787ffd8fc3fd6fa374188233ce399",
-        "vnd.docker.reference.type": "attestation-manifest"
-      },
-      "platform": {
-        "architecture": "unknown",
-        "os": "unknown"
-      }
-    },
-    {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
-      "digest": "sha256:2e93733432c6a14cb57db33928b3a17d7ca298b3babe24d9f56dca2754dbde3b",
-      "size": 1113,
-      "annotations": {
-        "vnd.docker.reference.digest": "sha256:dfb27c6acc9b9f3a7c9d47366d137089565062f43c8063c9f5e408d34c87ee4a",
-        "vnd.docker.reference.type": "attestation-manifest"
-      },
-      "platform": {
-        "architecture": "unknown",
-        "os": "unknown"
-      }
     }
   ]
 }
 ```
 
-Following command provides [SLSA](https://github.com/moby/buildkit/blob/master/docs/attestations/slsa-provenance.md) JSON output:
-
 ```console
-$ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .Provenance}}"
+$ docker buildx imagetools inspect crazymax/buildx:buildinfo --format "{{json .BuildInfo}}"
 ```
 ```json
 {
-  "SLSA": {
-    "builder": {
-      "id": ""
+  "frontend": "dockerfile.v0",
+  "attrs": {
+    "build-arg:bar": "foo",
+    "build-arg:foo": "bar",
+    "filename": "Dockerfile",
+    "source": "crazymax/dockerfile:buildattrs"
+  },
+  "sources": [
+    {
+      "type": "docker-image",
+      "ref": "docker.io/docker/buildx-bin:0.6.1@sha256:a652ced4a4141977c7daaed0a074dcd9844a78d7d2615465b12f433ae6dd29f0",
+      "pin": "sha256:a652ced4a4141977c7daaed0a074dcd9844a78d7d2615465b12f433ae6dd29f0"
     },
-    "buildType": "https://mobyproject.org/buildkit@v1",
-    "materials": [
-      {
-        "uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
-        "digest": {
-          "sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
-        }
-      },
-      {
-        "uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
-        "digest": {
-          "sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
-        }
-      }
-    ],
-    "invocation": {
-      "configSource": {},
-      "parameters": {
-        "frontend": "dockerfile.v0",
-        "locals": [
-          {
-            "name": "context"
-          },
-          {
-            "name": "dockerfile"
-          }
-        ]
-      },
-      "environment": {
-        "platform": "linux/amd64"
-      }
+    {
+      "type": "docker-image",
+      "ref": "docker.io/library/alpine:3.13@sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c",
+      "pin": "sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c"
     },
-    "metadata": {
-      "buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
-      "buildStartedOn": "2022-12-01T11:50:07.264704131Z",
-      "buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
-      "reproducible": false,
-      "completeness": {
-        "parameters": true,
-        "environment": true,
-        "materials": false
-      },
-      "https://mobyproject.org/buildkit@v1#metadata": {}
+    {
+      "type": "docker-image",
+      "ref": "docker.io/moby/buildkit:v0.9.0@sha256:8dc668e7f66db1c044aadbed306020743516a94848793e0f81f94a087ee78cab",
+      "pin": "sha256:8dc668e7f66db1c044aadbed306020743516a94848793e0f81f94a087ee78cab"
+    },
+    {
+      "type": "docker-image",
+      "ref": "docker.io/tonistiigi/xx@sha256:21a61be4744f6531cb5f33b0e6f40ede41fa3a1b8c82d5946178f80cc84bfc04",
+      "pin": "sha256:21a61be4744f6531cb5f33b0e6f40ede41fa3a1b8c82d5946178f80cc84bfc04"
+    },
+    {
+      "type": "http",
+      "ref": "https://raw.githubusercontent.com/moby/moby/master/README.md",
+      "pin": "sha256:419455202b0ef97e480d7f8199b26a721a417818bc0e2d106975f74323f25e6c"
     }
-  }
-}
-```
-
-Following command provides [SBOM](https://github.com/moby/buildkit/blob/master/docs/attestations/sbom.md) JSON output:
-
-```console
-$ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .SBOM}}"
-```
-```json
-{
-  "SPDX": {
-    "SPDXID": "SPDXRef-DOCUMENT",
-    "creationInfo": {
-      "created": "2022-12-01T11:46:48.063400162Z",
-      "creators": [
-        "Tool: syft-v0.60.3",
-        "Tool: buildkit-1ace2bb",
-        "Organization: Anchore, Inc"
-      ],
-      "licenseListVersion": "3.18"
-    },
-    "dataLicense": "CC0-1.0",
-    "documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
-    "files": [...],
-    "spdxVersion": "SPDX-2.2"
-  }
+  ]
 }
 ```
 
 ```console
-$ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .}}"
+$ docker buildx imagetools inspect crazymax/buildx:buildinfo --format "{{json .}}"
 ```
 ```json
 {
-  "name": "crazymax/buildkit:attest",
+  "name": "crazymax/buildx:buildinfo",
   "manifest": {
-    "schemaVersion": 2,
-    "mediaType": "application/vnd.oci.image.index.v1+json",
-    "digest": "sha256:7007b387ccd52bd42a050f2e8020e56e64622c9269bf7bbe257b326fe99daf19",
-    "size": 855,
-    "manifests": [
-      {
-        "mediaType": "application/vnd.oci.image.manifest.v1+json",
-        "digest": "sha256:fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55",
-        "size": 673,
-        "platform": {
-          "architecture": "amd64",
-          "os": "linux"
-        }
-      },
-      {
-        "mediaType": "application/vnd.oci.image.manifest.v1+json",
-        "digest": "sha256:a9de632c16998489fd63fbca42a03431df00639cfb2ecb8982bf9984b83c5b2b",
-        "size": 839,
-        "annotations": {
-          "vnd.docker.reference.digest": "sha256:fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55",
-          "vnd.docker.reference.type": "attestation-manifest"
-        },
-        "platform": {
-          "architecture": "unknown",
-          "os": "unknown"
-        }
-      }
-    ]
+    "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+    "digest": "sha256:899d2c7acbc124d406820857bb51d9089717bbe4e22b97eb4bc5789e99f09f83",
+    "size": 2628
   },
   "image": {
-    "created": "2022-12-01T11:46:47.713777178Z",
+    "created": "2022-02-24T12:27:43.627154558Z",
     "architecture": "amd64",
     "os": "linux",
     "config": {
       "Env": [
-        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+        "DOCKER_TLS_CERTDIR=/certs",
+        "DOCKER_CLI_EXPERIMENTAL=enabled"
+      ],
+      "Entrypoint": [
+        "docker-entrypoint.sh"
       ],
       "Cmd": [
-        "/bin/sh"
+        "sh"
       ]
     },
     "rootfs": {
       "type": "layers",
       "diff_ids": [
-        "sha256:ded7a220bb058e28ee3254fbba04ca90b679070424424761a53a043b93b612bf",
-        "sha256:d85d09ab4b4e921666ccc2db8532e857bf3476b7588e52c9c17741d7af14204f"
+        "sha256:7fcb75871b2101082203959c83514ac8a9f4ecfee77a0fe9aa73bbe56afdf1b4",
+        "sha256:d3c0b963ff5684160641f936d6a4aa14efc8ff27b6edac255c07f2d03ff92e82",
+        "sha256:3f8d78f13fa9b1f35d3bc3f1351d03a027c38018c37baca73f93eecdea17f244",
+        "sha256:8e6eb1137b182ae0c3f5d40ca46341fda2eaeeeb5fa516a9a2bf96171238e2e0",
+        "sha256:fde4c869a56b54dd76d7352ddaa813fd96202bda30b9dceb2c2f2ad22fa2e6ce",
+        "sha256:52025823edb284321af7846419899234b3c66219bf06061692b709875ed0760f",
+        "sha256:50adb5982dbf6126c7cf279ac3181d1e39fc9116b610b947a3dadae6f7e7c5bc",
+        "sha256:9801c319e1c66c5d295e78b2d3e80547e73c7e3c63a4b71e97c8ca357224af24",
+        "sha256:dfbfac44d5d228c49b42194c8a2f470abd6916d072f612a6fb14318e94fde8ae",
+        "sha256:3dfb74e19dedf61568b917c19b0fd3ee4580870027ca0b6054baf239855d1322",
+        "sha256:b182e707c23e4f19be73f9022a99d2d1ca7bf1ca8f280d40e4d1c10a6f51550e"
       ]
     },
     "history": [
       {
-        "created": "2022-11-22T22:19:28.870801855Z",
-        "created_by": "/bin/sh -c #(nop) ADD file:587cae71969871d3c6456d844a8795df9b64b12c710c275295a1182b46f630e7 in / "
+        "created": "2021-11-12T17:19:58.698676655Z",
+        "created_by": "/bin/sh -c #(nop) ADD file:5a707b9d6cb5fff532e4c2141bc35707593f21da5528c9e71ae2ddb6ba4a4eb6 in / "
       },
       {
-        "created": "2022-11-22T22:19:29.008562326Z",
+        "created": "2021-11-12T17:19:58.948920855Z",
         "created_by": "/bin/sh -c #(nop)  CMD [\"/bin/sh\"]",
         "empty_layer": true
       },
       {
-        "created": "2022-12-01T11:46:47.713777178Z",
-        "created_by": "RUN /bin/sh -c apk add curl # buildkit",
+        "created": "2022-02-24T12:27:38.285594601Z",
+        "created_by": "RUN /bin/sh -c apk --update --no-cache add     bash     ca-certificates     openssh-client   \u0026\u0026 rm -rf /tmp/* /var/cache/apk/* # buildkit",
         "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:41.061874167Z",
+        "created_by": "COPY /opt/docker/ /usr/local/bin/ # buildkit",
+        "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:41.174098947Z",
+        "created_by": "COPY /usr/bin/buildctl /usr/local/bin/buildctl # buildkit",
+        "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:41.320343683Z",
+        "created_by": "COPY /usr/bin/buildkit* /usr/local/bin/ # buildkit",
+        "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:41.447149933Z",
+        "created_by": "COPY /buildx /usr/libexec/docker/cli-plugins/docker-buildx # buildkit",
+        "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:43.057722191Z",
+        "created_by": "COPY /opt/docker-compose /usr/libexec/docker/cli-plugins/docker-compose # buildkit",
+        "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:43.145224134Z",
+        "created_by": "ADD https://raw.githubusercontent.com/moby/moby/master/README.md / # buildkit",
+        "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:43.422212427Z",
+        "created_by": "ENV DOCKER_TLS_CERTDIR=/certs",
+        "comment": "buildkit.dockerfile.v0",
+        "empty_layer": true
+      },
+      {
+        "created": "2022-02-24T12:27:43.422212427Z",
+        "created_by": "ENV DOCKER_CLI_EXPERIMENTAL=enabled",
+        "comment": "buildkit.dockerfile.v0",
+        "empty_layer": true
+      },
+      {
+        "created": "2022-02-24T12:27:43.422212427Z",
+        "created_by": "RUN /bin/sh -c docker --version   \u0026\u0026 buildkitd --version   \u0026\u0026 buildctl --version   \u0026\u0026 docker buildx version   \u0026\u0026 docker compose version   \u0026\u0026 mkdir /certs /certs/client   \u0026\u0026 chmod 1777 /certs /certs/client # buildkit",
+        "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:43.514320155Z",
+        "created_by": "COPY rootfs/modprobe.sh /usr/local/bin/modprobe # buildkit",
+        "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:43.627154558Z",
+        "created_by": "COPY rootfs/docker-entrypoint.sh /usr/local/bin/ # buildkit",
+        "comment": "buildkit.dockerfile.v0"
+      },
+      {
+        "created": "2022-02-24T12:27:43.627154558Z",
+        "created_by": "ENTRYPOINT [\"docker-entrypoint.sh\"]",
+        "comment": "buildkit.dockerfile.v0",
+        "empty_layer": true
+      },
+      {
+        "created": "2022-02-24T12:27:43.627154558Z",
+        "created_by": "CMD [\"sh\"]",
+        "comment": "buildkit.dockerfile.v0",
+        "empty_layer": true
       }
     ]
   },
-  "Provenance": {
-    "SLSA": {
-      "builder": {
-        "id": ""
+  "buildinfo": {
+    "frontend": "dockerfile.v0",
+    "attrs": {
+      "build-arg:bar": "foo",
+      "build-arg:foo": "bar",
+      "filename": "Dockerfile",
+      "source": "docker/dockerfile-upstream:master-labs"
+    },
+    "sources": [
+      {
+        "type": "docker-image",
+        "ref": "docker.io/docker/buildx-bin:0.6.1@sha256:a652ced4a4141977c7daaed0a074dcd9844a78d7d2615465b12f433ae6dd29f0",
+        "pin": "sha256:a652ced4a4141977c7daaed0a074dcd9844a78d7d2615465b12f433ae6dd29f0"
       },
-      "buildType": "https://mobyproject.org/buildkit@v1",
-      "materials": [
-        {
-          "uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
-          "digest": {
-            "sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
-          }
-        },
-        {
-          "uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
-          "digest": {
-            "sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
-          }
-        }
-      ],
-      "invocation": {
-        "configSource": {},
-        "parameters": {
-          "frontend": "dockerfile.v0",
-          "locals": [
-            {
-              "name": "context"
-            },
-            {
-              "name": "dockerfile"
-            }
-          ]
-        },
-        "environment": {
-          "platform": "linux/amd64"
-        }
+      {
+        "type": "docker-image",
+        "ref": "docker.io/library/alpine:3.13",
+        "pin": "sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c"
       },
-      "metadata": {
-        "buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
-        "buildStartedOn": "2022-12-01T11:50:07.264704131Z",
-        "buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
-        "reproducible": false,
-        "completeness": {
-          "parameters": true,
-          "environment": true,
-          "materials": false
-        },
-        "https://mobyproject.org/buildkit@v1#metadata": {}
+      {
+        "type": "docker-image",
+        "ref": "docker.io/moby/buildkit:v0.9.0",
+        "pin": "sha256:8dc668e7f66db1c044aadbed306020743516a94848793e0f81f94a087ee78cab"
+      },
+      {
+        "type": "docker-image",
+        "ref": "docker.io/tonistiigi/xx@sha256:21a61be4744f6531cb5f33b0e6f40ede41fa3a1b8c82d5946178f80cc84bfc04",
+        "pin": "sha256:21a61be4744f6531cb5f33b0e6f40ede41fa3a1b8c82d5946178f80cc84bfc04"
+      },
+      {
+        "type": "http",
+        "ref": "https://raw.githubusercontent.com/moby/moby/master/README.md",
+        "pin": "sha256:419455202b0ef97e480d7f8199b26a721a417818bc0e2d106975f74323f25e6c"
       }
-    }
-  },
-  "SBOM": {
-    "SPDX": {
-      "SPDXID": "SPDXRef-DOCUMENT",
-      "creationInfo": {
-        "created": "2022-12-01T11:46:48.063400162Z",
-        "creators": [
-          "Tool: syft-v0.60.3",
-          "Tool: buildkit-1ace2bb",
-          "Organization: Anchore, Inc"
-        ],
-        "licenseListVersion": "3.18"
-      },
-      "dataLicense": "CC0-1.0",
-      "documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
-      "files": [...],
-      "spdxVersion": "SPDX-2.2"
-    }
+    ]
   }
 }
 ```
 
 #### Multi-platform
 
-Multi-platform images are supported for `.Image`, `.SLSA` and `.SBOM` fields.
-If you want to pick up a specific platform, you can specify it using the `index`
+Multi-platform images are supported for `.Image` and `.BuildInfo` fields. If
+you want to pick up a specific platform, you can specify it using the `index`
 go template function:
 
 ```console
@@ -524,7 +462,7 @@ $ docker buildx imagetools inspect --format '{{json (index .Image "linux/s390x")
 ```
 ```json
 {
-  "created": "2022-11-30T17:42:26.414957336Z",
+  "created": "2022-02-25T17:13:27.89891722Z",
   "architecture": "s390x",
   "os": "linux",
   "config": {
@@ -543,8 +481,8 @@ $ docker buildx imagetools inspect --format '{{json (index .Image "linux/s390x")
     "diff_ids": [
       "sha256:41048e32d0684349141cf05f629c5fc3c5915d1f3426b66dbb8953a540e01e1e",
       "sha256:2651209b9208fff6c053bc3c17353cb07874e50f1a9bc96d6afd03aef63de76a",
-      "sha256:88577322e65f094ce8ac27435880f1a8a9baadb569258026bb141770451bafcb",
-      "sha256:de8f9a790e4ed10ff1f1f8ea923c9da4f97246a7e200add2dc6650eba3f10a20"
+      "sha256:6741ed7e73039d853fa8902246a4c7e8bf9dd09652fd1b08251bc5f9e8876a7f",
+      "sha256:92ac046adeeb65c86ae3f0b458dee04ad4a462e417661c04d77642c66494f69b"
     ]
   },
   "history": [
@@ -563,23 +501,23 @@ $ docker buildx imagetools inspect --format '{{json (index .Image "linux/s390x")
       "comment": "buildkit.dockerfile.v0"
     },
     {
-      "created": "2022-08-25T00:39:25.652811078Z",
+      "created": "2022-02-24T00:34:00.924540012Z",
       "created_by": "COPY examples/buildctl-daemonless/buildctl-daemonless.sh /usr/bin/ # buildkit",
       "comment": "buildkit.dockerfile.v0"
     },
     {
-      "created": "2022-11-30T17:42:26.414957336Z",
+      "created": "2022-02-25T17:13:27.89891722Z",
       "created_by": "VOLUME [/var/lib/buildkit]",
       "comment": "buildkit.dockerfile.v0",
       "empty_layer": true
     },
     {
-      "created": "2022-11-30T17:42:26.414957336Z",
+      "created": "2022-02-25T17:13:27.89891722Z",
       "created_by": "COPY / /usr/bin/ # buildkit",
       "comment": "buildkit.dockerfile.v0"
     },
     {
-      "created": "2022-11-30T17:42:26.414957336Z",
+      "created": "2022-02-25T17:13:27.89891722Z",
       "created_by": "ENTRYPOINT [\"buildkitd\"]",
       "comment": "buildkit.dockerfile.v0",
       "empty_layer": true
@@ -603,24 +541,24 @@ $ docker buildx imagetools inspect --raw crazymax/loop | jq
   "schemaVersion": 2,
   "config": {
     "mediaType": "application/vnd.docker.container.image.v1+json",
-    "digest": "sha256:a98999183d2c7a8845f6d56496e51099ce6e4359ee7255504174b05430c4b78b",
-    "size": 2762
+    "digest": "sha256:7ace7d324e79b360b2db8b820d83081863d96d22e734cdf297a8e7fd83f6ceb3",
+    "size": 2298
   },
   "layers": [
     {
       "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
-      "digest": "sha256:8663204ce13b2961da55026a2034abb9e5afaaccf6a9cfb44ad71406dcd07c7b",
-      "size": 2818370
+      "digest": "sha256:5843afab387455b37944e709ee8c78d7520df80f8d01cf7f861aae63beeddb6b",
+      "size": 2811478
     },
     {
       "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
-      "digest": "sha256:f0868a92f8e1e5018ed4e60eb845ed4ff0e2229897f4105e5a4735c1d6fd874f",
-      "size": 1821402
+      "digest": "sha256:726d3732a87e1c430d67e8969de6b222a889d45e045ebae1a008a37ba38f3b1f",
+      "size": 1776812
     },
     {
       "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
-      "digest": "sha256:d010066dbdfcf7c12fca30cd4b567aa7218eb6762ab53169d043655b7a8d7f2e",
-      "size": 404457
+      "digest": "sha256:5d7cf9b33148a8f220c84f27dd2cfae46aca019a3ea3fbf7274f6d6dbfae8f3b",
+      "size": 382855
     }
   ]
 }
@@ -636,7 +574,7 @@ $ docker buildx imagetools inspect --raw moby/buildkit:master | jq
   "manifests": [
     {
       "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
-      "digest": "sha256:f9f41c85124686c2afe330a985066748a91d7a5d505777fe274df804ab5e077e",
+      "digest": "sha256:667d28c9fb33820ce686887a717a148e89fa77f9097f9352996bbcce99d352b1",
       "size": 1158,
       "platform": {
         "architecture": "amd64",
@@ -645,7 +583,7 @@ $ docker buildx imagetools inspect --raw moby/buildkit:master | jq
     },
     {
       "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
-      "digest": "sha256:82097c2be19c617aafb3c3e43c88548738d4b2bf3db5c36666283a918b390266",
+      "digest": "sha256:71789527b64ab3d7b3de01d364b449cd7f7a3da758218fbf73b9c9aae05a6775",
       "size": 1158,
       "platform": {
         "architecture": "arm",
@@ -655,7 +593,7 @@ $ docker buildx imagetools inspect --raw moby/buildkit:master | jq
     },
     {
       "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
-      "digest": "sha256:b6b91e6c823d7220ded7d3b688e571ba800b13d91bbc904c1d8053593e3ee42c",
+      "digest": "sha256:fb64667e1ce6ab0d05478f3a8402af07b27737598dcf9a510fb1d792b13a66be",
       "size": 1158,
       "platform": {
         "architecture": "arm64",
@@ -664,7 +602,7 @@ $ docker buildx imagetools inspect --raw moby/buildkit:master | jq
     },
     {
       "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
-      "digest": "sha256:797061bcc16778de048b96f769c018ec24da221088050bbe926ea3b8d51d77e8",
+      "digest": "sha256:1c3ddf95a0788e23f72f25800c05abc4458946685e2b66788c3d978cde6da92b",
       "size": 1158,
       "platform": {
         "architecture": "s390x",
@@ -673,7 +611,7 @@ $ docker buildx imagetools inspect --raw moby/buildkit:master | jq
     },
     {
       "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
-      "digest": "sha256:b93d3a84d18c4d0b8c279e77343d854d9b5177df7ea55cf468d461aa2523364e",
+      "digest": "sha256:05bcde6d460a284e5bc88026cd070277e8380355de3126cbc8fe8a452708c6b1",
       "size": 1159,
       "platform": {
         "architecture": "ppc64le",
@@ -682,7 +620,7 @@ $ docker buildx imagetools inspect --raw moby/buildkit:master | jq
     },
     {
       "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
-      "digest": "sha256:d5c950dd1b270d437c838187112a0cb44c9258248d7a3a8bcb42fae8f717dc01",
+      "digest": "sha256:c04c57765304ab84f4f9807fff3e11605c3a60e16435c734b02c723680f6bd6e",
       "size": 1158,
       "platform": {
         "architecture": "riscv64",

docs/reference/buildx_inspect.md

@@ -9,10 +9,10 @@ Inspect current builder instance
 
 ### Options
 
-| Name                        | Type     | Default | Description                                 |
-|:----------------------------|:---------|:--------|:--------------------------------------------|
-| [`--bootstrap`](#bootstrap) |          |         | Ensure builder has booted before inspecting |
-| [`--builder`](#builder)     | `string` |         | Override the configured builder instance    |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--bootstrap`](#bootstrap) |  |  | Ensure builder has booted before inspecting |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
 
 
 <!---MARKER_GEN_END-->
@@ -43,10 +43,6 @@ name of the builder to inspect to get information about that builder.
 The following example shows information about a builder instance named
 `elated_tesla`:
 
-> **Note**
->
-> Asterisk `*` next to node build platform(s) indicate they had been set manually during `buildx create`. Otherwise, it had been autodetected.
-
 ```console
 $ docker buildx inspect elated_tesla
 
@@ -57,12 +53,10 @@ Nodes:
 Name:      elated_tesla0
 Endpoint:  unix:///var/run/docker.sock
 Status:    running
-Buildkit:  v0.10.3
 Platforms: linux/amd64
 
 Name:      elated_tesla1
 Endpoint:  ssh://ubuntu@1.2.3.4
 Status:    running
-Buildkit:  v0.10.3
-Platforms: linux/arm64*, linux/arm/v7, linux/arm/v6
+Platforms: linux/arm64, linux/arm/v7, linux/arm/v6
 ```

docs/reference/buildx_ls.md

@@ -16,12 +16,13 @@ Lists all builder instances and the nodes for each instance
 
 ```console
 $ docker buildx ls
-NAME/NODE       DRIVER/ENDPOINT             STATUS  BUILDKIT PLATFORMS
+
+NAME/NODE       DRIVER/ENDPOINT             STATUS  PLATFORMS
 elated_tesla *  docker-container
-  elated_tesla0 unix:///var/run/docker.sock running v0.10.3  linux/amd64
-  elated_tesla1 ssh://ubuntu@1.2.3.4        running v0.10.3  linux/arm64*, linux/arm/v7, linux/arm/v6
+  elated_tesla0 unix:///var/run/docker.sock running linux/amd64
+  elated_tesla1 ssh://ubuntu@1.2.3.4        running linux/arm64*, linux/arm/v7, linux/arm/v6
 default         docker
-  default       default                     running 20.10.14 linux/amd64
+  default       default                     running linux/amd64
 ```
 
 Each builder has one or more nodes associated with it. The current builder's

docs/reference/buildx_prune.md

@@ -9,38 +9,18 @@ Remove build cache
 
 ### Options
 
-| Name                    | Type     | Default | Description                               |
-|:------------------------|:---------|:--------|:------------------------------------------|
-| `-a`, `--all`           |          |         | Include internal/frontend images          |
-| [`--builder`](#builder) | `string` |         | Override the configured builder instance  |
-| `--filter`              | `filter` |         | Provide filter values (e.g., `until=24h`) |
-| `-f`, `--force`         |          |         | Do not prompt for confirmation            |
-| `--keep-storage`        | `bytes`  | `0`     | Amount of disk space to keep for cache    |
-| `--verbose`             |          |         | Provide a more verbose output             |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| `-a`, `--all` |  |  | Remove all unused images, not just dangling ones |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| `--filter` | `filter` |  | Provide filter values (e.g., `until=24h`) |
+| `-f`, `--force` |  |  | Do not prompt for confirmation |
+| `--keep-storage` | `bytes` | `0` | Amount of disk space to keep for cache |
+| `--verbose` |  |  | Provide a more verbose output |
 
 
 <!---MARKER_GEN_END-->
 
-## Description
-
-Clears the build cache of the selected builder.
-
-You can finely control what cache data is kept using:
-
-- The `--filter=until=<duration>` flag to keep images that have been used in
-  the last `<duration>` time.
-
-  `<duration>` is a duration string, e.g. `24h` or `2h30m`, with allowable
-  units of `(h)ours`, `(m)inutes` and `(s)econds`.
-
-- The `--keep-storage=<size>` flag to keep `<size>` bytes of data in the cache.
-
-  `<size>` is a human-readable memory string, e.g. `128mb`, `2gb`, etc. Units
-  are case-insensitive.
-
-- The `--all` flag to allow clearing internal helper images and frontend images
-  set using the `#syntax=` directive or the `BUILDKIT_SYNTAX` build argument.
-
 ## Examples
 
 ### <a name="builder"></a> Override the configured builder instance (--builder)

docs/reference/buildx_rm.md

@@ -9,13 +9,13 @@ Remove a builder instance
 
 ### Options
 
-| Name                                | Type     | Default | Description                              |
-|:------------------------------------|:---------|:--------|:-----------------------------------------|
-| [`--all-inactive`](#all-inactive)   |          |         | Remove all inactive builders             |
-| [`--builder`](#builder)             | `string` |         | Override the configured builder instance |
-| [`-f`](#force), [`--force`](#force) |          |         | Do not prompt for confirmation           |
-| [`--keep-daemon`](#keep-daemon)     |          |         | Keep the buildkitd daemon running        |
-| [`--keep-state`](#keep-state)       |          |         | Keep BuildKit state                      |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--all-inactive`](#all-inactive) |  |  | Remove all inactive builders |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`-f`](#force), [`--force`](#force) |  |  | Do not prompt for confirmation |
+| [`--keep-daemon`](#keep-daemon) |  |  | Keep the buildkitd daemon running |
+| [`--keep-state`](#keep-state) |  |  | Keep BuildKit state |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_stop.md

@@ -9,9 +9,9 @@ Stop builder instance
 
 ### Options
 
-| Name                    | Type     | Default | Description                              |
-|:------------------------|:---------|:--------|:-----------------------------------------|
-| [`--builder`](#builder) | `string` |         | Override the configured builder instance |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_use.md

@@ -9,11 +9,11 @@ Set the current builder instance
 
 ### Options
 
-| Name                    | Type     | Default | Description                                |
-|:------------------------|:---------|:--------|:-------------------------------------------|
-| [`--builder`](#builder) | `string` |         | Override the configured builder instance   |
-| `--default`             |          |         | Set builder as default for current context |
-| `--global`              |          |         | Builder persists context changes           |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| `--default` |  |  | Set builder as default for current context |
+| `--global` |  |  | Builder persists context changes |
 
 
 <!---MARKER_GEN_END-->

driver/docker-container/driver.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"context"
 	"io"
+	"io/ioutil"
 	"net"
 	"os"
 	"path"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/docker/buildx/driver"
@@ -16,6 +16,7 @@ import (
 	"github.com/docker/buildx/util/confutil"
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/buildx/util/progress"
+	"github.com/docker/docker/api/types"
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/mount"
@@ -36,6 +37,7 @@ const (
 type Driver struct {
 	driver.InitConfig
 	factory      driver.Factory
+	userNSRemap  bool // true if dockerd is running with userns-remap mode
 	netMode      string
 	image        string
 	cgroupParent string
@@ -82,13 +84,13 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
 		if err != nil {
 			return err
 		}
-		rc, err := d.DockerAPI.ImageCreate(ctx, imageName, dockertypes.ImageCreateOptions{
+		rc, err := d.DockerAPI.ImageCreate(ctx, imageName, types.ImageCreateOptions{
 			RegistryAuth: ra,
 		})
 		if err != nil {
 			return err
 		}
-		_, err = io.Copy(io.Discard, rc)
+		_, err = io.Copy(ioutil.Discard, rc)
 		return err
 	}); err != nil {
 		// image pulling failed, check if it exists in local image store.
@@ -119,30 +121,19 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
 				},
 			},
 		}
+		if d.userNSRemap {
+			hc.UsernsMode = "host"
+		}
 		if d.netMode != "" {
 			hc.NetworkMode = container.NetworkMode(d.netMode)
 		}
-		if info, err := d.DockerAPI.Info(ctx); err == nil {
-			if info.CgroupDriver == "cgroupfs" {
-				// Place all buildkit containers inside this cgroup by default so limits can be attached
-				// to all build activity on the host.
-				hc.CgroupParent = "/docker/buildx"
-				if d.cgroupParent != "" {
-					hc.CgroupParent = d.cgroupParent
-				}
+		if info, err := d.DockerAPI.Info(ctx); err == nil && info.CgroupDriver == "cgroupfs" {
+			// Place all buildkit containers inside this cgroup by default so limits can be attached
+			// to all build activity on the host.
+			hc.CgroupParent = "/docker/buildx"
+			if d.cgroupParent != "" {
+				hc.CgroupParent = d.cgroupParent
 			}
-
-			secOpts, err := dockertypes.DecodeSecurityOptions(info.SecurityOptions)
-			if err != nil {
-				return err
-			}
-			for _, f := range secOpts {
-				if f.Name == "userns" {
-					hc.UsernsMode = "host"
-					break
-				}
-			}
-
 		}
 		_, err := d.DockerAPI.ContainerCreate(ctx, cfg, hc, &network.NetworkingConfig{}, nil, d.Name)
 		if err != nil {
@@ -195,7 +186,7 @@ func (d *Driver) wait(ctx context.Context, l progress.SubLogger) error {
 }
 
 func (d *Driver) copyLogs(ctx context.Context, l progress.SubLogger) error {
-	rc, err := d.DockerAPI.ContainerLogs(ctx, d.Name, dockertypes.ContainerLogsOptions{
+	rc, err := d.DockerAPI.ContainerLogs(ctx, d.Name, types.ContainerLogsOptions{
 		ShowStdout: true, ShowStderr: true,
 	})
 	if err != nil {
@@ -228,7 +219,7 @@ func (d *Driver) copyToContainer(ctx context.Context, files map[string][]byte) e
 }
 
 func (d *Driver) exec(ctx context.Context, cmd []string) (string, net.Conn, error) {
-	execConfig := dockertypes.ExecConfig{
+	execConfig := types.ExecConfig{
 		Cmd:          cmd,
 		AttachStdin:  true,
 		AttachStdout: true,
@@ -244,7 +235,7 @@ func (d *Driver) exec(ctx context.Context, cmd []string) (string, net.Conn, erro
 		return "", nil, errors.New("exec ID empty")
 	}
 
-	resp, err := d.DockerAPI.ContainerExecAttach(ctx, execID, dockertypes.ExecStartCheck{})
+	resp, err := d.DockerAPI.ContainerExecAttach(ctx, execID, types.ExecStartCheck{})
 	if err != nil {
 		return "", nil, err
 	}
@@ -271,7 +262,7 @@ func (d *Driver) run(ctx context.Context, cmd []string, stdout, stderr io.Writer
 }
 
 func (d *Driver) start(ctx context.Context, l progress.SubLogger) error {
-	return d.DockerAPI.ContainerStart(ctx, d.Name, dockertypes.ContainerStartOptions{})
+	return d.DockerAPI.ContainerStart(ctx, d.Name, types.ContainerStartOptions{})
 }
 
 func (d *Driver) Info(ctx context.Context) (*driver.Info, error) {
@@ -296,29 +287,13 @@ func (d *Driver) Info(ctx context.Context) (*driver.Info, error) {
 	}, nil
 }
 
-func (d *Driver) Version(ctx context.Context) (string, error) {
-	bufStdout := &bytes.Buffer{}
-	bufStderr := &bytes.Buffer{}
-	if err := d.run(ctx, []string{"buildkitd", "--version"}, bufStdout, bufStderr); err != nil {
-		if bufStderr.Len() > 0 {
-			return "", errors.Wrap(err, bufStderr.String())
-		}
-		return "", err
-	}
-	version := strings.Fields(bufStdout.String())
-	if len(version) != 4 {
-		return "", errors.Errorf("unexpected version format: %s", bufStdout.String())
-	}
-	return version[2], nil
-}
-
 func (d *Driver) Stop(ctx context.Context, force bool) error {
 	info, err := d.Info(ctx)
 	if err != nil {
 		return err
 	}
 	if info.Status == driver.Running {
-		return d.DockerAPI.ContainerStop(ctx, d.Name, container.StopOptions{})
+		return d.DockerAPI.ContainerStop(ctx, d.Name, nil)
 	}
 	return nil
 }
@@ -366,14 +341,11 @@ func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
 		return nil, err
 	}
 
-	var opts []client.ClientOpt
-	opts = append(opts, client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
+	td, _ := exp.(client.TracerDelegate)
+
+	return client.New(ctx, "", client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
 		return conn, nil
-	}))
-	if td, ok := exp.(client.TracerDelegate); ok {
-		opts = append(opts, client.WithTracerDelegate(td))
-	}
-	return client.New(ctx, "", opts...)
+	}), client.WithTracerDelegate(td))
 }
 
 func (d *Driver) Factory() driver.Factory {