Merge pull request #2261 from dvdksn/backport_docs-cli-reference-urlscheme

[v0.12 backport] docs: update external links

.github/dependabot.yml

@@ -5,11 +5,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    ignore:
-      # ignore this dependency
-      # it seems a bug with dependabot as pining to commit sha should not
-      # trigger a new version: https://github.com/docker/buildx/pull/2222#issuecomment-1919092153
-      - dependency-name: "docker/docs"
     labels:
       - "dependencies"
       - "bot"

.github/workflows/build.yml

@@ -24,13 +24,9 @@ env:
   REPO_SLUG: "docker/buildx-bin"
   DESTDIR: "./bin"
   TEST_CACHE_SCOPE: "test"
-  TESTFLAGS: "-v --parallel=6 --timeout=30m"
-  GOTESTSUM_FORMAT: "standard-verbose"
-  GO_VERSION: "1.21"
-  GOTESTSUM_VERSION: "v1.9.0"  # same as one in Dockerfile
 
 jobs:
-  prepare-test-integration:
+  prepare-test:
     runs-on: ubuntu-22.04
     steps:
       -
@@ -55,12 +51,14 @@ jobs:
             *.cache-from=type=gha,scope=${{ env.TEST_CACHE_SCOPE }}
             *.cache-to=type=gha,scope=${{ env.TEST_CACHE_SCOPE }}
 
-  test-integration:
+  test:
     runs-on: ubuntu-22.04
     needs:
-      - prepare-test-integration
+      - prepare-test
     env:
+      TESTFLAGS: "-v --parallel=6 --timeout=30m"
       TESTFLAGS_DOCKER: "-v --parallel=1 --timeout=30m"
+      GOTESTSUM_FORMAT: "standard-verbose"
       TEST_IMAGE_BUILD: "0"
       TEST_IMAGE_ID: "buildx-tests"
     strategy:
@@ -73,11 +71,10 @@ jobs:
           - remote
         pkg:
           - ./tests
+        include:
+          - pkg: ./...
+            skip-integration-tests: 1
     steps:
-      -
-        name: Prepare
-        run: |
-          echo "TESTREPORTS_NAME=${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.worker }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
       -
         name: Checkout
         uses: actions/checkout@v4
@@ -104,106 +101,33 @@ jobs:
       -
         name: Test
         run: |
+          export TEST_REPORT_SUFFIX=-${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.worker }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')
           ./hack/test
         env:
-          TEST_REPORT_SUFFIX: "-${{ env.TESTREPORTS_NAME }}"
           TEST_DOCKERD: "${{ startsWith(matrix.worker, 'docker') && '1' || '0' }}"
           TESTFLAGS: "${{ (matrix.worker == 'docker' || matrix.worker == 'docker\\+containerd') && env.TESTFLAGS_DOCKER || env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"
           TESTPKGS: "${{ matrix.pkg }}"
+          SKIP_INTEGRATION_TESTS: "${{ matrix.skip-integration-tests }}"
       -
         name: Send to Codecov
         if: always()
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v3
         with:
           directory: ./bin/testreports
-          flags: integration
-          token: ${{ secrets.CODECOV_TOKEN }}
       -
         name: Generate annotations
         if: always()
-        uses: crazy-max/.github/.github/actions/gotest-annotations@fa6141aedf23596fb8bdcceab9cce8dadaa31bd9
+        uses: crazy-max/.github/.github/actions/gotest-annotations@1a64ea6d01db9a48aa61954cb20e265782c167d9
         with:
           directory: ./bin/testreports
       -
         name: Upload test reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: test-reports-${{ env.TESTREPORTS_NAME }}
+          name: test-reports
           path: ./bin/testreports
 
-  test-unit:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-22.04
-          - macos-12
-          - windows-2022
-    env:
-      SKIP_INTEGRATION_TESTS: 1
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "${{ env.GO_VERSION }}"
-      -
-        name: Prepare
-        run: |
-          testreportsName=${{ github.job }}--${{ matrix.os }}
-          testreportsBaseDir=./bin/testreports
-          testreportsDir=$testreportsBaseDir/$testreportsName
-          echo "TESTREPORTS_NAME=$testreportsName" >> $GITHUB_ENV
-          echo "TESTREPORTS_BASEDIR=$testreportsBaseDir" >> $GITHUB_ENV
-          echo "TESTREPORTS_DIR=$testreportsDir" >> $GITHUB_ENV
-          mkdir -p $testreportsDir
-        shell: bash
-      -
-        name: Install gotestsum
-        run: |
-          go install gotest.tools/gotestsum@${{ env.GOTESTSUM_VERSION }}
-      -
-        name: Test
-        env:
-          TMPDIR: ${{ runner.temp }}
-        run: |
-          gotestsum \
-            --jsonfile="${{ env.TESTREPORTS_DIR }}/go-test-report.json" \
-            --junitfile="${{ env.TESTREPORTS_DIR }}/junit-report.xml" \
-            --packages="./..." \
-            -- \
-              "-mod=vendor" \
-              "-coverprofile" "${{ env.TESTREPORTS_DIR }}/coverage.txt" \
-              "-covermode" "atomic" ${{ env.TESTFLAGS }}
-        shell: bash
-      -
-        name: Send to Codecov
-        if: always()
-        uses: codecov/codecov-action@v4
-        with:
-          directory: ${{ env.TESTREPORTS_DIR }}
-          env_vars: RUNNER_OS
-          flags: unit
-          token: ${{ secrets.CODECOV_TOKEN }}
-      -
-        name: Generate annotations
-        if: always()
-        uses: crazy-max/.github/.github/actions/gotest-annotations@fa6141aedf23596fb8bdcceab9cce8dadaa31bd9
-        with:
-          directory: ${{ env.TESTREPORTS_DIR }}
-      -
-        name: Upload test reports
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-reports-${{ env.TESTREPORTS_NAME }}
-          path: ${{ env.TESTREPORTS_BASEDIR }}
-
   prepare-binaries:
     runs-on: ubuntu-22.04
     outputs:
@@ -259,17 +183,16 @@ jobs:
           CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }},mode=max
       -
         name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: buildx-${{ env.PLATFORM_PAIR }}
+          name: buildx
           path: ${{ env.DESTDIR }}/*
           if-no-files-found: error
 
   bin-image:
     runs-on: ubuntu-22.04
     needs:
-      - test-integration
+      - test
-      - test-unit
     if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/buildx' }}
     steps:
       -
@@ -321,8 +244,7 @@ jobs:
   release:
     runs-on: ubuntu-22.04
     needs:
-      - test-integration
+      - test
-      - test-unit
       - binaries
     steps:
       -
@@ -330,11 +252,10 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Download binaries
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
+          name: buildx
           path: ${{ env.DESTDIR }}
-          pattern: buildx-*
-          merge-multiple: true
       -
         name: Create checksums
         run: ./hack/hash-files

.github/workflows/codeql.yml

@@ -13,7 +13,7 @@ permissions:
   security-events: write
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: 1.21.6
 
 jobs:
   codeql:
@@ -24,19 +24,19 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
       -
         name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
         with:
           languages: go
       -
         name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v2
       -
         name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2
         with:
           category: "/language:go"

.github/workflows/docs-release.yml

@@ -20,13 +20,12 @@ jobs:
       -
         name: Prepare
         run: |
-          rm -rf ./data/buildx/*
+          rm -rf ./_data/buildx/*
-          rm -rf ./_vendor/github.com/docker/buildx
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       -
-        name: Generate yaml
+        name: Build docs
         uses: docker/bake-action@v4
         with:
           source: ${{ github.server_url }}/${{ github.repository }}.git#${{ github.event.release.name }}
@@ -36,24 +35,20 @@ jobs:
         env:
           DOCS_FORMATS: yaml
       -
-        name: Copy yaml
+        name: Copy files
         run: |
-          cp /tmp/buildx-docs/out/reference/*.yaml ./data/buildx/
+          cp /tmp/buildx-docs/out/reference/*.yaml ./_data/buildx/
       -
-        name: Update vendor
+        name: Commit changes
-        uses: docker/bake-action@v4
+        run: |
-        with:
+          git add -A .
-          source: ${{ github.server_url }}/${{ github.repository }}.git#${{ github.event.release.name }}
-          targets: vendor
-          set: |
-            vendor.args.MODULE=github.com/docker/buildx@${{ github.event.release.name }}
       -
         name: Create PR on docs repo
-        uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
         with:
           token: ${{ secrets.GHPAT_DOCS_DISPATCH }}
           push-to-fork: docker-tools-robot/docker.github.io
-          commit-message: "vendor: github.com/docker/buildx ${{ github.event.release.name }}"
+          commit-message: "build: update buildx reference to ${{ github.event.release.name }}"
           signoff: true
           branch: dispatch/buildx-ref-${{ github.event.release.name }}
           delete-branch: true

.github/workflows/docs-upstream.yml

@@ -45,18 +45,18 @@ jobs:
           DOCS_FORMATS: yaml
       -
         name: Upload reference YAML docs
-        uses: actions/upload-artifact@v4
+        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@6b73b05acb21edf7995cc5b3c6672d8e314cee7a  # pin for artifact v4 support: https://github.com/docker/docs/pull/19220
+    uses: docker/docs/.github/workflows/validate-upstream.yml@e864c797e391fa35aecf1ddcecdbdeb683546424  # pin for artifact v3 support
     needs:
       - docs-yaml
     with:
       module-name: docker/buildx
       data-files-id: docs-yaml
       data-files-folder: buildx
-      create-placeholder-stubs: true
+      data-files-placeholder-folder: engine/reference/commandline

.github/workflows/e2e.yml

@@ -46,7 +46,7 @@ jobs:
           mv ${{ env.DESTDIR }}/build/buildx ${{ env.DESTDIR }}/build/docker-buildx
       -
         name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: binary
           path: ${{ env.DESTDIR }}/build
@@ -103,7 +103,7 @@ jobs:
         if: matrix.driver == 'docker' || matrix.driver == 'docker-container'
       -
         name: Install buildx
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: binary
           path: /home/runner/.docker/cli-plugins
@@ -132,7 +132,7 @@ jobs:
       -
         name: Install k3s
         if: matrix.driver == 'kubernetes'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         with:
           script: |
             const fs = require('fs');

.github/workflows/validate.yml

@@ -19,8 +19,6 @@ on:
 jobs:
   validate:
     runs-on: ubuntu-22.04
-    env:
-      GOLANGCI_LINT_MULTIPLATFORM: 1
     strategy:
       fail-fast: false
       matrix:

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  timeout: 30m
+  timeout: 10m
   skip-files:
     - ".*\\.pb\\.go$"
 

Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.21.6
-ARG XX_VERSION=1.4.0
+ARG XX_VERSION=1.2.1
 
-ARG DOCKER_VERSION=25.0.2
+ARG DOCKER_VERSION=24.0.6
 ARG GOTESTSUM_VERSION=v1.9.0
 ARG REGISTRY_VERSION=2.8.0
-ARG BUILDKIT_VERSION=v0.12.5
+ARG BUILDKIT_VERSION=v0.11.6
 
 # xx is a helper for cross-compilation
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

bake/bake.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	composecli "github.com/compose-spec/compose-go/v2/cli"
+	composecli "github.com/compose-spec/compose-go/cli"
 	"github.com/docker/buildx/bake/hclparser"
 	"github.com/docker/buildx/build"
 	controllerapi "github.com/docker/buildx/controller/pb"
@@ -21,7 +21,6 @@ import (
 	"github.com/docker/buildx/util/platformutil"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/config"
-	dockeropts "github.com/docker/cli/opts"
 	hcl "github.com/hashicorp/hcl/v2"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/client/llb"
@@ -700,8 +699,6 @@ type Target struct {
 	NoCache          *bool              `json:"no-cache,omitempty" hcl:"no-cache,optional" cty:"no-cache"`
 	NetworkMode      *string            `json:"-" hcl:"-" cty:"-"`
 	NoCacheFilter    []string           `json:"no-cache-filter,omitempty" hcl:"no-cache-filter,optional" cty:"no-cache-filter"`
-	ShmSize          *string            `json:"shm-size,omitempty" hcl:"shm-size,optional"`
-	Ulimits          []string           `json:"ulimits,omitempty" hcl:"ulimits,optional"`
 	// 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
@@ -724,7 +721,6 @@ func (t *Target) normalize() {
 	t.CacheTo = removeDupes(t.CacheTo)
 	t.Outputs = removeDupes(t.Outputs)
 	t.NoCacheFilter = removeDupes(t.NoCacheFilter)
-	t.Ulimits = removeDupes(t.Ulimits)
 
 	for k, v := range t.Contexts {
 		if v == "" {
@@ -813,12 +809,6 @@ func (t *Target) Merge(t2 *Target) {
 	if t2.NoCacheFilter != nil { // merge
 		t.NoCacheFilter = append(t.NoCacheFilter, t2.NoCacheFilter...)
 	}
-	if t2.ShmSize != nil { // no merge
-		t.ShmSize = t2.ShmSize
-	}
-	if t2.Ulimits != nil { // merge
-		t.Ulimits = append(t.Ulimits, t2.Ulimits...)
-	}
 	t.Inherits = append(t.Inherits, t2.Inherits...)
 }
 
@@ -883,10 +873,6 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
 			t.NoCache = &noCache
 		case "no-cache-filter":
 			t.NoCacheFilter = o.ArrValue
-		case "shm-size":
-			t.ShmSize = &value
-		case "ulimits":
-			t.Ulimits = o.ArrValue
 		case "pull":
 			pull, err := strconv.ParseBool(value)
 			if err != nil {
@@ -1025,17 +1011,12 @@ func (t *Target) GetName(ectx *hcl.EvalContext, block *hcl.Block, loadDeps func(
 }
 
 func TargetsToBuildOpt(m map[string]*Target, inp *Input) (map[string]build.Options, error) {
-	// make sure local credentials are loaded multiple times for different targets
-	dockerConfig := config.LoadDefaultConfigFile(os.Stderr)
-	authProvider := authprovider.NewDockerAuthProvider(dockerConfig, nil)
-
 	m2 := make(map[string]build.Options, len(m))
 	for k, v := range m {
 		bo, err := toBuildOpt(v, inp)
 		if err != nil {
 			return nil, err
 		}
-		bo.Session = append(bo.Session, authProvider)
 		m2[k] = *bo
 	}
 	return m2, nil
@@ -1247,12 +1228,6 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 	if t.NetworkMode != nil {
 		networkMode = *t.NetworkMode
 	}
-	shmSize := new(dockeropts.MemBytes)
-	if t.ShmSize != nil {
-		if err := shmSize.Set(*t.ShmSize); err != nil {
-			return nil, errors.Errorf("invalid value %s for membytes key shm-size", *t.ShmSize)
-		}
-	}
 
 	bo := &build.Options{
 		Inputs:        bi,
@@ -1264,7 +1239,6 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 		Pull:          pull,
 		NetworkMode:   networkMode,
 		Linked:        t.linked,
-		ShmSize:       *shmSize,
 	}
 
 	platforms, err := platformutil.Parse(t.Platforms)
@@ -1273,6 +1247,9 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 	}
 	bo.Platforms = platforms
 
+	dockerConfig := config.LoadDefaultConfigFile(os.Stderr)
+	bo.Session = append(bo.Session, authprovider.NewDockerAuthProvider(dockerConfig, nil))
+
 	secrets, err := buildflags.ParseSecretSpecs(t.Secrets)
 	if err != nil {
 		return nil, err
@@ -1342,14 +1319,6 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 		return nil, err
 	}
 
-	ulimits := dockeropts.NewUlimitOpt(nil)
-	for _, field := range t.Ulimits {
-		if err := ulimits.Set(field); err != nil {
-			return nil, err
-		}
-	}
-	bo.Ulimits = ulimits
-
 	return bo, nil
 }
 

bake/bake_test.go

@@ -22,8 +22,6 @@ target "webDEP" {
 		VAR_BOTH = "webDEP"
 	}
 	no-cache = true
-	shm-size = "128m"
-	ulimits = ["nofile=1024:1024"]
 }
 
 target "webapp" {
@@ -47,8 +45,6 @@ target "webapp" {
 		require.Equal(t, ".", *m["webapp"].Context)
 		require.Equal(t, ptrstr("webDEP"), m["webapp"].Args["VAR_INHERITED"])
 		require.Equal(t, true, *m["webapp"].NoCache)
-		require.Equal(t, "128m", *m["webapp"].ShmSize)
-		require.Equal(t, []string{"nofile=1024:1024"}, m["webapp"].Ulimits)
 		require.Nil(t, m["webapp"].Pull)
 
 		require.Equal(t, 1, len(g))
@@ -133,12 +129,6 @@ target "webapp" {
 		require.Equal(t, []string{"webapp"}, g["default"].Targets)
 	})
 
-	t.Run("ShmSizeOverride", func(t *testing.T) {
-		m, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.shm-size=256m"}, nil)
-		require.NoError(t, err)
-		require.Equal(t, "256m", *m["webapp"].ShmSize)
-	})
-
 	t.Run("PullOverride", func(t *testing.T) {
 		t.Parallel()
 		m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.pull=false"}, nil)
@@ -307,6 +297,9 @@ services:
 
 	ctx := context.TODO()
 
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
 	m, g, err := ReadTargets(ctx, []File{fp, fp2, fp3}, []string{"default"}, nil, nil)
 	require.NoError(t, err)
 
@@ -315,7 +308,7 @@ services:
 
 	require.True(t, ok)
 	require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile)
-	require.Equal(t, ".", *m["webapp"].Context)
+	require.Equal(t, cwd, *m["webapp"].Context)
 	require.Equal(t, ptrstr("1"), m["webapp"].Args["buildno"])
 	require.Equal(t, ptrstr("12"), m["webapp"].Args["buildno2"])
 
@@ -354,6 +347,9 @@ services:
 
 	ctx := context.TODO()
 
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
 	m, _, err := ReadTargets(ctx, []File{fp}, []string{"web.app"}, nil, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(m))
@@ -376,7 +372,7 @@ services:
 	_, 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, cwd, *m["web_app"].Context)
 	require.Equal(t, ptrstr("1"), m["web_app"].Args["buildno"])
 	require.Equal(t, ptrstr("12"), m["web_app"].Args["buildno2"])
 
@@ -585,6 +581,9 @@ services:
 
 	ctx := context.TODO()
 
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
 	m, _, err := ReadTargets(ctx, []File{fp, fp2}, []string{"app1", "app2"}, nil, nil)
 	require.NoError(t, err)
 
@@ -597,7 +596,7 @@ services:
 	require.Equal(t, "Dockerfile", *m["app1"].Dockerfile)
 	require.Equal(t, ".", *m["app1"].Context)
 	require.Equal(t, "Dockerfile", *m["app2"].Dockerfile)
-	require.Equal(t, ".", *m["app2"].Context)
+	require.Equal(t, cwd, *m["app2"].Context)
 }
 
 func TestReadContextFromTargetChain(t *testing.T) {

bake/compose.go

@@ -2,16 +2,13 @@ package bake
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/compose-spec/compose-go/v2/dotenv"
+	"github.com/compose-spec/compose-go/dotenv"
-	"github.com/compose-spec/compose-go/v2/loader"
+	"github.com/compose-spec/compose-go/loader"
-	composetypes "github.com/compose-spec/compose-go/v2/types"
+	compose "github.com/compose-spec/compose-go/types"
-	dockeropts "github.com/docker/cli/opts"
-	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v3"
 )
@@ -21,9 +18,9 @@ func ParseComposeFiles(fs []File) (*Config, error) {
 	if err != nil {
 		return nil, err
 	}
-	var cfgs []composetypes.ConfigFile
+	var cfgs []compose.ConfigFile
 	for _, f := range fs {
-		cfgs = append(cfgs, composetypes.ConfigFile{
+		cfgs = append(cfgs, compose.ConfigFile{
 			Filename: f.Name,
 			Content:  f.Data,
 		})
@@ -31,11 +28,11 @@ func ParseComposeFiles(fs []File) (*Config, error) {
 	return ParseCompose(cfgs, envs)
 }
 
-func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Config, error) {
+func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, error) {
 	if envs == nil {
 		envs = make(map[string]string)
 	}
-	cfg, err := loader.LoadWithContext(context.Background(), composetypes.ConfigDetails{
+	cfg, err := loader.LoadWithContext(context.Background(), compose.ConfigDetails{
 		ConfigFiles: cfgs,
 		Environment: envs,
 	}, func(options *loader.Options) {
@@ -89,24 +86,6 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
 				}
 			}
 
-			var shmSize *string
-			if s.Build.ShmSize > 0 {
-				shmSizeBytes := dockeropts.MemBytes(s.Build.ShmSize)
-				shmSizeStr := shmSizeBytes.String()
-				shmSize = &shmSizeStr
-			}
-
-			var ulimits []string
-			if s.Build.Ulimits != nil {
-				for n, u := range s.Build.Ulimits {
-					ulimit, err := units.ParseUlimit(fmt.Sprintf("%s=%d:%d", n, u.Soft, u.Hard))
-					if err != nil {
-						return nil, err
-					}
-					ulimits = append(ulimits, ulimit.String())
-				}
-			}
-
 			var secrets []string
 			for _, bs := range s.Build.Secrets {
 				secret, err := composeToBuildkitSecret(bs, cfg.Secrets[bs.Source])
@@ -143,8 +122,6 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
 				CacheTo:     s.Build.CacheTo,
 				NetworkMode: &s.Build.Network,
 				Secrets:     secrets,
-				ShmSize:     shmSize,
-				Ulimits:     ulimits,
 			}
 			if err = t.composeExtTarget(s.Build.Extensions); err != nil {
 				return nil, err
@@ -182,8 +159,8 @@ func validateComposeFile(dt []byte, fn string) (bool, error) {
 }
 
 func validateCompose(dt []byte, envs map[string]string) error {
-	_, err := loader.Load(composetypes.ConfigDetails{
+	_, err := loader.Load(compose.ConfigDetails{
-		ConfigFiles: []composetypes.ConfigFile{
+		ConfigFiles: []compose.ConfigFile{
 			{
 				Content: dt,
 			},
@@ -246,7 +223,7 @@ func loadDotEnv(curenv map[string]string, workingDir string) (map[string]string,
 	return curenv, nil
 }
 
-func flatten(in composetypes.MappingWithEquals) map[string]*string {
+func flatten(in compose.MappingWithEquals) map[string]*string {
 	if len(in) == 0 {
 		return nil
 	}
@@ -350,8 +327,8 @@ func (t *Target) composeExtTarget(exts map[string]interface{}) error {
 
 // composeToBuildkitSecret converts secret from compose format to buildkit's
 // csv format.
-func composeToBuildkitSecret(inp composetypes.ServiceSecretConfig, psecret composetypes.SecretConfig) (string, error) {
+func composeToBuildkitSecret(inp compose.ServiceSecretConfig, psecret compose.SecretConfig) (string, error) {
-	if psecret.External {
+	if psecret.External.External {
 		return "", errors.Errorf("unsupported external secret %s", psecret.Name)
 	}
 

bake/compose_test.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"testing"
 
-	composetypes "github.com/compose-spec/compose-go/v2/types"
+	compose "github.com/compose-spec/compose-go/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -49,7 +49,10 @@ secrets:
     file: /root/.aws/credentials
 `)
 
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 
 	require.Equal(t, 1, len(c.Groups))
@@ -62,12 +65,12 @@ secrets:
 		return c.Targets[i].Name < c.Targets[j].Name
 	})
 	require.Equal(t, "db", c.Targets[0].Name)
-	require.Equal(t, "db", *c.Targets[0].Context)
+	require.Equal(t, filepath.Join(cwd, "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, filepath.Join(cwd, "dir"), *c.Targets[1].Context)
-	require.Equal(t, map[string]string{"foo": "bar"}, c.Targets[1].Contexts)
+	require.Equal(t, map[string]string{"foo": filepath.Join(cwd, "bar")}, c.Targets[1].Contexts)
 	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"])
@@ -80,7 +83,7 @@ secrets:
 	}, c.Targets[1].Secrets)
 
 	require.Equal(t, "webapp2", c.Targets[2].Name)
-	require.Equal(t, "dir", *c.Targets[2].Context)
+	require.Equal(t, filepath.Join(cwd, "dir"), *c.Targets[2].Context)
 	require.Equal(t, "FROM alpine\n", *c.Targets[2].DockerfileInline)
 }
 
@@ -92,7 +95,7 @@ services:
     webapp:
         build: ./db
 `)
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(c.Groups))
 	require.Equal(t, 1, len(c.Targets))
@@ -111,7 +114,7 @@ services:
       target: webapp
 `)
 
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 
 	require.Equal(t, 2, len(c.Targets))
@@ -136,7 +139,7 @@ services:
       target: webapp
 `)
 
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 	require.Equal(t, 2, len(c.Targets))
 	sort.Slice(c.Targets, func(i, j int) bool {
@@ -167,7 +170,7 @@ services:
 	t.Setenv("BAR", "foo")
 	t.Setenv("ZZZ_BAR", "zzz_foo")
 
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, sliceToMap(os.Environ()))
+	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, sliceToMap(os.Environ()))
 	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"])
@@ -181,7 +184,7 @@ services:
     entrypoint: echo 1
 `)
 
-	_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.Error(t, err)
 }
 
@@ -206,7 +209,7 @@ networks:
           gateway: 10.5.0.254
 `)
 
-	_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 }
 
@@ -223,7 +226,7 @@ services:
         - bar
 `)
 
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 	require.Equal(t, []string{"foo", "bar"}, c.Targets[0].Tags)
 }
@@ -260,7 +263,7 @@ networks:
     name: test-net
 `)
 
-	_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 }
 
@@ -303,11 +306,6 @@ services:
       args:
         CT_ECR: foo
         CT_TAG: bar
-      shm_size: 128m
-      ulimits:
-        nofile:
-          soft: 1024
-          hard: 1024
       x-bake:
         secret:
           - id=mysecret,src=/local/secret
@@ -318,7 +316,7 @@ services:
         no-cache: true
 `)
 
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 	require.Equal(t, 2, len(c.Targets))
 	sort.Slice(c.Targets, func(i, j int) bool {
@@ -337,8 +335,6 @@ services:
 	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)
-	require.Equal(t, ptrstr("128MiB"), c.Targets[1].ShmSize)
-	require.Equal(t, []string{"nofile=1024:1024"}, c.Targets[1].Ulimits)
 }
 
 func TestComposeExtDedup(t *testing.T) {
@@ -364,7 +360,7 @@ services:
           - type=local,dest=path/to/cache
 `)
 
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	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)
@@ -397,7 +393,7 @@ services:
       - ` + envf.Name() + `
 `)
 
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	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)
 }
@@ -443,7 +439,7 @@ services:
         published: "3306"
         protocol: tcp
 `)
-	_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 }
 
@@ -489,7 +485,7 @@ func TestServiceName(t *testing.T) {
 	for _, tt := range cases {
 		tt := tt
 		t.Run(tt.svc, func(t *testing.T) {
-			_, err := ParseCompose([]composetypes.ConfigFile{{Content: []byte(`
+			_, err := ParseCompose([]compose.ConfigFile{{Content: []byte(`
 services:
   ` + tt.svc + `:
     build:
@@ -560,7 +556,7 @@ services:
 	for _, tt := range cases {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			_, err := ParseCompose([]composetypes.ConfigFile{{Content: tt.dt}}, nil)
+			_, err := ParseCompose([]compose.ConfigFile{{Content: tt.dt}}, nil)
 			if tt.wantErr {
 				require.Error(t, err)
 			} else {
@@ -658,7 +654,7 @@ services:
         bar: "baz"
 `)
 
-	c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	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)
 }
@@ -677,7 +673,7 @@ services:
     build:
      context: .
 `)
-	_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 }
 
@@ -708,7 +704,7 @@ services:
 
 	chdir(t, tmpdir)
 	c, err := ParseComposeFiles([]File{{
-		Name: "composetypes.yml",
+		Name: "compose.yml",
 		Data: dt,
 	}})
 	require.NoError(t, err)
@@ -738,7 +734,7 @@ services:
             - node_modules/
 `)
 
-	_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
+	_, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
 	require.NoError(t, err)
 }
 

build/build.go

@@ -4,8 +4,10 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"crypto/rand"
 	_ "crypto/sha256" // ensure digests can be computed
 	"encoding/base64"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -24,16 +26,14 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/driver"
-	"github.com/docker/buildx/util/confutil"
 	"github.com/docker/buildx/util/desktop"
 	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/buildx/util/imagetools"
-	"github.com/docker/buildx/util/osutil"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/buildx/util/resolver"
 	"github.com/docker/buildx/util/waitmap"
 	"github.com/docker/cli/opts"
-	imagetypes "github.com/docker/docker/api/types/image"
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/builder/remotecontext/urlutil"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/moby/buildkit/client"
@@ -118,11 +118,6 @@ type NamedContext struct {
 	State *llb.State
 }
 
-type reqForNode struct {
-	*resolvedNode
-	so *client.SolveOpt
-}
-
 func filterAvailableNodes(nodes []builder.Node) ([]builder.Node, error) {
 	out := make([]builder.Node, 0, len(nodes))
 	err := errors.Errorf("no drivers found")
@@ -140,6 +135,218 @@ func filterAvailableNodes(nodes []builder.Node) ([]builder.Node, error) {
 	return nil, err
 }
 
+type driverPair struct {
+	driverIndex int
+	platforms   []specs.Platform
+	so          *client.SolveOpt
+	bopts       gateway.BuildOpts
+}
+
+func driverIndexes(m map[string][]driverPair) []int {
+	out := make([]int, 0, len(m))
+	visited := map[int]struct{}{}
+	for _, dp := range m {
+		for _, d := range dp {
+			if _, ok := visited[d.driverIndex]; ok {
+				continue
+			}
+			visited[d.driverIndex] = struct{}{}
+			out = append(out, d.driverIndex)
+		}
+	}
+	return out
+}
+
+func allIndexes(l int) []int {
+	out := make([]int, 0, l)
+	for i := 0; i < l; i++ {
+		out = append(out, i)
+	}
+	return out
+}
+
+func ensureBooted(ctx context.Context, nodes []builder.Node, idxs []int, pw progress.Writer) ([]*client.Client, error) {
+	clients := make([]*client.Client, len(nodes))
+
+	baseCtx := ctx
+	eg, ctx := errgroup.WithContext(ctx)
+
+	for _, i := range idxs {
+		func(i int) {
+			eg.Go(func() error {
+				c, err := driver.Boot(ctx, baseCtx, nodes[i].Driver, pw)
+				if err != nil {
+					return err
+				}
+				clients[i] = c
+				return nil
+			})
+		}(i)
+	}
+
+	if err := eg.Wait(); err != nil {
+		return nil, err
+	}
+
+	return clients, nil
+}
+
+func splitToDriverPairs(availablePlatforms map[string]int, opt map[string]Options) map[string][]driverPair {
+	m := map[string][]driverPair{}
+	for k, opt := range opt {
+		mm := map[int][]specs.Platform{}
+		for _, p := range opt.Platforms {
+			k := platforms.Format(p)
+			idx := availablePlatforms[k] // default 0
+			pp := mm[idx]
+			pp = append(pp, p)
+			mm[idx] = pp
+		}
+		// if no platform is specified, use first driver
+		if len(mm) == 0 {
+			mm[0] = nil
+		}
+		dps := make([]driverPair, 0, 2)
+		for idx, pp := range mm {
+			dps = append(dps, driverPair{driverIndex: idx, platforms: pp})
+		}
+		m[k] = dps
+	}
+	return m
+}
+
+func resolveDrivers(ctx context.Context, nodes []builder.Node, opt map[string]Options, pw progress.Writer) (map[string][]driverPair, []*client.Client, error) {
+	dps, clients, err := resolveDriversBase(ctx, nodes, opt, pw)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	bopts := make([]gateway.BuildOpts, len(clients))
+
+	span, ctx := tracing.StartSpan(ctx, "load buildkit capabilities", trace.WithSpanKind(trace.SpanKindInternal))
+
+	eg, ctx := errgroup.WithContext(ctx)
+	for i, c := range clients {
+		if c == nil {
+			continue
+		}
+
+		func(i int, c *client.Client) {
+			eg.Go(func() error {
+				clients[i].Build(ctx, client.SolveOpt{
+					Internal: true,
+				}, "buildx", func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
+					bopts[i] = c.BuildOpts()
+					return nil, nil
+				}, nil)
+				return nil
+			})
+		}(i, c)
+	}
+
+	err = eg.Wait()
+	tracing.FinishWithError(span, err)
+	if err != nil {
+		return nil, nil, err
+	}
+	for key := range dps {
+		for i, dp := range dps[key] {
+			dps[key][i].bopts = bopts[dp.driverIndex]
+		}
+	}
+
+	return dps, clients, nil
+}
+
+func resolveDriversBase(ctx context.Context, nodes []builder.Node, opt map[string]Options, pw progress.Writer) (map[string][]driverPair, []*client.Client, error) {
+	availablePlatforms := map[string]int{}
+	for i, node := range nodes {
+		for _, p := range node.Platforms {
+			availablePlatforms[platforms.Format(p)] = i
+		}
+	}
+
+	undetectedPlatform := false
+	allPlatforms := map[string]struct{}{}
+	for _, opt := range opt {
+		for _, p := range opt.Platforms {
+			k := platforms.Format(p)
+			allPlatforms[k] = struct{}{}
+			if _, ok := availablePlatforms[k]; !ok {
+				undetectedPlatform = true
+			}
+		}
+	}
+
+	// fast path
+	if len(nodes) == 1 || len(allPlatforms) == 0 {
+		m := map[string][]driverPair{}
+		for k, opt := range opt {
+			m[k] = []driverPair{{driverIndex: 0, platforms: opt.Platforms}}
+		}
+		clients, err := ensureBooted(ctx, nodes, driverIndexes(m), pw)
+		if err != nil {
+			return nil, nil, err
+		}
+		return m, clients, nil
+	}
+
+	// map based on existing platforms
+	if !undetectedPlatform {
+		m := splitToDriverPairs(availablePlatforms, opt)
+		clients, err := ensureBooted(ctx, nodes, driverIndexes(m), pw)
+		if err != nil {
+			return nil, nil, err
+		}
+		return m, clients, nil
+	}
+
+	// boot all drivers in k
+	clients, err := ensureBooted(ctx, nodes, allIndexes(len(nodes)), pw)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	eg, ctx := errgroup.WithContext(ctx)
+	workers := make([][]*client.WorkerInfo, len(clients))
+
+	for i, c := range clients {
+		if c == nil {
+			continue
+		}
+		func(i int) {
+			eg.Go(func() error {
+				ww, err := clients[i].ListWorkers(ctx)
+				if err != nil {
+					return errors.Wrap(err, "listing workers")
+				}
+				workers[i] = ww
+				return nil
+			})
+
+		}(i)
+	}
+
+	if err := eg.Wait(); err != nil {
+		return nil, nil, err
+	}
+
+	for i, ww := range workers {
+		for _, w := range ww {
+			for _, p := range w.Platforms {
+				p = platforms.Normalize(p)
+				ps := platforms.Format(p)
+
+				if _, ok := availablePlatforms[ps]; !ok {
+					availablePlatforms[ps] = i
+				}
+			}
+		}
+	}
+
+	return splitToDriverPairs(availablePlatforms, opt), clients, nil
+}
+
 func toRepoOnly(in string) (string, error) {
 	m := map[string]struct{}{}
 	p := strings.Split(in, ",")
@@ -252,21 +459,17 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 			attests[k] = *v
 		}
 	}
-
+	supportsAttestations := bopts.LLBCaps.Contains(apicaps.CapID("exporter.image.attestations")) && nodeDriver.Features(ctx)[driver.MultiPlatform]
-	supportAttestations := bopts.LLBCaps.Contains(apicaps.CapID("exporter.image.attestations")) && nodeDriver.Features(ctx)[driver.MultiPlatform]
 	if len(attests) > 0 {
-		if !supportAttestations {
+		if !supportsAttestations {
-			if !nodeDriver.Features(ctx)[driver.MultiPlatform] {
+			return nil, nil, errors.Errorf("attestations are not supported by the current buildkitd")
-				return nil, nil, notSupported("Attestation", nodeDriver, "https://docs.docker.com/go/attestations/")
-			}
-			return nil, nil, errors.Errorf("Attestations are not supported by the current BuildKit daemon")
 		}
 		for k, v := range attests {
 			so.FrontendAttrs["attest:"+k] = v
 		}
 	}
 
-	if _, ok := opt.Attests["provenance"]; !ok && supportAttestations {
+	if _, ok := opt.Attests["provenance"]; !ok && supportsAttestations {
 		const noAttestEnv = "BUILDX_NO_DEFAULT_ATTESTATIONS"
 		var noProv bool
 		if v, ok := os.LookupEnv(noAttestEnv); ok {
@@ -290,9 +493,7 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 			opt.Exports = []client.ExportEntry{{Type: "image", Attrs: map[string]string{}}}
 		}
 	default:
-		if err := bopts.LLBCaps.Supports(pb.CapMultipleExporters); err != nil {
+		return nil, nil, errors.Errorf("multiple outputs currently unsupported")
-			return nil, nil, errors.Errorf("multiple outputs currently unsupported by the current BuildKit daemon, please upgrade to version v0.13+ or use a single output")
-		}
 	}
 
 	// fill in image exporter names from tags
@@ -361,7 +562,7 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 					}
 				}
 			} else if !nodeDriver.Features(ctx)[driver.DockerExporter] {
-				return nil, nil, notSupported(driver.DockerExporter, nodeDriver, "https://docs.docker.com/go/build-exporters/")
+				return nil, nil, notSupported(driver.DockerExporter, nodeDriver, "https:/docs.docker.com/go/build-exporters/")
 			}
 		}
 		if e.Type == "image" && nodeDriver.IsMobyDriver() {
@@ -395,7 +596,7 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 		if p, err := filepath.Abs(sharedKey); err == nil {
 			sharedKey = filepath.Base(p)
 		}
-		so.SharedKey = sharedKey + ":" + confutil.TryNodeIdentifier(configDir)
+		so.SharedKey = sharedKey + ":" + tryNodeIdentifier(configDir)
 	}
 
 	if opt.Pull {
@@ -516,7 +717,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 		}
 	}
 
-	drivers, err := resolveDrivers(ctx, nodes, opt, w)
+	m, clients, err := resolveDrivers(ctx, nodes, opt, w)
 	if err != nil {
 		return nil, err
 	}
@@ -530,46 +731,34 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 		}
 	}()
 
-	reqForNodes := make(map[string][]*reqForNode)
 	eg, ctx := errgroup.WithContext(ctx)
 
 	for k, opt := range opt {
-		multiDriver := len(drivers[k]) > 1
+		multiDriver := len(m[k]) > 1
 		hasMobyDriver := false
-		gitattrs, addVCSLocalDir, err := getGitAttributes(ctx, opt.Inputs.ContextPath, opt.Inputs.DockerfilePath)
+		gitattrs, err := getGitAttributes(ctx, opt.Inputs.ContextPath, opt.Inputs.DockerfilePath)
 		if err != nil {
 			logrus.WithError(err).Warn("current commit information was not captured by the build")
 		}
-		var reqn []*reqForNode
+		for i, np := range m[k] {
-		for _, np := range drivers[k] {
+			node := nodes[np.driverIndex]
-			if np.Node().Driver.IsMobyDriver() {
+			if node.Driver.IsMobyDriver() {
 				hasMobyDriver = true
 			}
 			opt.Platforms = np.platforms
-			gatewayOpts, err := np.BuildOpts(ctx)
+			so, release, err := toSolveOpt(ctx, node, multiDriver, opt, np.bopts, configDir, w, docker)
 			if err != nil {
 				return nil, err
 			}
-			so, release, err := toSolveOpt(ctx, np.Node(), multiDriver, opt, gatewayOpts, configDir, w, docker)
+			if err := saveLocalState(so, k, opt, node, configDir); err != nil {
-			if err != nil {
-				return nil, err
-			}
-			if err := saveLocalState(so, k, opt, np.Node(), configDir); err != nil {
 				return nil, err
 			}
 			for k, v := range gitattrs {
 				so.FrontendAttrs[k] = v
 			}
-			if addVCSLocalDir != nil {
-				addVCSLocalDir(so)
-			}
 			defers = append(defers, release)
-			reqn = append(reqn, &reqForNode{
+			m[k][i].so = so
-				resolvedNode: np,
-				so:           so,
-			})
 		}
-		reqForNodes[k] = reqn
 		for _, at := range opt.Session {
 			if s, ok := at.(interface {
 				SetLogger(progresswriter.Logger)
@@ -582,8 +771,8 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 
 		// validate for multi-node push
 		if hasMobyDriver && multiDriver {
-			for _, np := range reqForNodes[k] {
+			for _, dp := range m[k] {
-				for _, e := range np.so.Exports {
+				for _, e := range dp.so.Exports {
 					if e.Type == "moby" {
 						if ok, _ := strconv.ParseBool(e.Attrs["push"]); ok {
 							return nil, errors.Errorf("multi-node push can't currently be performed with the docker driver, please switch to a different driver")
@@ -596,13 +785,12 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 
 	// validate that all links between targets use same drivers
 	for name := range opt {
-		dps := reqForNodes[name]
+		dps := m[name]
-		for i, dp := range dps {
+		for _, dp := range dps {
-			so := reqForNodes[name][i].so
+			for k, v := range dp.so.FrontendAttrs {
-			for k, v := range so.FrontendAttrs {
 				if strings.HasPrefix(k, "context:") && strings.HasPrefix(v, "target:") {
 					k2 := strings.TrimPrefix(v, "target:")
-					dps2, ok := drivers[k2]
+					dps2, ok := m[k2]
 					if !ok {
 						return nil, errors.Errorf("failed to find target %s for context %s", k2, strings.TrimPrefix(k, "context:")) // should be validated before already
 					}
@@ -626,13 +814,13 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 	results := waitmap.New()
 
 	multiTarget := len(opt) > 1
-	childTargets := calculateChildTargets(reqForNodes, opt)
+	childTargets := calculateChildTargets(m, opt)
 
 	for k, opt := range opt {
 		err := func(k string) error {
 			opt := opt
-			dps := drivers[k]
+			dps := m[k]
-			multiDriver := len(drivers[k]) > 1
+			multiDriver := len(m[k]) > 1
 
 			var span trace.Span
 			ctx := ctx
@@ -648,9 +836,8 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 			var insecurePush bool
 
 			for i, dp := range dps {
-				i, dp := i, dp
+				i, dp, so := i, dp, *dp.so
-				node := dp.Node()
+				node := nodes[dp.driverIndex]
-				so := reqForNodes[k][i].so
 				if multiDriver {
 					for i, e := range so.Exports {
 						switch e.Type {
@@ -681,14 +868,11 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 
 				pw := progress.WithPrefix(w, k, multiTarget)
 
-				c, err := dp.Client(ctx)
+				c := clients[dp.driverIndex]
-				if err != nil {
-					return err
-				}
 				eg2.Go(func() error {
 					pw = progress.ResetTime(pw)
 
-					if err := waitContextDeps(ctx, dp.driverIndex, results, so); err != nil {
+					if err := waitContextDeps(ctx, dp.driverIndex, results, &so); err != nil {
 						return err
 					}
 
@@ -765,11 +949,6 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 						results.Set(rKey, res)
 
 						if children, ok := childTargets[rKey]; ok && len(children) > 0 {
-							// wait for the child targets to register their LLB before evaluating
-							_, err := results.Get(ctx, children...)
-							if err != nil {
-								return nil, err
-							}
 							// we need to wait until the child targets have completed before we can release
 							eg, ctx := errgroup.WithContext(ctx)
 							eg.Go(func() error {
@@ -788,16 +967,16 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 
 						return res, nil
 					}
-					buildRef := fmt.Sprintf("%s/%s/%s", node.Builder, node.Name, so.Ref)
 					var rr *client.SolveResponse
 					if resultHandleFunc != nil {
 						var resultHandle *ResultHandle
-						resultHandle, rr, err = NewResultHandle(ctx, cc, *so, "buildx", buildFunc, ch)
+						resultHandle, rr, err = NewResultHandle(ctx, cc, so, "buildx", buildFunc, ch)
 						resultHandleFunc(dp.driverIndex, resultHandle)
 					} else {
-						rr, err = c.Build(ctx, *so, "buildx", buildFunc, ch)
+						rr, err = c.Build(ctx, so, "buildx", buildFunc, ch)
 					}
 					if desktop.BuildBackendEnabled() && node.Driver.HistoryAPISupported(ctx) {
+						buildRef := fmt.Sprintf("%s/%s/%s", node.Builder, node.Name, so.Ref)
 						if err != nil {
 							return &desktop.ErrorWithBuildRef{
 								Ref: buildRef,
@@ -817,9 +996,8 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 					for k, v := range printRes {
 						rr.ExporterResponse[k] = string(v)
 					}
-					rr.ExporterResponse["buildx.build.ref"] = buildRef
 
-					node := dp.Node().Driver
+					node := nodes[dp.driverIndex].Driver
 					if node.IsMobyDriver() {
 						for _, e := range so.Exports {
 							if e.Type == "moby" && e.Attrs["push"] != "" {
@@ -911,7 +1089,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 						if len(descs) > 0 {
 							var imageopt imagetools.Opt
 							for _, dp := range dps {
-								imageopt = dp.Node().ImageOpt
+								imageopt = nodes[dp.driverIndex].ImageOpt
 								break
 							}
 							names := strings.Split(pushNames, ",")
@@ -1002,7 +1180,7 @@ func pushWithMoby(ctx context.Context, d driver.Driver, name string, l progress.
 		return err
 	}
 
-	rc, err := api.ImagePush(ctx, name, imagetypes.PushOptions{
+	rc, err := api.ImagePush(ctx, name, types.ImagePushOptions{
 		RegistryAuth: creds,
 	})
 	if err != nil {
@@ -1160,7 +1338,7 @@ func LoadInputs(ctx context.Context, d *driver.DriverHandle, inp Inputs, pw prog
 				target.LocalDirs["context"] = inp.ContextPath
 			}
 		}
-	case osutil.IsLocalDir(inp.ContextPath):
+	case isLocalDir(inp.ContextPath):
 		target.LocalDirs["context"] = inp.ContextPath
 		switch inp.DockerfilePath {
 		case "-":
@@ -1325,16 +1503,16 @@ func resultKey(index int, name string) string {
 }
 
 // calculateChildTargets returns all the targets that depend on current target for reverse index
-func calculateChildTargets(reqs map[string][]*reqForNode, opt map[string]Options) map[string][]string {
+func calculateChildTargets(drivers map[string][]driverPair, opt map[string]Options) map[string][]string {
 	out := make(map[string][]string)
-	for name := range opt {
+	for src := range opt {
-		dps := reqs[name]
+		dps := drivers[src]
-		for i, dp := range dps {
+		for _, dp := range dps {
-			so := reqs[name][i].so
+			so := *dp.so
 			for k, v := range so.FrontendAttrs {
 				if strings.HasPrefix(k, "context:") && strings.HasPrefix(v, "target:") {
 					target := resultKey(dp.driverIndex, strings.TrimPrefix(v, "target:"))
-					out[target] = append(out[target], resultKey(dp.driverIndex, name))
+					out[target] = append(out[target], resultKey(dp.driverIndex, src))
 				}
 			}
 		}
@@ -1477,6 +1655,31 @@ func handleLowercaseDockerfile(dir, p string) string {
 	return p
 }
 
+var nodeIdentifierMu sync.Mutex
+
+func tryNodeIdentifier(configDir string) (out string) {
+	nodeIdentifierMu.Lock()
+	defer nodeIdentifierMu.Unlock()
+	sessionFile := filepath.Join(configDir, ".buildNodeID")
+	if _, err := os.Lstat(sessionFile); err != nil {
+		if os.IsNotExist(err) { // create a new file with stored randomness
+			b := make([]byte, 8)
+			if _, err := rand.Read(b); err != nil {
+				return out
+			}
+			if err := os.WriteFile(sessionFile, []byte(hex.EncodeToString(b)), 0600); err != nil {
+				return out
+			}
+		}
+	}
+
+	dt, err := os.ReadFile(sessionFile)
+	if err == nil {
+		return string(dt)
+	}
+	return
+}
+
 func noPrintFunc(opt map[string]Options) bool {
 	for _, v := range opt {
 		if v.PrintFunc != nil {

build/dial.go

@@ -1,62 +0,0 @@
-package build
-
-import (
-	"context"
-	stderrors "errors"
-	"net"
-
-	"github.com/containerd/containerd/platforms"
-	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/util/progress"
-	v1 "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/pkg/errors"
-)
-
-func Dial(ctx context.Context, nodes []builder.Node, pw progress.Writer, platform *v1.Platform) (net.Conn, error) {
-	nodes, err := filterAvailableNodes(nodes)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(nodes) == 0 {
-		return nil, errors.New("no nodes available")
-	}
-
-	var pls []v1.Platform
-	if platform != nil {
-		pls = []v1.Platform{*platform}
-	}
-
-	opts := map[string]Options{"default": {Platforms: pls}}
-	resolved, err := resolveDrivers(ctx, nodes, opts, pw)
-	if err != nil {
-		return nil, err
-	}
-
-	var dialError error
-	for _, ls := range resolved {
-		for _, rn := range ls {
-			if platform != nil {
-				p := *platform
-				var found bool
-				for _, pp := range rn.platforms {
-					if platforms.Only(p).Match(pp) {
-						found = true
-						break
-					}
-				}
-				if !found {
-					continue
-				}
-			}
-
-			conn, err := nodes[rn.driverIndex].Driver.Dial(ctx)
-			if err == nil {
-				return conn, nil
-			}
-			dialError = stderrors.Join(err)
-		}
-	}
-
-	return nil, errors.Wrap(dialError, "no nodes available")
-}

build/driver.go

@@ -1,312 +0,0 @@
-package build
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/containerd/containerd/platforms"
-	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/driver"
-	"github.com/docker/buildx/util/progress"
-	"github.com/moby/buildkit/client"
-	gateway "github.com/moby/buildkit/frontend/gateway/client"
-	"github.com/moby/buildkit/util/flightcontrol"
-	"github.com/moby/buildkit/util/tracing"
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/pkg/errors"
-	"go.opentelemetry.io/otel/trace"
-	"golang.org/x/sync/errgroup"
-)
-
-type resolvedNode struct {
-	resolver    *nodeResolver
-	driverIndex int
-	platforms   []specs.Platform
-}
-
-func (dp resolvedNode) Node() builder.Node {
-	return dp.resolver.nodes[dp.driverIndex]
-}
-
-func (dp resolvedNode) Client(ctx context.Context) (*client.Client, error) {
-	clients, err := dp.resolver.boot(ctx, []int{dp.driverIndex}, nil)
-	if err != nil {
-		return nil, err
-	}
-	return clients[0], nil
-}
-
-func (dp resolvedNode) BuildOpts(ctx context.Context) (gateway.BuildOpts, error) {
-	opts, err := dp.resolver.opts(ctx, []int{dp.driverIndex}, nil)
-	if err != nil {
-		return gateway.BuildOpts{}, err
-	}
-	return opts[0], nil
-}
-
-type matchMaker func(specs.Platform) platforms.MatchComparer
-
-type nodeResolver struct {
-	nodes   []builder.Node
-	clients flightcontrol.Group[*client.Client]
-	opt     flightcontrol.Group[gateway.BuildOpts]
-}
-
-func resolveDrivers(ctx context.Context, nodes []builder.Node, opt map[string]Options, pw progress.Writer) (map[string][]*resolvedNode, error) {
-	driverRes := newDriverResolver(nodes)
-	drivers, err := driverRes.Resolve(ctx, opt, pw)
-	if err != nil {
-		return nil, err
-	}
-	return drivers, err
-}
-
-func newDriverResolver(nodes []builder.Node) *nodeResolver {
-	r := &nodeResolver{
-		nodes: nodes,
-	}
-	return r
-}
-
-func (r *nodeResolver) Resolve(ctx context.Context, opt map[string]Options, pw progress.Writer) (map[string][]*resolvedNode, error) {
-	if len(r.nodes) == 0 {
-		return nil, nil
-	}
-
-	nodes := map[string][]*resolvedNode{}
-	for k, opt := range opt {
-		node, perfect, err := r.resolve(ctx, opt.Platforms, pw, platforms.OnlyStrict, nil)
-		if err != nil {
-			return nil, err
-		}
-		if !perfect {
-			break
-		}
-		nodes[k] = node
-	}
-	if len(nodes) != len(opt) {
-		// if we didn't get a perfect match, we need to boot all drivers
-		allIndexes := make([]int, len(r.nodes))
-		for i := range allIndexes {
-			allIndexes[i] = i
-		}
-
-		clients, err := r.boot(ctx, allIndexes, pw)
-		if err != nil {
-			return nil, err
-		}
-		eg, egCtx := errgroup.WithContext(ctx)
-		workers := make([][]specs.Platform, len(clients))
-		for i, c := range clients {
-			i, c := i, c
-			if c == nil {
-				continue
-			}
-			eg.Go(func() error {
-				ww, err := c.ListWorkers(egCtx)
-				if err != nil {
-					return errors.Wrap(err, "listing workers")
-				}
-
-				ps := make(map[string]specs.Platform, len(ww))
-				for _, w := range ww {
-					for _, p := range w.Platforms {
-						pk := platforms.Format(platforms.Normalize(p))
-						ps[pk] = p
-					}
-				}
-				for _, p := range ps {
-					workers[i] = append(workers[i], p)
-				}
-				return nil
-			})
-		}
-		if err := eg.Wait(); err != nil {
-			return nil, err
-		}
-
-		// then we can attempt to match against all the available platforms
-		// (this time we don't care about imperfect matches)
-		nodes = map[string][]*resolvedNode{}
-		for k, opt := range opt {
-			node, _, err := r.resolve(ctx, opt.Platforms, pw, platforms.Only, func(idx int, n builder.Node) []specs.Platform {
-				return workers[idx]
-			})
-			if err != nil {
-				return nil, err
-			}
-			nodes[k] = node
-		}
-	}
-
-	idxs := make([]int, 0, len(r.nodes))
-	for _, nodes := range nodes {
-		for _, node := range nodes {
-			idxs = append(idxs, node.driverIndex)
-		}
-	}
-
-	// preload capabilities
-	span, ctx := tracing.StartSpan(ctx, "load buildkit capabilities", trace.WithSpanKind(trace.SpanKindInternal))
-	_, err := r.opts(ctx, idxs, pw)
-	tracing.FinishWithError(span, err)
-	if err != nil {
-		return nil, err
-	}
-
-	return nodes, nil
-}
-
-func (r *nodeResolver) resolve(ctx context.Context, ps []specs.Platform, pw progress.Writer, matcher matchMaker, additional func(idx int, n builder.Node) []specs.Platform) ([]*resolvedNode, bool, error) {
-	if len(r.nodes) == 0 {
-		return nil, true, nil
-	}
-
-	perfect := true
-	nodeIdxs := make([]int, 0)
-	for _, p := range ps {
-		idx := r.get(p, matcher, additional)
-		if idx == -1 {
-			idx = 0
-			perfect = false
-		}
-		nodeIdxs = append(nodeIdxs, idx)
-	}
-
-	var nodes []*resolvedNode
-	if len(nodeIdxs) == 0 {
-		nodes = append(nodes, &resolvedNode{
-			resolver:    r,
-			driverIndex: 0,
-		})
-	} else {
-		for i, idx := range nodeIdxs {
-			node := &resolvedNode{
-				resolver:    r,
-				driverIndex: idx,
-			}
-			if len(ps) > 0 {
-				node.platforms = []specs.Platform{ps[i]}
-			}
-			nodes = append(nodes, node)
-		}
-	}
-
-	nodes = recombineNodes(nodes)
-	if _, err := r.boot(ctx, nodeIdxs, pw); err != nil {
-		return nil, false, err
-	}
-	return nodes, perfect, nil
-}
-
-func (r *nodeResolver) get(p specs.Platform, matcher matchMaker, additionalPlatforms func(int, builder.Node) []specs.Platform) int {
-	best := -1
-	bestPlatform := specs.Platform{}
-	for i, node := range r.nodes {
-		platforms := node.Platforms
-		if additionalPlatforms != nil {
-			platforms = append([]specs.Platform{}, platforms...)
-			platforms = append(platforms, additionalPlatforms(i, node)...)
-		}
-		for _, p2 := range platforms {
-			m := matcher(p2)
-			if !m.Match(p) {
-				continue
-			}
-
-			if best == -1 {
-				best = i
-				bestPlatform = p2
-				continue
-			}
-			if matcher(p2).Less(p, bestPlatform) {
-				best = i
-				bestPlatform = p2
-			}
-		}
-	}
-	return best
-}
-
-func (r *nodeResolver) boot(ctx context.Context, idxs []int, pw progress.Writer) ([]*client.Client, error) {
-	clients := make([]*client.Client, len(idxs))
-
-	baseCtx := ctx
-	eg, ctx := errgroup.WithContext(ctx)
-
-	for i, idx := range idxs {
-		i, idx := i, idx
-		eg.Go(func() error {
-			c, err := r.clients.Do(ctx, fmt.Sprint(idx), func(ctx context.Context) (*client.Client, error) {
-				if r.nodes[idx].Driver == nil {
-					return nil, nil
-				}
-				return driver.Boot(ctx, baseCtx, r.nodes[idx].Driver, pw)
-			})
-			if err != nil {
-				return err
-			}
-			clients[i] = c
-			return nil
-		})
-	}
-	if err := eg.Wait(); err != nil {
-		return nil, err
-	}
-
-	return clients, nil
-}
-
-func (r *nodeResolver) opts(ctx context.Context, idxs []int, pw progress.Writer) ([]gateway.BuildOpts, error) {
-	clients, err := r.boot(ctx, idxs, pw)
-	if err != nil {
-		return nil, err
-	}
-
-	bopts := make([]gateway.BuildOpts, len(clients))
-	eg, ctx := errgroup.WithContext(ctx)
-	for i, idxs := range idxs {
-		i, idx := i, idxs
-		c := clients[i]
-		if c == nil {
-			continue
-		}
-		eg.Go(func() error {
-			opt, err := r.opt.Do(ctx, fmt.Sprint(idx), func(ctx context.Context) (gateway.BuildOpts, error) {
-				opt := gateway.BuildOpts{}
-				_, err := c.Build(ctx, client.SolveOpt{
-					Internal: true,
-				}, "buildx", func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
-					opt = c.BuildOpts()
-					return nil, nil
-				}, nil)
-				return opt, err
-			})
-			if err != nil {
-				return err
-			}
-			bopts[i] = opt
-			return nil
-		})
-	}
-	if err := eg.Wait(); err != nil {
-		return nil, err
-	}
-	return bopts, nil
-}
-
-// recombineDriverPairs recombines resolved nodes that are on the same driver
-// back together into a single node.
-func recombineNodes(nodes []*resolvedNode) []*resolvedNode {
-	result := make([]*resolvedNode, 0, len(nodes))
-	lookup := map[int]int{}
-	for _, node := range nodes {
-		if idx, ok := lookup[node.driverIndex]; ok {
-			result[idx].platforms = append(result[idx].platforms, node.platforms...)
-		} else {
-			lookup[node.driverIndex] = len(result)
-			result = append(result, node)
-		}
-	}
-	return result
-}

build/driver_test.go

@@ -1,315 +0,0 @@
-package build
-
-import (
-	"context"
-	"sort"
-	"testing"
-
-	"github.com/containerd/containerd/platforms"
-	"github.com/docker/buildx/builder"
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/stretchr/testify/require"
-)
-
-func TestFindDriverSanity(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.DefaultSpec()},
-	})
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.DefaultSpec()}, nil, platforms.OnlyStrict, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, 0, res[0].driverIndex)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-	require.Equal(t, []specs.Platform{platforms.DefaultSpec()}, res[0].platforms)
-}
-
-func TestFindDriverEmpty(t *testing.T) {
-	r := makeTestResolver(nil)
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.DefaultSpec()}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Nil(t, res)
-}
-
-func TestFindDriverWeirdName(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64")},
-		"bbb": {platforms.MustParse("linux/foobar")},
-	})
-
-	// find first platform
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/foobar")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, 1, res[0].driverIndex)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-}
-
-func TestFindDriverUnknown(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64")},
-	})
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/riscv64")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.False(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, 0, res[0].driverIndex)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-}
-
-func TestSelectNodeSinglePlatform(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64")},
-		"bbb": {platforms.MustParse("linux/riscv64")},
-	})
-
-	// find first platform
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/amd64")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, 0, res[0].driverIndex)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-
-	// find second platform
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/riscv64")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, 1, res[0].driverIndex)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-
-	// find an unknown platform, should match the first driver
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/s390x")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.False(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, 0, res[0].driverIndex)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-}
-
-func TestSelectNodeMultiPlatform(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64"), platforms.MustParse("linux/arm64")},
-		"bbb": {platforms.MustParse("linux/riscv64")},
-	})
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/amd64")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, 0, res[0].driverIndex)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm64")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, 0, res[0].driverIndex)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/riscv64")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, 1, res[0].driverIndex)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-}
-
-func TestSelectNodeNonStrict(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64")},
-		"bbb": {platforms.MustParse("linux/arm64")},
-	})
-
-	// arm64 should match itself
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm64")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-
-	// arm64 may support arm/v8
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v8")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-
-	// arm64 may support arm/v7
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-}
-
-func TestSelectNodeNonStrictARM(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64")},
-		"bbb": {platforms.MustParse("linux/arm64")},
-		"ccc": {platforms.MustParse("linux/arm/v8")},
-	})
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v8")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "ccc", res[0].Node().Builder)
-
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "ccc", res[0].Node().Builder)
-}
-
-func TestSelectNodeNonStrictLower(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64")},
-		"bbb": {platforms.MustParse("linux/arm/v7")},
-	})
-
-	// v8 can't be built on v7 (so we should select the default)...
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v8")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.False(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-
-	// ...but v6 can be built on v8
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v6")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-}
-
-func TestSelectNodePreferStart(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64")},
-		"bbb": {platforms.MustParse("linux/riscv64")},
-		"ccc": {platforms.MustParse("linux/riscv64")},
-	})
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/riscv64")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-}
-
-func TestSelectNodePreferExact(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/arm/v8")},
-		"bbb": {platforms.MustParse("linux/arm/v7")},
-	})
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-}
-
-func TestSelectNodeNoPlatform(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/foobar")},
-		"bbb": {platforms.DefaultSpec()},
-	})
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-	require.Empty(t, res[0].platforms)
-}
-
-func TestSelectNodeAdditionalPlatforms(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64")},
-		"bbb": {platforms.MustParse("linux/arm/v8")},
-	})
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "bbb", res[0].Node().Builder)
-
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, func(idx int, n builder.Node) []specs.Platform {
-		if n.Builder == "aaa" {
-			return []specs.Platform{platforms.MustParse("linux/arm/v7")}
-		}
-		return nil
-	})
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-}
-
-func TestSplitNodeMultiPlatform(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64"), platforms.MustParse("linux/arm64")},
-		"bbb": {platforms.MustParse("linux/riscv64")},
-	})
-
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{
-		platforms.MustParse("linux/amd64"),
-		platforms.MustParse("linux/arm64"),
-	}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 1)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-
-	res, perfect, err = r.resolve(context.TODO(), []specs.Platform{
-		platforms.MustParse("linux/amd64"),
-		platforms.MustParse("linux/riscv64"),
-	}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 2)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-	require.Equal(t, "bbb", res[1].Node().Builder)
-}
-
-func TestSplitNodeMultiPlatformNoUnify(t *testing.T) {
-	r := makeTestResolver(map[string][]specs.Platform{
-		"aaa": {platforms.MustParse("linux/amd64")},
-		"bbb": {platforms.MustParse("linux/amd64"), platforms.MustParse("linux/riscv64")},
-	})
-
-	// the "best" choice would be the node with both platforms, but we're using
-	// a naive algorithm that doesn't try to unify the platforms
-	res, perfect, err := r.resolve(context.TODO(), []specs.Platform{
-		platforms.MustParse("linux/amd64"),
-		platforms.MustParse("linux/riscv64"),
-	}, nil, platforms.Only, nil)
-	require.NoError(t, err)
-	require.True(t, perfect)
-	require.Len(t, res, 2)
-	require.Equal(t, "aaa", res[0].Node().Builder)
-	require.Equal(t, "bbb", res[1].Node().Builder)
-}
-
-func makeTestResolver(nodes map[string][]specs.Platform) *nodeResolver {
-	var ns []builder.Node
-	for name, platforms := range nodes {
-		ns = append(ns, builder.Node{
-			Builder:   name,
-			Platforms: platforms,
-		})
-	}
-	sort.Slice(ns, func(i, j int) bool {
-		return ns[i].Builder < ns[j].Builder
-	})
-	return newDriverResolver(ns)
-}

build/git.go

@@ -9,18 +9,16 @@ import (
 	"strings"
 
 	"github.com/docker/buildx/util/gitutil"
-	"github.com/docker/buildx/util/osutil"
-	"github.com/moby/buildkit/client"
 	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) (map[string]string, func(*client.SolveOpt), error) {
+func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath string) (res map[string]string, _ error) {
-	res := make(map[string]string)
+	res = make(map[string]string)
 	if contextPath == "" {
-		return nil, nil, nil
+		return
 	}
 
 	setGitLabels := false
@@ -39,7 +37,7 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st
 	}
 
 	if !setGitLabels && !setGitInfo {
-		return nil, nil, nil
+		return
 	}
 
 	// figure out in which directory the git command needs to run in
@@ -47,32 +45,27 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st
 	if filepath.IsAbs(contextPath) {
 		wd = contextPath
 	} else {
-		wd, _ = filepath.Abs(filepath.Join(osutil.GetWd(), contextPath))
+		cwd, _ := os.Getwd()
+		wd, _ = filepath.Abs(filepath.Join(cwd, contextPath))
 	}
-	wd = osutil.SanitizePath(wd)
 
 	gitc, err := gitutil.New(gitutil.WithContext(ctx), gitutil.WithWorkingDir(wd))
 	if err != nil {
 		if st, err1 := os.Stat(path.Join(wd, ".git")); err1 == nil && st.IsDir() {
-			return res, nil, errors.Wrap(err, "git was not found in the system")
+			return res, errors.Wrap(err, "git was not found in the system")
 		}
-		return nil, nil, nil
+		return
 	}
 
 	if !gitc.IsInsideWorkTree() {
 		if st, err := os.Stat(path.Join(wd, ".git")); err == nil && st.IsDir() {
-			return res, nil, errors.New("failed to read current commit information with git rev-parse --is-inside-work-tree")
+			return res, errors.New("failed to read current commit information with git rev-parse --is-inside-work-tree")
 		}
-		return nil, nil, nil
+		return res, nil
-	}
-
-	root, err := gitc.RootDir()
-	if err != nil {
-		return res, nil, errors.Wrap(err, "failed to get git root dir")
 	}
 
 	if sha, err := gitc.FullCommit(); err != nil && !gitutil.IsUnknownRevision(err) {
-		return res, nil, errors.Wrap(err, "failed to get git commit")
+		return res, errors.Wrap(err, "failed to get git commit")
 	} else if sha != "" {
 		checkDirty := false
 		if v, ok := os.LookupEnv("BUILDX_GIT_CHECK_DIRTY"); ok {
@@ -100,38 +93,23 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st
 		}
 	}
 
-	if setGitLabels && root != "" {
+	if setGitLabels {
-		if dockerfilePath == "" {
+		if root, err := gitc.RootDir(); err != nil {
-			dockerfilePath = filepath.Join(wd, "Dockerfile")
+			return res, errors.Wrap(err, "failed to get git root dir")
-		}
+		} else if root != "" {
-		if !filepath.IsAbs(dockerfilePath) {
+			if dockerfilePath == "" {
-			dockerfilePath = filepath.Join(osutil.GetWd(), dockerfilePath)
+				dockerfilePath = filepath.Join(wd, "Dockerfile")
-		}
+			}
-		if r, err := filepath.Rel(root, dockerfilePath); err == nil && !strings.HasPrefix(r, "..") {
+			if !filepath.IsAbs(dockerfilePath) {
-			res["label:"+DockerfileLabel] = r
+				cwd, _ := os.Getwd()
+				dockerfilePath = filepath.Join(cwd, dockerfilePath)
+			}
+			dockerfilePath, _ = filepath.Rel(root, dockerfilePath)
+			if !strings.HasPrefix(dockerfilePath, "..") {
+				res["label:"+DockerfileLabel] = dockerfilePath
+			}
 		}
 	}
 
-	return res, func(so *client.SolveOpt) {
+	return
-		if !setGitInfo || root == "" {
-			return
-		}
-		for k, dir := range so.LocalDirs {
-			dir, err = filepath.EvalSymlinks(dir)
-			if err != nil {
-				continue
-			}
-			dir, err = filepath.Abs(dir)
-			if err != nil {
-				continue
-			}
-			if lp, err := osutil.GetLongPathName(dir); err == nil {
-				dir = lp
-			}
-			dir = osutil.SanitizePath(dir)
-			if r, err := filepath.Rel(root, dir); err == nil && !strings.HasPrefix(r, "..") {
-				so.FrontendAttrs["vcs:localdir:"+k] = r
-			}
-		}
-	}, nil
 }

build/git_test.go

@@ -9,7 +9,6 @@ import (
 	"testing"
 
 	"github.com/docker/buildx/util/gitutil"
-	"github.com/moby/buildkit/client"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -31,7 +30,7 @@ func setupTest(tb testing.TB) {
 }
 
 func TestGetGitAttributesNotGitRepo(t *testing.T) {
-	_, _, err := getGitAttributes(context.Background(), t.TempDir(), "Dockerfile")
+	_, err := getGitAttributes(context.Background(), t.TempDir(), "Dockerfile")
 	assert.NoError(t, err)
 }
 
@@ -39,14 +38,14 @@ func TestGetGitAttributesBadGitRepo(t *testing.T) {
 	tmp := t.TempDir()
 	require.NoError(t, os.MkdirAll(path.Join(tmp, ".git"), 0755))
 
-	_, _, err := getGitAttributes(context.Background(), tmp, "Dockerfile")
+	_, err := getGitAttributes(context.Background(), tmp, "Dockerfile")
 	assert.Error(t, err)
 }
 
 func TestGetGitAttributesNoContext(t *testing.T) {
 	setupTest(t)
 
-	gitattrs, _, err := getGitAttributes(context.Background(), "", "Dockerfile")
+	gitattrs, err := getGitAttributes(context.Background(), "", "Dockerfile")
 	assert.NoError(t, err)
 	assert.Empty(t, gitattrs)
 }
@@ -115,7 +114,7 @@ func TestGetGitAttributes(t *testing.T) {
 			if tt.envGitInfo != "" {
 				t.Setenv("BUILDX_GIT_INFO", tt.envGitInfo)
 			}
-			gitattrs, _, err := getGitAttributes(context.Background(), ".", "Dockerfile")
+			gitattrs, err := getGitAttributes(context.Background(), ".", "Dockerfile")
 			require.NoError(t, err)
 			for _, e := range tt.expected {
 				assert.Contains(t, gitattrs, e)
@@ -140,7 +139,7 @@ func TestGetGitAttributesDirty(t *testing.T) {
 	require.NoError(t, os.WriteFile(filepath.Join("dir", "Dockerfile"), df, 0644))
 
 	t.Setenv("BUILDX_GIT_LABELS", "true")
-	gitattrs, _, _ := getGitAttributes(context.Background(), ".", "Dockerfile")
+	gitattrs, _ := getGitAttributes(context.Background(), ".", "Dockerfile")
 	assert.Equal(t, 5, len(gitattrs))
 
 	assert.Contains(t, gitattrs, "label:"+DockerfileLabel)
@@ -155,59 +154,3 @@ func TestGetGitAttributesDirty(t *testing.T) {
 	assert.Contains(t, gitattrs, "vcs:revision")
 	assert.True(t, strings.HasSuffix(gitattrs["vcs:revision"], "-dirty"))
 }
-
-func TestLocalDirs(t *testing.T) {
-	setupTest(t)
-
-	so := &client.SolveOpt{
-		FrontendAttrs: map[string]string{},
-		LocalDirs: map[string]string{
-			"context":    ".",
-			"dockerfile": ".",
-		},
-	}
-
-	_, addVCSLocalDir, err := getGitAttributes(context.Background(), ".", "Dockerfile")
-	require.NoError(t, err)
-	require.NotNil(t, addVCSLocalDir)
-
-	addVCSLocalDir(so)
-	require.Contains(t, so.FrontendAttrs, "vcs:localdir:context")
-	assert.Equal(t, ".", so.FrontendAttrs["vcs:localdir:context"])
-	require.Contains(t, so.FrontendAttrs, "vcs:localdir:dockerfile")
-	assert.Equal(t, ".", so.FrontendAttrs["vcs:localdir:dockerfile"])
-}
-
-func TestLocalDirsSub(t *testing.T) {
-	gitutil.Mktmp(t)
-
-	c, err := gitutil.New()
-	require.NoError(t, err)
-	gitutil.GitInit(c, t)
-
-	df := []byte("FROM alpine:latest\n")
-	assert.NoError(t, os.MkdirAll("app", 0755))
-	assert.NoError(t, os.WriteFile("app/Dockerfile", df, 0644))
-
-	gitutil.GitAdd(c, t, "app/Dockerfile")
-	gitutil.GitCommit(c, t, "initial commit")
-	gitutil.GitSetRemote(c, t, "origin", "git@github.com:docker/buildx.git")
-
-	so := &client.SolveOpt{
-		FrontendAttrs: map[string]string{},
-		LocalDirs: map[string]string{
-			"context":    ".",
-			"dockerfile": "app",
-		},
-	}
-
-	_, addVCSLocalDir, err := getGitAttributes(context.Background(), ".", "app/Dockerfile")
-	require.NoError(t, err)
-	require.NotNil(t, addVCSLocalDir)
-
-	addVCSLocalDir(so)
-	require.Contains(t, so.FrontendAttrs, "vcs:localdir:context")
-	assert.Equal(t, ".", so.FrontendAttrs["vcs:localdir:context"])
-	require.Contains(t, so.FrontendAttrs, "vcs:localdir:dockerfile")
-	assert.Equal(t, "app", so.FrontendAttrs["vcs:localdir:dockerfile"])
-}

build/utils.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"net"
+	"os"
 	"strings"
 
 	"github.com/docker/buildx/driver"
@@ -33,6 +34,11 @@ func IsRemoteURL(c string) bool {
 	return false
 }
 
+func isLocalDir(c string) bool {
+	st, err := os.Stat(c)
+	return err == nil && st.IsDir()
+}
+
 func isArchive(header []byte) bool {
 	for _, m := range [][]byte{
 		{0x42, 0x5A, 0x68},                   // bzip2
@@ -59,10 +65,7 @@ func toBuildkitExtraHosts(ctx context.Context, inp []string, nodeDriver *driver.
 	}
 	hosts := make([]string, 0, len(inp))
 	for _, h := range inp {
-		host, ip, ok := strings.Cut(h, "=")
+		host, ip, ok := strings.Cut(h, ":")
-		if !ok {
-			host, ip, ok = strings.Cut(h, ":")
-		}
 		if !ok || host == "" || ip == "" {
 			return "", errors.Errorf("invalid host %s", h)
 		}
@@ -74,16 +77,8 @@ func toBuildkitExtraHosts(ctx context.Context, inp []string, nodeDriver *driver.
 				return "", errors.Wrap(err, "unable to derive the IP value for host-gateway")
 			}
 			ip = hgip.String()
-		} else {
+		} else if net.ParseIP(ip) == nil {
-			// If the address is enclosed in square brackets, extract it (for IPv6, but
+			return "", errors.Errorf("invalid host %s", h)
-			// permit it for IPv4 as well; we don't know the address family here, but it's
-			// unambiguous).
-			if len(ip) > 2 && ip[0] == '[' && ip[len(ip)-1] == ']' {
-				ip = ip[1 : len(ip)-1]
-			}
-			if net.ParseIP(ip) == nil {
-				return "", errors.Errorf("invalid host %s", h)
-			}
 		}
 		hosts = append(hosts, host+"="+ip)
 	}

build/utils_test.go

@@ -1,148 +0,0 @@
-package build
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestToBuildkitExtraHosts(t *testing.T) {
-	tests := []struct {
-		doc         string
-		input       []string
-		expectedOut string // Expect output==input if not set.
-		expectedErr string // Expect success if not set.
-	}{
-		{
-			doc:         "IPv4, colon sep",
-			input:       []string{`myhost:192.168.0.1`},
-			expectedOut: `myhost=192.168.0.1`,
-		},
-		{
-			doc:   "IPv4, eq sep",
-			input: []string{`myhost=192.168.0.1`},
-		},
-		{
-			doc:         "Weird but permitted, IPv4 with brackets",
-			input:       []string{`myhost=[192.168.0.1]`},
-			expectedOut: `myhost=192.168.0.1`,
-		},
-		{
-			doc:         "Host and domain",
-			input:       []string{`host.and.domain.invalid:10.0.2.1`},
-			expectedOut: `host.and.domain.invalid=10.0.2.1`,
-		},
-		{
-			doc:         "IPv6, colon sep",
-			input:       []string{`anipv6host:2003:ab34:e::1`},
-			expectedOut: `anipv6host=2003:ab34:e::1`,
-		},
-		{
-			doc:         "IPv6, colon sep, brackets",
-			input:       []string{`anipv6host:[2003:ab34:e::1]`},
-			expectedOut: `anipv6host=2003:ab34:e::1`,
-		},
-		{
-			doc:         "IPv6, eq sep, brackets",
-			input:       []string{`anipv6host=[2003:ab34:e::1]`},
-			expectedOut: `anipv6host=2003:ab34:e::1`,
-		},
-		{
-			doc:         "IPv6 localhost, colon sep",
-			input:       []string{`ipv6local:::1`},
-			expectedOut: `ipv6local=::1`,
-		},
-		{
-			doc:   "IPv6 localhost, eq sep",
-			input: []string{`ipv6local=::1`},
-		},
-		{
-			doc:         "IPv6 localhost, eq sep, brackets",
-			input:       []string{`ipv6local=[::1]`},
-			expectedOut: `ipv6local=::1`,
-		},
-		{
-			doc:         "IPv6 localhost, non-canonical, colon sep",
-			input:       []string{`ipv6local:0:0:0:0:0:0:0:1`},
-			expectedOut: `ipv6local=0:0:0:0:0:0:0:1`,
-		},
-		{
-			doc:   "IPv6 localhost, non-canonical, eq sep",
-			input: []string{`ipv6local=0:0:0:0:0:0:0:1`},
-		},
-		{
-			doc:         "IPv6 localhost, non-canonical, eq sep, brackets",
-			input:       []string{`ipv6local=[0:0:0:0:0:0:0:1]`},
-			expectedOut: `ipv6local=0:0:0:0:0:0:0:1`,
-		},
-		{
-			doc:         "Bad address, colon sep",
-			input:       []string{`myhost:192.notanipaddress.1`},
-			expectedErr: `invalid IP address in add-host: "192.notanipaddress.1"`,
-		},
-		{
-			doc:         "Bad address, eq sep",
-			input:       []string{`myhost=192.notanipaddress.1`},
-			expectedErr: `invalid IP address in add-host: "192.notanipaddress.1"`,
-		},
-		{
-			doc:         "No sep",
-			input:       []string{`thathost-nosemicolon10.0.0.1`},
-			expectedErr: `bad format for add-host: "thathost-nosemicolon10.0.0.1"`,
-		},
-		{
-			doc:         "Bad IPv6",
-			input:       []string{`anipv6host:::::1`},
-			expectedErr: `invalid IP address in add-host: "::::1"`,
-		},
-		{
-			doc:         "Bad IPv6, trailing colons",
-			input:       []string{`ipv6local:::0::`},
-			expectedErr: `invalid IP address in add-host: "::0::"`,
-		},
-		{
-			doc:         "Bad IPv6, missing close bracket",
-			input:       []string{`ipv6addr=[::1`},
-			expectedErr: `invalid IP address in add-host: "[::1"`,
-		},
-		{
-			doc:         "Bad IPv6, missing open bracket",
-			input:       []string{`ipv6addr=::1]`},
-			expectedErr: `invalid IP address in add-host: "::1]"`,
-		},
-		{
-			doc:         "Missing address, colon sep",
-			input:       []string{`myhost.invalid:`},
-			expectedErr: `invalid IP address in add-host: ""`,
-		},
-		{
-			doc:         "Missing address, eq sep",
-			input:       []string{`myhost.invalid=`},
-			expectedErr: `invalid IP address in add-host: ""`,
-		},
-		{
-			doc:         "No input",
-			input:       []string{``},
-			expectedErr: `bad format for add-host: ""`,
-		},
-	}
-
-	for _, tc := range tests {
-		tc := tc
-		if tc.expectedOut == "" {
-			tc.expectedOut = strings.Join(tc.input, ",")
-		}
-		t.Run(tc.doc, func(t *testing.T) {
-			actualOut, actualErr := toBuildkitExtraHosts(context.TODO(), tc.input, nil)
-			if tc.expectedErr == "" {
-				require.Equal(t, tc.expectedOut, actualOut)
-				require.Nil(t, actualErr)
-			} else {
-				require.Zero(t, actualOut)
-				require.Error(t, actualErr, tc.expectedErr)
-			}
-		})
-	}
-}

builder/builder.go

@@ -2,31 +2,19 @@ package builder
 
 import (
 	"context"
-	"encoding/csv"
-	"encoding/json"
-	"net/url"
 	"os"
 	"sort"
-	"strings"
 	"sync"
-	"time"
 
 	"github.com/docker/buildx/driver"
-	k8sutil "github.com/docker/buildx/driver/kubernetes/util"
-	remoteutil "github.com/docker/buildx/driver/remote/util"
-	"github.com/docker/buildx/localstate"
 	"github.com/docker/buildx/store"
 	"github.com/docker/buildx/store/storeutil"
-	"github.com/docker/buildx/util/confutil"
 	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/command"
-	dopts "github.com/docker/cli/opts"
-	"github.com/google/shlex"
 	"github.com/moby/buildkit/util/progress/progressui"
 	"github.com/pkg/errors"
-	"github.com/spf13/pflag"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -259,28 +247,6 @@ func (b *Builder) Factory(ctx context.Context, dialMeta map[string][]string) (_
 	return b.driverFactory.Factory, err
 }
 
-func (b *Builder) MarshalJSON() ([]byte, error) {
-	var berr string
-	if b.err != nil {
-		berr = strings.TrimSpace(b.err.Error())
-	}
-	return json.Marshal(struct {
-		Name         string
-		Driver       string
-		LastActivity time.Time `json:",omitempty"`
-		Dynamic      bool
-		Nodes        []Node
-		Err          string `json:",omitempty"`
-	}{
-		Name:         b.Name,
-		Driver:       b.Driver,
-		LastActivity: b.LastActivity,
-		Dynamic:      b.Dynamic,
-		Nodes:        b.nodes,
-		Err:          berr,
-	})
-}
-
 // GetBuilders returns all builders
 func GetBuilders(dockerCli command.Cli, txn *store.Txn) ([]*Builder, error) {
 	storeng, err := txn.List()
@@ -331,347 +297,3 @@ func GetBuilders(dockerCli command.Cli, txn *store.Txn) ([]*Builder, error) {
 
 	return builders, nil
 }
-
-type CreateOpts struct {
-	Name                string
-	Driver              string
-	NodeName            string
-	Platforms           []string
-	BuildkitdFlags      string
-	BuildkitdConfigFile string
-	DriverOpts          []string
-	Use                 bool
-	Endpoint            string
-	Append              bool
-}
-
-func Create(ctx context.Context, txn *store.Txn, dockerCli command.Cli, opts CreateOpts) (*Builder, error) {
-	var err error
-
-	if opts.Name == "default" {
-		return nil, errors.Errorf("default is a reserved name and cannot be used to identify builder instance")
-	} else if opts.Append && opts.Name == "" {
-		return nil, errors.Errorf("append requires a builder name")
-	}
-
-	name := opts.Name
-	if name == "" {
-		name, err = store.GenerateName(txn)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if !opts.Append {
-		contexts, err := dockerCli.ContextStore().List()
-		if err != nil {
-			return nil, err
-		}
-		for _, c := range contexts {
-			if c.Name == name {
-				return nil, errors.Errorf("instance name %q already exists as context builder", name)
-			}
-		}
-	}
-
-	ng, err := txn.NodeGroupByName(name)
-	if err != nil {
-		if os.IsNotExist(errors.Cause(err)) {
-			if opts.Append && opts.Name != "" {
-				return nil, errors.Errorf("failed to find instance %q for append", opts.Name)
-			}
-		} else {
-			return nil, err
-		}
-	}
-
-	buildkitHost := os.Getenv("BUILDKIT_HOST")
-
-	driverName := opts.Driver
-	if driverName == "" {
-		if ng != nil {
-			driverName = ng.Driver
-		} else if opts.Endpoint == "" && buildkitHost != "" {
-			driverName = "remote"
-		} else {
-			f, err := driver.GetDefaultFactory(ctx, opts.Endpoint, dockerCli.Client(), true, nil)
-			if err != nil {
-				return nil, err
-			}
-			if f == nil {
-				return nil, errors.Errorf("no valid drivers found")
-			}
-			driverName = f.Name()
-		}
-	}
-
-	if ng != nil {
-		if opts.NodeName == "" && !opts.Append {
-			return nil, errors.Errorf("existing instance for %q but no append mode, specify the node name to make changes for existing instances", name)
-		}
-		if driverName != ng.Driver {
-			return nil, errors.Errorf("existing instance for %q but has mismatched driver %q", name, ng.Driver)
-		}
-	}
-
-	if _, err := driver.GetFactory(driverName, true); err != nil {
-		return nil, err
-	}
-
-	ngOriginal := ng
-	if ngOriginal != nil {
-		ngOriginal = ngOriginal.Copy()
-	}
-
-	if ng == nil {
-		ng = &store.NodeGroup{
-			Name:   name,
-			Driver: driverName,
-		}
-	}
-
-	driverOpts, err := csvToMap(opts.DriverOpts)
-	if err != nil {
-		return nil, err
-	}
-
-	buildkitdFlags, err := parseBuildkitdFlags(opts.BuildkitdFlags, driverName, driverOpts)
-	if err != nil {
-		return nil, err
-	}
-
-	var ep string
-	var setEp bool
-	switch {
-	case driverName == "kubernetes":
-		if opts.Endpoint != "" {
-			return nil, errors.Errorf("kubernetes driver does not support endpoint args %q", opts.Endpoint)
-		}
-		// generate node name if not provided to avoid duplicated endpoint
-		// error: https://github.com/docker/setup-buildx-action/issues/215
-		nodeName := opts.NodeName
-		if nodeName == "" {
-			nodeName, err = k8sutil.GenerateNodeName(name, txn)
-			if err != nil {
-				return nil, err
-			}
-		}
-		// naming endpoint to make append works
-		ep = (&url.URL{
-			Scheme: driverName,
-			Path:   "/" + name,
-			RawQuery: (&url.Values{
-				"deployment": {nodeName},
-				"kubeconfig": {os.Getenv("KUBECONFIG")},
-			}).Encode(),
-		}).String()
-		setEp = false
-	case driverName == "remote":
-		if opts.Endpoint != "" {
-			ep = opts.Endpoint
-		} else if buildkitHost != "" {
-			ep = buildkitHost
-		} else {
-			return nil, errors.Errorf("no remote endpoint provided")
-		}
-		ep, err = validateBuildkitEndpoint(ep)
-		if err != nil {
-			return nil, err
-		}
-		setEp = true
-	case opts.Endpoint != "":
-		ep, err = validateEndpoint(dockerCli, opts.Endpoint)
-		if err != nil {
-			return nil, err
-		}
-		setEp = true
-	default:
-		if dockerCli.CurrentContext() == "default" && dockerCli.DockerEndpoint().TLSData != nil {
-			return nil, 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 context set to <context-name>")
-		}
-		ep, err = dockerutil.GetCurrentEndpoint(dockerCli)
-		if err != nil {
-			return nil, err
-		}
-		setEp = false
-	}
-
-	buildkitdConfigFile := opts.BuildkitdConfigFile
-	if buildkitdConfigFile == "" {
-		// if buildkit daemon config is not provided, check if the default one
-		// is available and use it
-		if f, ok := confutil.DefaultConfigFile(dockerCli); ok {
-			buildkitdConfigFile = f
-		}
-	}
-
-	if err := ng.Update(opts.NodeName, ep, opts.Platforms, setEp, opts.Append, buildkitdFlags, buildkitdConfigFile, driverOpts); err != nil {
-		return nil, err
-	}
-
-	if err := txn.Save(ng); err != nil {
-		return nil, err
-	}
-
-	b, err := New(dockerCli,
-		WithName(ng.Name),
-		WithStore(txn),
-		WithSkippedValidation(),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
-	defer cancel()
-
-	nodes, err := b.LoadNodes(timeoutCtx, WithData())
-	if err != nil {
-		return nil, 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 {
-				return nil, errors.Errorf("could not rollback to previous state: %s", err2)
-			}
-			return nil, err
-		}
-	}
-
-	if opts.Use && ep != "" {
-		current, err := dockerutil.GetCurrentEndpoint(dockerCli)
-		if err != nil {
-			return nil, err
-		}
-		if err := txn.SetCurrent(current, ng.Name, false, false); err != nil {
-			return nil, err
-		}
-	}
-
-	return b, nil
-}
-
-type LeaveOpts struct {
-	Name     string
-	NodeName string
-}
-
-func Leave(ctx context.Context, txn *store.Txn, dockerCli command.Cli, opts LeaveOpts) error {
-	if opts.Name == "" {
-		return errors.Errorf("leave requires instance name")
-	}
-	if opts.NodeName == "" {
-		return errors.Errorf("leave requires node name")
-	}
-
-	ng, err := txn.NodeGroupByName(opts.Name)
-	if err != nil {
-		if os.IsNotExist(errors.Cause(err)) {
-			return errors.Errorf("failed to find instance %q for leave", opts.Name)
-		}
-		return err
-	}
-
-	if err := ng.Leave(opts.NodeName); err != nil {
-		return err
-	}
-
-	ls, err := localstate.New(confutil.ConfigDir(dockerCli))
-	if err != nil {
-		return err
-	}
-	if err := ls.RemoveBuilderNode(ng.Name, opts.NodeName); err != nil {
-		return err
-	}
-
-	return txn.Save(ng)
-}
-
-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))
-		fields, err := csvReader.Read()
-		if err != nil {
-			return nil, err
-		}
-		for _, v := range fields {
-			p := strings.SplitN(v, "=", 2)
-			if len(p) != 2 {
-				return nil, errors.Errorf("invalid value %q, expecting k=v", v)
-			}
-			m[p[0]] = p[1]
-		}
-	}
-	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
-}
-
-// parseBuildkitdFlags parses buildkit flags
-func parseBuildkitdFlags(inp string, driver string, driverOpts map[string]string) (res []string, err error) {
-	if inp != "" {
-		res, err = shlex.Split(inp)
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to parse buildkit flags")
-		}
-	}
-
-	var allowInsecureEntitlements []string
-	flags := pflag.NewFlagSet("buildkitd", pflag.ContinueOnError)
-	flags.Usage = func() {}
-	flags.StringArrayVar(&allowInsecureEntitlements, "allow-insecure-entitlement", nil, "")
-	_ = flags.Parse(res)
-
-	var hasNetworkHostEntitlement bool
-	for _, e := range allowInsecureEntitlements {
-		if e == "network.host" {
-			hasNetworkHostEntitlement = true
-			break
-		}
-	}
-
-	if v, ok := driverOpts["network"]; ok && v == "host" && !hasNetworkHostEntitlement && driver == "docker-container" {
-		// always set network.host entitlement if user has set network=host
-		res = append(res, "--allow-insecure-entitlement=network.host")
-	} else if len(allowInsecureEntitlements) == 0 && (driver == "kubernetes" || driver == "docker-container") {
-		// set network.host entitlement if user does not provide any as
-		// network is isolated for container drivers.
-		res = append(res, "--allow-insecure-entitlement=network.host")
-	}
-
-	return res, nil
-}

builder/builder_test.go

@@ -1,139 +0,0 @@
-package builder
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"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")
-}
-
-func TestParseBuildkitdFlags(t *testing.T) {
-	testCases := []struct {
-		name       string
-		flags      string
-		driver     string
-		driverOpts map[string]string
-		expected   []string
-		wantErr    bool
-	}{
-		{
-			"docker-container no flags",
-			"",
-			"docker-container",
-			nil,
-			[]string{
-				"--allow-insecure-entitlement=network.host",
-			},
-			false,
-		},
-		{
-			"kubernetes no flags",
-			"",
-			"kubernetes",
-			nil,
-			[]string{
-				"--allow-insecure-entitlement=network.host",
-			},
-			false,
-		},
-		{
-			"remote no flags",
-			"",
-			"remote",
-			nil,
-			nil,
-			false,
-		},
-		{
-			"docker-container with insecure flag",
-			"--allow-insecure-entitlement=security.insecure",
-			"docker-container",
-			nil,
-			[]string{
-				"--allow-insecure-entitlement=security.insecure",
-			},
-			false,
-		},
-		{
-			"docker-container with insecure and host flag",
-			"--allow-insecure-entitlement=network.host --allow-insecure-entitlement=security.insecure",
-			"docker-container",
-			nil,
-			[]string{
-				"--allow-insecure-entitlement=network.host",
-				"--allow-insecure-entitlement=security.insecure",
-			},
-			false,
-		},
-		{
-			"docker-container with network host opt",
-			"",
-			"docker-container",
-			map[string]string{"network": "host"},
-			[]string{
-				"--allow-insecure-entitlement=network.host",
-			},
-			false,
-		},
-		{
-			"docker-container with host flag and network host opt",
-			"--allow-insecure-entitlement=network.host",
-			"docker-container",
-			map[string]string{"network": "host"},
-			[]string{
-				"--allow-insecure-entitlement=network.host",
-			},
-			false,
-		},
-		{
-			"docker-container with insecure, host flag and network host opt",
-			"--allow-insecure-entitlement=network.host --allow-insecure-entitlement=security.insecure",
-			"docker-container",
-			map[string]string{"network": "host"},
-			[]string{
-				"--allow-insecure-entitlement=network.host",
-				"--allow-insecure-entitlement=security.insecure",
-			},
-			false,
-		},
-		{
-			"error parsing flags",
-			"foo'",
-			"docker-container",
-			nil,
-			nil,
-			true,
-		},
-	}
-	for _, tt := range testCases {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			flags, err := parseBuildkitdFlags(tt.flags, tt.driver, tt.driverOpts)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			assert.Equal(t, tt.expected, flags)
-		})
-	}
-}

builder/node.go

@@ -2,11 +2,8 @@ package builder
 
 import (
 	"context"
-	"encoding/json"
 	"sort"
-	"strings"
 
-	"github.com/containerd/containerd/platforms"
 	"github.com/docker/buildx/driver"
 	ctxkube "github.com/docker/buildx/driver/kubernetes/context"
 	"github.com/docker/buildx/store"
@@ -142,7 +139,7 @@ func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []N
 					}
 				}
 
-				d, err := driver.GetDriver(ctx, "buildx_buildkit_"+n.Name, factory, n.Endpoint, dockerapi, imageopt.Auth, kcc, n.BuildkitdFlags, n.Files, n.DriverOpts, n.Platforms, b.opts.contextPathHash, lno.dialMeta)
+				d, err := driver.GetDriver(ctx, "buildx_buildkit_"+n.Name, factory, n.Endpoint, dockerapi, imageopt.Auth, kcc, n.Flags, n.Files, n.DriverOpts, n.Platforms, b.opts.contextPathHash, lno.dialMeta)
 				if err != nil {
 					node.Err = err
 					return nil
@@ -202,51 +199,6 @@ func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []N
 	return b.nodes, nil
 }
 
-func (n *Node) MarshalJSON() ([]byte, error) {
-	var status string
-	if n.DriverInfo != nil {
-		status = n.DriverInfo.Status.String()
-	}
-	var nerr string
-	if n.Err != nil {
-		status = "error"
-		nerr = strings.TrimSpace(n.Err.Error())
-	}
-	var pp []string
-	for _, p := range n.Platforms {
-		pp = append(pp, platforms.Format(p))
-	}
-	return json.Marshal(struct {
-		Name           string
-		Endpoint       string
-		BuildkitdFlags []string           `json:"Flags,omitempty"`
-		DriverOpts     map[string]string  `json:",omitempty"`
-		Files          map[string][]byte  `json:",omitempty"`
-		Status         string             `json:",omitempty"`
-		ProxyConfig    map[string]string  `json:",omitempty"`
-		Version        string             `json:",omitempty"`
-		Err            string             `json:",omitempty"`
-		IDs            []string           `json:",omitempty"`
-		Platforms      []string           `json:",omitempty"`
-		GCPolicy       []client.PruneInfo `json:",omitempty"`
-		Labels         map[string]string  `json:",omitempty"`
-	}{
-		Name:           n.Name,
-		Endpoint:       n.Endpoint,
-		BuildkitdFlags: n.BuildkitdFlags,
-		DriverOpts:     n.DriverOpts,
-		Files:          n.Files,
-		Status:         status,
-		ProxyConfig:    n.ProxyConfig,
-		Version:        n.Version,
-		Err:            nerr,
-		IDs:            n.IDs,
-		Platforms:      pp,
-		GCPolicy:       n.GCPolicy,
-		Labels:         n.Labels,
-	})
-}
-
 func (n *Node) loadData(ctx context.Context) error {
 	if n.Driver == nil {
 		return nil

commands/bake.go

@@ -23,6 +23,7 @@ import (
 	"github.com/docker/buildx/util/tracing"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/identity"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/moby/buildkit/util/progress/progressui"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -41,7 +42,9 @@ type bakeOptions struct {
 	exportLoad   bool
 }
 
-func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in bakeOptions, cFlags commonFlags) (err error) {
+func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags commonFlags) (err error) {
+	ctx := appcontext.Context()
+
 	ctx, end, err := tracing.TraceCurrentCommand(ctx, "bake")
 	if err != nil {
 		return err
@@ -72,9 +75,11 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
 
 	overrides := in.overrides
 	if in.exportPush {
-		overrides = append(overrides, "*.output=type=registry")
+		if in.exportLoad {
-	}
+			return errors.Errorf("push and load may not be set together at the moment")
-	if in.exportLoad {
+		}
+		overrides = append(overrides, "*.push=true")
+	} else if in.exportLoad {
 		overrides = append(overrides, "*.output=type=docker")
 	}
 	if cFlags.noCache != nil {
@@ -136,7 +141,7 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
 			if err == nil {
 				err = err1
 			}
-			if err == nil && progressMode != progressui.QuietMode && progressMode != progressui.RawJSONMode {
+			if err == nil && progressMode != progressui.QuietMode {
 				desktop.PrintBuildDetails(os.Stderr, printer.BuildRefs(), term)
 			}
 		}
@@ -261,7 +266,7 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			options.builder = rootOpts.builder
 			options.metadataFile = cFlags.metadataFile
 			// Other common flags (noCache, pull and progress) are processed in runBake function.
-			return runBake(cmd.Context(), dockerCli, args, options, cFlags)
+			return runBake(dockerCli, args, options, cFlags)
 		},
 		ValidArgsFunction: completion.BakeTargets(options.files),
 	}
@@ -290,17 +295,13 @@ func saveLocalStateGroup(dockerCli command.Cli, ref string, lsg localstate.State
 }
 
 func readBakeFiles(ctx context.Context, nodes []builder.Node, url string, names []string, stdin io.Reader, pw progress.Writer) (files []bake.File, inp *bake.Input, err error) {
-	var lnames []string // local
+	var lnames []string
-	var rnames []string // remote
+	var rnames []string
-	var anames []string // both
 	for _, v := range names {
 		if strings.HasPrefix(v, "cwd://") {
-			tname := strings.TrimPrefix(v, "cwd://")
+			lnames = append(lnames, strings.TrimPrefix(v, "cwd://"))
-			lnames = append(lnames, tname)
-			anames = append(anames, tname)
 		} else {
 			rnames = append(rnames, v)
-			anames = append(anames, v)
 		}
 	}
 
@@ -319,7 +320,7 @@ func readBakeFiles(ctx context.Context, nodes []builder.Node, url string, names
 			if url != "" {
 				lfiles, err = bake.ReadLocalFiles(lnames, stdin, sub)
 			} else {
-				lfiles, err = bake.ReadLocalFiles(anames, stdin, sub)
+				lfiles, err = bake.ReadLocalFiles(append(lnames, rnames...), stdin, sub)
 			}
 			return nil
 		})

commands/build.go

@@ -3,10 +3,8 @@ package commands
 import (
 	"bytes"
 	"context"
-	"crypto/sha256"
 	"encoding/base64"
 	"encoding/csv"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -15,8 +13,6 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"sync"
-	"time"
 
 	"github.com/containerd/console"
 	"github.com/docker/buildx/build"
@@ -31,12 +27,8 @@ import (
 	"github.com/docker/buildx/store"
 	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/buildflags"
-	"github.com/docker/buildx/util/cobrautil"
-	"github.com/docker/buildx/util/confutil"
 	"github.com/docker/buildx/util/desktop"
 	"github.com/docker/buildx/util/ioset"
-	"github.com/docker/buildx/util/metricutil"
-	"github.com/docker/buildx/util/osutil"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/buildx/util/tracing"
 	"github.com/docker/cli-docs-tool/annotation"
@@ -51,6 +43,7 @@ import (
 	"github.com/moby/buildkit/frontend/subrequests/outline"
 	"github.com/moby/buildkit/frontend/subrequests/targets"
 	"github.com/moby/buildkit/solver/errdefs"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/moby/buildkit/util/grpcerrors"
 	"github.com/moby/buildkit/util/progress/progressui"
 	"github.com/morikuni/aec"
@@ -58,8 +51,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/metric"
 	"google.golang.org/grpc/codes"
 )
 
@@ -219,59 +210,8 @@ func (o *buildOptions) toDisplayMode() (progressui.DisplayMode, error) {
 	return progress, nil
 }
 
-func buildMetricAttributes(dockerCli command.Cli, b *builder.Builder, options *buildOptions) attribute.Set {
+func runBuild(dockerCli command.Cli, options buildOptions) (err error) {
-	return attribute.NewSet(
+	ctx := appcontext.Context()
-		attribute.String("command.name", "build"),
-		attribute.Stringer("command.options.hash", &buildOptionsHash{
-			buildOptions: options,
-			configDir:    confutil.ConfigDir(dockerCli),
-		}),
-		attribute.String("driver.name", options.builder),
-		attribute.String("driver.type", b.Driver),
-	)
-}
-
-// buildOptionsHash computes a hash for the buildOptions when the String method is invoked.
-// This is done so we can delay the computation of the hash until needed by OTEL using
-// the fmt.Stringer interface.
-type buildOptionsHash struct {
-	*buildOptions
-	configDir  string
-	result     string
-	resultOnce sync.Once
-}
-
-func (o *buildOptionsHash) String() string {
-	o.resultOnce.Do(func() {
-		target := o.target
-		contextPath := o.contextPath
-		dockerfile := o.dockerfileName
-		if dockerfile == "" {
-			dockerfile = "Dockerfile"
-		}
-
-		if contextPath != "-" && osutil.IsLocalDir(contextPath) {
-			contextPath = osutil.ToAbs(contextPath)
-		}
-		salt := confutil.TryNodeIdentifier(o.configDir)
-
-		h := sha256.New()
-		for _, s := range []string{target, contextPath, dockerfile, salt} {
-			_, _ = io.WriteString(h, s)
-			h.Write([]byte{0})
-		}
-		o.result = hex.EncodeToString(h.Sum(nil))
-	})
-	return o.result
-}
-
-func runBuild(ctx context.Context, dockerCli command.Cli, options buildOptions) (err error) {
-	mp, err := metricutil.NewMeterProvider(ctx, dockerCli)
-	if err != nil {
-		return err
-	}
-	defer mp.Report(context.Background())
-
 	ctx, end, err := tracing.TraceCurrentCommand(ctx, "build")
 	if err != nil {
 		return err
@@ -312,7 +252,6 @@ func runBuild(ctx context.Context, dockerCli command.Cli, options buildOptions)
 	if _, err := console.ConsoleFromFile(os.Stderr); err == nil {
 		term = true
 	}
-	attributes := buildMetricAttributes(dockerCli, b, &options)
 
 	ctx2, cancel := context.WithCancel(context.TODO())
 	defer cancel()
@@ -326,7 +265,6 @@ func runBuild(ctx context.Context, dockerCli command.Cli, options buildOptions)
 			fmt.Sprintf("building with %q instance using %s driver", b.Name, b.Driver),
 			fmt.Sprintf("%s:%s", b.Driver, b.Name),
 		),
-		progress.WithMetrics(mp, attributes),
 		progress.WithOnClose(func() {
 			printWarnings(os.Stderr, printer.Warnings(), progressMode)
 		}),
@@ -335,7 +273,6 @@ func runBuild(ctx context.Context, dockerCli command.Cli, options buildOptions)
 		return err
 	}
 
-	done := timeBuildCommand(mp, attributes)
 	var resp *client.SolveResponse
 	var retErr error
 	if isExperimental() {
@@ -347,19 +284,14 @@ func runBuild(ctx context.Context, dockerCli command.Cli, options buildOptions)
 	if err := printer.Wait(); retErr == nil {
 		retErr = err
 	}
-
-	done(retErr)
 	if retErr != nil {
 		return retErr
 	}
 
-	switch progressMode {
+	if progressMode != progressui.QuietMode {
-	case progressui.RawJSONMode:
-		// no additional display
-	case progressui.QuietMode:
-		fmt.Println(getImageID(resp.ExporterResponse))
-	default:
 		desktop.PrintBuildDetails(os.Stderr, printer.BuildRefs(), term)
+	} else {
+		fmt.Println(getImageID(resp.ExporterResponse))
 	}
 	if options.imageIDFile != "" {
 		if err := os.WriteFile(options.imageIDFile, []byte(getImageID(resp.ExporterResponse)), 0644); err != nil {
@@ -540,7 +472,7 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions, debugConfig *debug.D
 				options.invokeConfig = iConfig
 			}
 
-			return runBuild(cmd.Context(), dockerCli, *options)
+			return runBuild(dockerCli, *options)
 		},
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			return nil, cobra.ShellCompDirectiveFilterDirs
@@ -591,7 +523,7 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions, debugConfig *debug.D
 
 	if isExperimental() {
 		flags.StringVar(&options.printFunc, "print", "", "Print result of information request (e.g., outline, targets)")
-		cobrautil.MarkFlagsExperimental(flags, "print")
+		flags.SetAnnotation("print", "experimentalCLI", nil)
 	}
 
 	flags.BoolVar(&options.exportPush, "push", false, `Shorthand for "--output=type=registry"`)
@@ -600,7 +532,7 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions, debugConfig *debug.D
 
 	flags.StringArrayVar(&options.secrets, "secret", []string{}, `Secret to expose to the build (format: "id=mysecret[,src=/local/secret]")`)
 
-	flags.Var(&options.shmSize, "shm-size", `Shared memory size for build containers`)
+	flags.Var(&options.shmSize, "shm-size", `Size of "/dev/shm"`)
 
 	flags.StringArrayVar(&options.ssh, "ssh", []string{}, `SSH agent socket or keys to expose to the build (format: "default|<id>[=<socket>|<key>[,<key>]]")`)
 
@@ -620,9 +552,11 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions, debugConfig *debug.D
 	if isExperimental() {
 		// TODO: move this to debug command if needed
 		flags.StringVar(&options.Root, "root", "", "Specify root directory of server to connect")
+		flags.SetAnnotation("root", "experimentalCLI", nil)
 		flags.BoolVar(&options.Detach, "detach", false, "Detach buildx server (supported only on linux)")
+		flags.SetAnnotation("detach", "experimentalCLI", nil)
 		flags.StringVar(&options.ServerConfig, "server-config", "", "Specify buildx server config file (used only when launching new server)")
-		cobrautil.MarkFlagsExperimental(flags, "root", "detach", "server-config")
+		flags.SetAnnotation("server-config", "experimentalCLI", nil)
 	}
 
 	// hidden flags
@@ -645,7 +579,7 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions, debugConfig *debug.D
 	flags.BoolVar(&ignoreBool, "squash", false, "Squash newly built layers into a single new layer")
 	flags.MarkHidden("squash")
 	flags.SetAnnotation("squash", "flag-warn", []string{"experimental flag squash is removed with BuildKit. You should squash inside build using a multi-stage Dockerfile for efficiency."})
-	cobrautil.MarkFlagsExperimental(flags, "squash")
+	flags.SetAnnotation("squash", "experimentalCLI", nil)
 
 	flags.StringVarP(&ignore, "memory", "m", "", "Memory limit")
 	flags.MarkHidden("memory")
@@ -815,7 +749,7 @@ func dockerUlimitToControllerUlimit(u *dockeropts.UlimitOpt) *controllerapi.Ulim
 }
 
 func printWarnings(w io.Writer, warnings []client.VertexWarning, mode progressui.DisplayMode) {
-	if len(warnings) == 0 || mode == progressui.QuietMode || mode == progressui.RawJSONMode {
+	if len(warnings) == 0 || mode == progressui.QuietMode {
 		return
 	}
 	fmt.Fprintf(w, "\n ")
@@ -992,38 +926,3 @@ func maybeJSONArray(v string) []string {
 	}
 	return []string{v}
 }
-
-// timeBuildCommand will start a timer for timing the build command. It records the time when the returned
-// function is invoked into a metric.
-func timeBuildCommand(mp metric.MeterProvider, attrs attribute.Set) func(err error) {
-	meter := metricutil.Meter(mp)
-	counter, _ := meter.Float64Counter("command.time",
-		metric.WithDescription("Measures the duration of the build command."),
-		metric.WithUnit("ms"),
-	)
-
-	start := time.Now()
-	return func(err error) {
-		dur := float64(time.Since(start)) / float64(time.Millisecond)
-		extraAttrs := attribute.NewSet()
-		if err != nil {
-			extraAttrs = attribute.NewSet(
-				attribute.String("error.type", otelErrorType(err)),
-			)
-		}
-		counter.Add(context.Background(), dur,
-			metric.WithAttributeSet(attrs),
-			metric.WithAttributeSet(extraAttrs),
-		)
-	}
-}
-
-// otelErrorType returns an attribute for the error type based on the error category.
-// If nil, this function returns an invalid attribute.
-func otelErrorType(err error) string {
-	name := "generic"
-	if errors.Is(err, context.Canceled) {
-		name = "canceled"
-	}
-	return name
-}

commands/create.go

@@ -3,34 +3,71 @@ package commands
 import (
 	"bytes"
 	"context"
+	"encoding/csv"
 	"fmt"
+	"net/url"
+	"os"
+	"strings"
+	"time"
 
 	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/driver"
+	k8sutil "github.com/docker/buildx/driver/kubernetes/util"
+	remoteutil "github.com/docker/buildx/driver/remote/util"
+	"github.com/docker/buildx/localstate"
+	"github.com/docker/buildx/store"
 	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/cobrautil"
 	"github.com/docker/buildx/util/cobrautil/completion"
+	"github.com/docker/buildx/util/confutil"
+	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/cli/cli"
 	"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"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
 type createOptions struct {
-	name                string
+	name         string
-	driver              string
+	driver       string
-	nodeName            string
+	nodeName     string
-	platform            []string
+	platform     []string
-	actionAppend        bool
+	actionAppend bool
-	actionLeave         bool
+	actionLeave  bool
-	use                 bool
+	use          bool
-	driverOpts          []string
+	flags        string
-	buildkitdFlags      string
+	configFile   string
-	buildkitdConfigFile string
+	driverOpts   []string
-	bootstrap           bool
+	bootstrap    bool
 	// upgrade      bool // perform upgrade of the driver
 }
 
-func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, args []string) error {
+func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
+	ctx := appcontext.Context()
+
+	if in.name == "default" {
+		return errors.Errorf("default is a reserved name and cannot be used to identify builder instance")
+	}
+
+	if in.actionLeave {
+		if in.name == "" {
+			return errors.Errorf("leave requires instance name")
+		}
+		if in.nodeName == "" {
+			return errors.Errorf("leave requires node name but --node not set")
+		}
+	}
+
+	if in.actionAppend {
+		if in.name == "" {
+			logrus.Warnf("append used without name, creating a new instance instead")
+		}
+	}
+
 	txn, release, err := storeutil.GetStore(dockerCli)
 	if err != nil {
 		return err
@@ -38,34 +75,232 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 	// Ensure the file lock gets released no matter what happens.
 	defer release()
 
-	if in.actionLeave {
+	name := in.name
-		return builder.Leave(ctx, txn, dockerCli, builder.LeaveOpts{
+	if name == "" {
-			Name:     in.name,
+		name, err = store.GenerateName(txn)
-			NodeName: in.nodeName,
+		if err != nil {
-		})
+			return err
+		}
+	}
+
+	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)) {
+			if in.actionAppend && in.name != "" {
+				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)
+			}
+		} 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, nil)
+			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)
+		}
+		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,
+		}
+	}
+
+	var flags []string
+	if in.flags != "" {
+		flags, err = shlex.Split(in.flags)
+		if err != nil {
+			return errors.Wrap(err, "failed to parse buildkit flags")
+		}
 	}
 
 	var ep string
-	if len(args) > 0 {
+	var setEp bool
-		ep = args[0]
+	if in.actionLeave {
+		if err := ng.Leave(in.nodeName); err != nil {
+			return err
+		}
+		ls, err := localstate.New(confutil.ConfigDir(dockerCli))
+		if err != nil {
+			return err
+		}
+		if err := ls.RemoveBuilderNode(ng.Name, in.nodeName); err != nil {
+			return err
+		}
+	} else {
+		switch {
+		case driverName == "kubernetes":
+			if len(args) > 0 {
+				logrus.Warnf("kubernetes driver does not support endpoint args %q", args[0])
+			}
+			// generate node name if not provided to avoid duplicated endpoint
+			// error: https://github.com/docker/setup-buildx-action/issues/215
+			nodeName := in.nodeName
+			if nodeName == "" {
+				nodeName, err = k8sutil.GenerateNodeName(name, txn)
+				if err != nil {
+					return err
+				}
+			}
+			// naming endpoint to make --append works
+			ep = (&url.URL{
+				Scheme: driverName,
+				Path:   "/" + name,
+				RawQuery: (&url.Values{
+					"deployment": {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 {
+			return err
+		}
 	}
 
-	b, err := builder.Create(ctx, txn, dockerCli, builder.CreateOpts{
+	if err := txn.Save(ng); err != nil {
-		Name:                in.name,
+		return err
-		Driver:              in.driver,
+	}
-		NodeName:            in.nodeName,
+
-		Platforms:           in.platform,
+	b, err := builder.New(dockerCli,
-		DriverOpts:          in.driverOpts,
+		builder.WithName(ng.Name),
-		BuildkitdFlags:      in.buildkitdFlags,
+		builder.WithStore(txn),
-		BuildkitdConfigFile: in.buildkitdConfigFile,
+		builder.WithSkippedValidation(),
-		Use:                 in.use,
+	)
-		Endpoint:            ep,
-		Append:              in.actionAppend,
-	})
 	if err != nil {
 		return err
 	}
 
+	timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
+	defer cancel()
+
+	nodes, err := b.LoadNodes(timeoutCtx, builder.WithData())
+	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)
+		if err != nil {
+			return err
+		}
+		if err := txn.SetCurrent(current, ng.Name, false, false); err != nil {
+			return err
+		}
+	}
+
 	// The store is no longer used from this point.
 	// Release it so we aren't holding the file lock during the boot.
 	release()
@@ -76,7 +311,7 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 		}
 	}
 
-	fmt.Printf("%s\n", b.Name)
+	fmt.Printf("%s\n", ng.Name)
 	return nil
 }
 
@@ -96,7 +331,7 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
 		Short: "Create a new builder instance",
 		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runCreate(cmd.Context(), dockerCli, options, args)
+			return runCreate(dockerCli, options, args)
 		},
 		ValidArgsFunction: completion.Disable,
 	}
@@ -106,16 +341,12 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
 	flags.StringVar(&options.name, "name", "", "Builder instance name")
 	flags.StringVar(&options.driver, "driver", "", fmt.Sprintf("Driver to use (available: %s)", drivers.String()))
 	flags.StringVar(&options.nodeName, "node", "", "Create/modify node with given name")
+	flags.StringVar(&options.flags, "buildkitd-flags", "", "Flags for buildkitd daemon")
+	flags.StringVar(&options.configFile, "config", "", "BuildKit config file")
 	flags.StringArrayVar(&options.platform, "platform", []string{}, "Fixed platforms for current node")
 	flags.StringArrayVar(&options.driverOpts, "driver-opt", []string{}, "Options for the driver")
-	flags.StringVar(&options.buildkitdFlags, "buildkitd-flags", "", "BuildKit daemon flags")
-
-	// we allow for both "--config" and "--buildkitd-config", although the latter is the recommended way to avoid ambiguity.
-	flags.StringVar(&options.buildkitdConfigFile, "buildkitd-config", "", "BuildKit daemon config file")
-	flags.StringVar(&options.buildkitdConfigFile, "config", "", "BuildKit daemon config file")
-	flags.MarkHidden("config")
-
 	flags.BoolVar(&options.bootstrap, "bootstrap", false, "Boot builder after creation")
+
 	flags.BoolVar(&options.actionAppend, "append", false, "Append a node to builder instead of changing it")
 	flags.BoolVar(&options.actionLeave, "leave", false, "Remove a node from builder instead of changing it")
 	flags.BoolVar(&options.use, "use", false, "Set the current builder instance")
@@ -125,3 +356,49 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
 
 	return cmd
 }
+
+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))
+		fields, err := csvReader.Read()
+		if err != nil {
+			return nil, err
+		}
+		for _, v := range fields {
+			p := strings.SplitN(v, "=", 2)
+			if len(p) != 2 {
+				return nil, errors.Errorf("invalid value %q, expecting k=v", v)
+			}
+			m[p[0]] = p[1]
+		}
+	}
+	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

@@ -0,0 +1,26 @@
+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/debug/root.go

@@ -10,7 +10,6 @@ import (
 	"github.com/docker/buildx/controller/control"
 	controllerapi "github.com/docker/buildx/controller/pb"
 	"github.com/docker/buildx/monitor"
-	"github.com/docker/buildx/util/cobrautil"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/progress/progressui"
@@ -43,6 +42,9 @@ func RootCmd(dockerCli command.Cli, children ...DebuggableCmd) *cobra.Command {
 		Use:   "debug",
 		Short: "Start debugger",
 		Args:  cobra.NoArgs,
+		Annotations: map[string]string{
+			"experimentalCLI": "",
+		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			printer, err := progress.NewPrinter(context.TODO(), os.Stderr, progressui.DisplayMode(progressMode))
 			if err != nil {
@@ -71,19 +73,21 @@ func RootCmd(dockerCli command.Cli, children ...DebuggableCmd) *cobra.Command {
 			return err
 		},
 	}
-	cobrautil.MarkCommandExperimental(cmd)
 
 	flags := cmd.Flags()
 	flags.StringVar(&options.InvokeFlag, "invoke", "", "Launch a monitor with executing specified command")
+	flags.SetAnnotation("invoke", "experimentalCLI", nil)
 	flags.StringVar(&options.OnFlag, "on", "error", "When to launch the monitor ([always, error])")
+	flags.SetAnnotation("on", "experimentalCLI", nil)
 
 	flags.StringVar(&controlOptions.Root, "root", "", "Specify root directory of server to connect for the monitor")
+	flags.SetAnnotation("root", "experimentalCLI", nil)
 	flags.BoolVar(&controlOptions.Detach, "detach", runtime.GOOS == "linux", "Detach buildx server for the monitor (supported only on linux)")
+	flags.SetAnnotation("detach", "experimentalCLI", nil)
 	flags.StringVar(&controlOptions.ServerConfig, "server-config", "", "Specify buildx server config file for the monitor (used only when launching new server)")
+	flags.SetAnnotation("server-config", "experimentalCLI", nil)
 	flags.StringVar(&progressMode, "progress", "auto", `Set type of progress output ("auto", "plain", "tty") for the monitor. Use plain to show container output`)
 
-	cobrautil.MarkFlagsExperimental(flags, "invoke", "on", "root", "detach", "server-config")
-
 	for _, c := range children {
 		cmd.AddCommand(c.NewDebugger(&options))
 	}

commands/dial_stdio.go

@@ -1,132 +0,0 @@
-package commands
-
-import (
-	"io"
-	"net"
-	"os"
-
-	"github.com/containerd/containerd/platforms"
-	"github.com/docker/buildx/build"
-	"github.com/docker/buildx/builder"
-	"github.com/docker/buildx/util/progress"
-	"github.com/docker/cli/cli/command"
-	"github.com/moby/buildkit/util/appcontext"
-	"github.com/moby/buildkit/util/progress/progressui"
-	v1 "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-	"golang.org/x/sync/errgroup"
-)
-
-type stdioOptions struct {
-	builder  string
-	platform string
-	progress string
-}
-
-func runDialStdio(dockerCli command.Cli, opts stdioOptions) error {
-	ctx := appcontext.Context()
-
-	contextPathHash, _ := os.Getwd()
-	b, err := builder.New(dockerCli,
-		builder.WithName(opts.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)
-	if err != nil {
-		return err
-	}
-
-	printer, err := progress.NewPrinter(ctx, os.Stderr, progressui.DisplayMode(opts.progress), progress.WithPhase("dial-stdio"), progress.WithDesc("builder: "+b.Name, "builder:"+b.Name))
-	if err != nil {
-		return err
-	}
-
-	var p *v1.Platform
-	if opts.platform != "" {
-		pp, err := platforms.Parse(opts.platform)
-		if err != nil {
-			return errors.Wrapf(err, "invalid platform %q", opts.platform)
-		}
-		p = &pp
-	}
-
-	defer printer.Wait()
-
-	return progress.Wrap("Proxying to builder", printer.Write, func(sub progress.SubLogger) error {
-		var conn net.Conn
-
-		err := sub.Wrap("Dialing builder", func() error {
-			conn, err = build.Dial(ctx, nodes, printer, p)
-			if err != nil {
-				return err
-			}
-			return nil
-		})
-		if err != nil {
-			return err
-		}
-
-		defer conn.Close()
-
-		go func() {
-			<-ctx.Done()
-			closeWrite(conn)
-		}()
-
-		var eg errgroup.Group
-
-		eg.Go(func() error {
-			_, err := io.Copy(conn, os.Stdin)
-			closeWrite(conn)
-			return err
-		})
-		eg.Go(func() error {
-			_, err := io.Copy(os.Stdout, conn)
-			closeRead(conn)
-			return err
-		})
-		return eg.Wait()
-	})
-}
-
-func closeRead(conn net.Conn) error {
-	if c, ok := conn.(interface{ CloseRead() error }); ok {
-		return c.CloseRead()
-	}
-	return conn.Close()
-}
-
-func closeWrite(conn net.Conn) error {
-	if c, ok := conn.(interface{ CloseWrite() error }); ok {
-		return c.CloseWrite()
-	}
-	return conn.Close()
-}
-
-func dialStdioCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
-	opts := stdioOptions{}
-
-	cmd := &cobra.Command{
-		Use:   "dial-stdio",
-		Short: "Proxy current stdio streams to builder instance",
-		Args:  cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.builder = rootOpts.builder
-			return runDialStdio(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	cmd.Flags()
-	flags.StringVar(&opts.platform, "platform", os.Getenv("DOCKER_DEFAULT_PLATFORM"), "Target platform: this is used for node selection")
-	flags.StringVar(&opts.progress, "progress", "quiet", "Set type of progress output (auto, plain, tty).")
-	return cmd
-}

commands/diskusage.go

@@ -1,7 +1,6 @@
 package commands
 
 import (
-	"context"
 	"fmt"
 	"io"
 	"os"
@@ -16,6 +15,7 @@ import (
 	"github.com/docker/cli/opts"
 	"github.com/docker/go-units"
 	"github.com/moby/buildkit/client"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
 )
@@ -26,7 +26,9 @@ type duOptions struct {
 	verbose bool
 }
 
-func runDiskUsage(ctx context.Context, dockerCli command.Cli, opts duOptions) error {
+func runDiskUsage(dockerCli command.Cli, opts duOptions) error {
+	ctx := appcontext.Context()
+
 	pi, err := toBuildkitPruneInfo(opts.filter.Value())
 	if err != nil {
 		return err
@@ -112,7 +114,7 @@ func duCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 		Args:  cli.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options.builder = rootOpts.builder
-			return runDiskUsage(cmd.Context(), dockerCli, options)
+			return runDiskUsage(dockerCli, options)
 		},
 		ValidArgsFunction: completion.Disable,
 	}

commands/imagetools/create.go

@@ -13,6 +13,7 @@ import (
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/command"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/moby/buildkit/util/progress/progressui"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -31,7 +32,7 @@ type createOptions struct {
 	progress     string
 }
 
-func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, args []string) error {
+func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 	if len(args) == 0 && len(in.files) == 0 {
 		return errors.Errorf("no sources specified")
 	}
@@ -112,6 +113,8 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 		}
 	}
 
+	ctx := appcontext.Context()
+
 	b, err := builder.New(dockerCli, builder.WithName(in.builder))
 	if err != nil {
 		return err
@@ -271,7 +274,7 @@ func createCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
 		Short: "Create a new image based on source images",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options.builder = *opts.Builder
-			return runCreate(cmd.Context(), dockerCli, options, args)
+			return runCreate(dockerCli, options, args)
 		},
 		ValidArgsFunction: completion.Disable,
 	}

commands/imagetools/inspect.go

@@ -1,14 +1,13 @@
 package commands
 
 import (
-	"context"
-
 	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/cli-docs-tool/annotation"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -19,7 +18,9 @@ type inspectOptions struct {
 	raw     bool
 }
 
-func runInspect(ctx context.Context, dockerCli command.Cli, in inspectOptions, name string) error {
+func runInspect(dockerCli command.Cli, in inspectOptions, name string) error {
+	ctx := appcontext.Context()
+
 	if in.format != "" && in.raw {
 		return errors.Errorf("format and raw cannot be used together")
 	}
@@ -50,7 +51,7 @@ func inspectCmd(dockerCli command.Cli, rootOpts RootOptions) *cobra.Command {
 		Args:  cli.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options.builder = *rootOpts.Builder
-			return runInspect(cmd.Context(), dockerCli, options, args[0])
+			return runInspect(dockerCli, options, args[0])
 		},
 		ValidArgsFunction: completion.Disable,
 	}

commands/inspect.go

@@ -17,6 +17,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/debug"
 	"github.com/docker/go-units"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +26,9 @@ type inspectOptions struct {
 	builder   string
 }
 
-func runInspect(ctx context.Context, dockerCli command.Cli, in inspectOptions) error {
+func runInspect(dockerCli command.Cli, in inspectOptions) error {
+	ctx := appcontext.Context()
+
 	b, err := builder.New(dockerCli,
 		builder.WithName(in.builder),
 		builder.WithSkippedValidation(),
@@ -84,11 +87,11 @@ func runInspect(ctx context.Context, dockerCli command.Cli, in inspectOptions) e
 				fmt.Fprintf(w, "Error:\t%s\n", err.Error())
 			} else {
 				fmt.Fprintf(w, "Status:\t%s\n", nodes[i].DriverInfo.Status)
-				if len(n.BuildkitdFlags) > 0 {
+				if len(n.Flags) > 0 {
-					fmt.Fprintf(w, "BuildKit daemon flags:\t%s\n", strings.Join(n.BuildkitdFlags, " "))
+					fmt.Fprintf(w, "Flags:\t%s\n", strings.Join(n.Flags, " "))
 				}
 				if nodes[i].Version != "" {
-					fmt.Fprintf(w, "BuildKit version:\t%s\n", nodes[i].Version)
+					fmt.Fprintf(w, "Buildkit:\t%s\n", nodes[i].Version)
 				}
 				platforms := platformutil.FormatInGroups(n.Node.Platforms, n.Platforms)
 				if len(platforms) > 0 {
@@ -147,7 +150,7 @@ func inspectCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			if len(args) > 0 {
 				options.builder = args[0]
 			}
-			return runInspect(cmd.Context(), dockerCli, options)
+			return runInspect(dockerCli, options)
 		},
 		ValidArgsFunction: completion.BuilderNames(dockerCli),
 	}

commands/ls.go

@@ -2,43 +2,30 @@ package commands
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"sort"
+	"io"
 	"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/cobrautil/completion"
 	"github.com/docker/buildx/util/platformutil"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/command/formatter"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
 )
 
-const (
-	lsNameNodeHeader       = "NAME/NODE"
-	lsDriverEndpointHeader = "DRIVER/ENDPOINT"
-	lsStatusHeader         = "STATUS"
-	lsLastActivityHeader   = "LAST ACTIVITY"
-	lsBuildkitHeader       = "BUILDKIT"
-	lsPlatformsHeader      = "PLATFORMS"
-
-	lsIndent = ` \_ `
-
-	lsDefaultTableFormat = "table {{.Name}}\t{{.DriverEndpoint}}\t{{.Status}}\t{{.Buildkit}}\t{{.Platforms}}"
-)
-
 type lsOptions struct {
-	format string
 }
 
-func runLs(ctx context.Context, dockerCli command.Cli, in lsOptions) error {
+func runLs(dockerCli command.Cli, in lsOptions) error {
+	ctx := appcontext.Context()
+
 	txn, release, err := storeutil.GetStore(dockerCli)
 	if err != nil {
 		return err
@@ -72,9 +59,22 @@ func runLs(ctx context.Context, dockerCli command.Cli, in lsOptions) error {
 		return err
 	}
 
-	if hasErrors, err := lsPrint(dockerCli, current, builders, in.format); err != nil {
+	w := tabwriter.NewWriter(dockerCli.Out(), 0, 0, 1, ' ', 0)
-		return err
+	fmt.Fprintf(w, "NAME/NODE\tDRIVER/ENDPOINT\tSTATUS\tBUILDKIT\tPLATFORMS\n")
-	} else if hasErrors {
+
+	printErr := false
+	for _, b := range builders {
+		if current.Name == b.Name {
+			b.Name += " *"
+		}
+		if ok := printBuilder(w, b); !ok {
+			printErr = true
+		}
+	}
+
+	w.Flush()
+
+	if printErr {
 		_, _ = fmt.Fprintf(dockerCli.Err(), "\n")
 		for _, b := range builders {
 			if b.Err() != nil {
@@ -92,6 +92,31 @@ func runLs(ctx context.Context, dockerCli command.Cli, in lsOptions) error {
 	return nil
 }
 
+func printBuilder(w io.Writer, b *builder.Builder) (ok bool) {
+	ok = true
+	var err string
+	if b.Err() != nil {
+		ok = false
+		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()
+			}
+			if n.Err != nil {
+				ok = false
+				fmt.Fprintf(w, "  %s\t%s\t%s\t\t\n", n.Name, n.Endpoint, "error")
+			} 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), ", "))
+			}
+		}
+	}
+	return
+}
+
 func lsCmd(dockerCli command.Cli) *cobra.Command {
 	var options lsOptions
 
@@ -100,175 +125,13 @@ func lsCmd(dockerCli command.Cli) *cobra.Command {
 		Short: "List builder instances",
 		Args:  cli.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runLs(cmd.Context(), dockerCli, options)
+			return runLs(dockerCli, options)
 		},
 		ValidArgsFunction: completion.Disable,
 	}
 
-	flags := cmd.Flags()
-	flags.StringVar(&options.format, "format", formatter.TableFormatKey, "Format the output")
-
 	// hide builder persistent flag for this command
 	cobrautil.HideInheritedFlags(cmd, "builder")
 
 	return cmd
 }
-
-func lsPrint(dockerCli command.Cli, current *store.NodeGroup, builders []*builder.Builder, format string) (hasErrors bool, _ error) {
-	if format == formatter.TableFormatKey {
-		format = lsDefaultTableFormat
-	}
-
-	ctx := formatter.Context{
-		Output: dockerCli.Out(),
-		Format: formatter.Format(format),
-	}
-
-	sort.SliceStable(builders, func(i, j int) bool {
-		ierr := builders[i].Err() != nil
-		jerr := builders[j].Err() != nil
-		if ierr && !jerr {
-			return false
-		} else if !ierr && jerr {
-			return true
-		}
-		return i < j
-	})
-
-	render := func(format func(subContext formatter.SubContext) error) error {
-		for _, b := range builders {
-			if err := format(&lsContext{
-				Builder: &lsBuilder{
-					Builder: b,
-					Current: b.Name == current.Name,
-				},
-				format: ctx.Format,
-			}); err != nil {
-				return err
-			}
-			if b.Err() != nil {
-				if ctx.Format.IsTable() {
-					hasErrors = true
-				}
-				continue
-			}
-			for _, n := range b.Nodes() {
-				if n.Err != nil {
-					if ctx.Format.IsTable() {
-						hasErrors = true
-					}
-				}
-				if err := format(&lsContext{
-					format: ctx.Format,
-					Builder: &lsBuilder{
-						Builder: b,
-						Current: b.Name == current.Name,
-					},
-					node: n,
-				}); err != nil {
-					return err
-				}
-			}
-		}
-		return nil
-	}
-
-	lsCtx := lsContext{}
-	lsCtx.Header = formatter.SubHeaderContext{
-		"Name":           lsNameNodeHeader,
-		"DriverEndpoint": lsDriverEndpointHeader,
-		"LastActivity":   lsLastActivityHeader,
-		"Status":         lsStatusHeader,
-		"Buildkit":       lsBuildkitHeader,
-		"Platforms":      lsPlatformsHeader,
-	}
-
-	return hasErrors, ctx.Write(&lsCtx, render)
-}
-
-type lsBuilder struct {
-	*builder.Builder
-	Current bool
-}
-
-type lsContext struct {
-	formatter.HeaderContext
-	Builder *lsBuilder
-
-	format formatter.Format
-	node   builder.Node
-}
-
-func (c *lsContext) MarshalJSON() ([]byte, error) {
-	return json.Marshal(c.Builder)
-}
-
-func (c *lsContext) Name() string {
-	if c.node.Name == "" {
-		name := c.Builder.Name
-		if c.Builder.Current && c.format.IsTable() {
-			name += "*"
-		}
-		return name
-	}
-	if c.format.IsTable() {
-		return lsIndent + c.node.Name
-	}
-	return c.node.Name
-}
-
-func (c *lsContext) DriverEndpoint() string {
-	if c.node.Name == "" {
-		return c.Builder.Driver
-	}
-	if c.format.IsTable() {
-		return lsIndent + c.node.Endpoint
-	}
-	return c.node.Endpoint
-}
-
-func (c *lsContext) LastActivity() string {
-	if c.node.Name != "" || c.Builder.LastActivity.IsZero() {
-		return ""
-	}
-	return c.Builder.LastActivity.UTC().Format(time.RFC3339)
-}
-
-func (c *lsContext) Status() string {
-	if c.node.Name == "" {
-		if c.Builder.Err() != nil {
-			return "error"
-		}
-		return ""
-	}
-	if c.node.Err != nil {
-		return "error"
-	}
-	if c.node.DriverInfo != nil {
-		return c.node.DriverInfo.Status.String()
-	}
-	return ""
-}
-
-func (c *lsContext) Buildkit() string {
-	if c.node.Name == "" {
-		return ""
-	}
-	return c.node.Version
-}
-
-func (c *lsContext) Platforms() string {
-	if c.node.Name == "" {
-		return ""
-	}
-	return strings.Join(platformutil.FormatInGroups(c.node.Node.Platforms, c.node.Platforms), ", ")
-}
-
-func (c *lsContext) Error() string {
-	if c.node.Name != "" && c.node.Err != nil {
-		return c.node.Err.Error()
-	} else if err := c.Builder.Err(); err != nil {
-		return err.Error()
-	}
-	return ""
-}

commands/prune.go

@@ -1,7 +1,6 @@
 package commands
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"strings"
@@ -16,6 +15,7 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/go-units"
 	"github.com/moby/buildkit/client"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
@@ -35,7 +35,9 @@ const (
 	allCacheWarning = `WARNING! This will remove all build cache. Are you sure you want to continue?`
 )
 
-func runPrune(ctx context.Context, dockerCli command.Cli, opts pruneOptions) error {
+func runPrune(dockerCli command.Cli, opts pruneOptions) error {
+	ctx := appcontext.Context()
+
 	pruneFilters := opts.filter.Value()
 	pruneFilters = command.PruneFilters(dockerCli, pruneFilters)
 
@@ -49,12 +51,8 @@ func runPrune(ctx context.Context, dockerCli command.Cli, opts pruneOptions) err
 		warning = allCacheWarning
 	}
 
-	if !opts.force {
+	if !opts.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), warning) {
-		if ok, err := prompt(ctx, dockerCli.In(), dockerCli.Out(), warning); err != nil {
+		return nil
-			return err
-		} else if !ok {
-			return nil
-		}
 	}
 
 	b, err := builder.New(dockerCli, builder.WithName(opts.builder))
@@ -140,7 +138,7 @@ func pruneCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 		Args:  cli.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options.builder = rootOpts.builder
-			return runPrune(cmd.Context(), dockerCli, options)
+			return runPrune(dockerCli, options)
 		},
 		ValidArgsFunction: completion.Disable,
 	}

commands/rm.go

@@ -9,14 +9,16 @@ import (
 	"github.com/docker/buildx/store"
 	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/cobrautil/completion"
+	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
 )
 
 type rmOptions struct {
-	builders    []string
+	builder     string
 	keepState   bool
 	keepDaemon  bool
 	allInactive bool
@@ -27,13 +29,11 @@ const (
 	rmInactiveWarning = `WARNING! This will remove all builders that are not in running state. Are you sure you want to continue?`
 )
 
-func runRm(ctx context.Context, dockerCli command.Cli, in rmOptions) error {
+func runRm(dockerCli command.Cli, in rmOptions) error {
-	if in.allInactive && !in.force {
+	ctx := appcontext.Context()
-		if ok, err := prompt(ctx, dockerCli.In(), dockerCli.Out(), rmInactiveWarning); err != nil {
+
-			return err
+	if in.allInactive && !in.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), rmInactiveWarning) {
-		} else if !ok {
+		return nil
-			return nil
-		}
 	}
 
 	txn, release, err := storeutil.GetStore(dockerCli)
@@ -46,52 +46,33 @@ func runRm(ctx context.Context, dockerCli command.Cli, in rmOptions) error {
 		return rmAllInactive(ctx, txn, dockerCli, in)
 	}
 
-	eg, _ := errgroup.WithContext(ctx)
+	b, err := builder.New(dockerCli,
-	for _, name := range in.builders {
+		builder.WithName(in.builder),
-		func(name string) {
+		builder.WithStore(txn),
-			eg.Go(func() (err error) {
+		builder.WithSkippedValidation(),
-				defer func() {
+	)
-					if err == nil {
+	if err != nil {
-						_, _ = fmt.Fprintf(dockerCli.Err(), "%s removed\n", name)
+		return err
-					} else {
-						_, _ = fmt.Fprintf(dockerCli.Err(), "failed to remove %s: %v\n", name, err)
-					}
-				}()
-
-				b, err := builder.New(dockerCli,
-					builder.WithName(name),
-					builder.WithStore(txn),
-					builder.WithSkippedValidation(),
-				)
-				if err != nil {
-					return err
-				}
-
-				nodes, err := b.LoadNodes(ctx)
-				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 {
-					return err1
-				}
-
-				return nil
-			})
-		}(name)
 	}
 
-	if err := eg.Wait(); err != nil {
+	nodes, err := b.LoadNodes(ctx)
-		return errors.New("failed to remove one or more builders")
+	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 {
+		return err1
+	}
+
+	_, _ = fmt.Fprintf(dockerCli.Err(), "%s removed\n", b.Name)
 	return nil
 }
 
@@ -99,24 +80,25 @@ func rmCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	var options rmOptions
 
 	cmd := &cobra.Command{
-		Use:   "rm [OPTIONS] [NAME] [NAME...]",
+		Use:   "rm [NAME]",
-		Short: "Remove one or more builder instances",
+		Short: "Remove a builder instance",
+		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			options.builders = []string{rootOpts.builder}
+			options.builder = rootOpts.builder
 			if len(args) > 0 {
 				if options.allInactive {
 					return errors.New("cannot specify builder name when --all-inactive is set")
 				}
-				options.builders = args
+				options.builder = args[0]
 			}
-			return runRm(cmd.Context(), dockerCli, options)
+			return runRm(dockerCli, options)
 		},
 		ValidArgsFunction: completion.BuilderNames(dockerCli),
 	}
 
 	flags := cmd.Flags()
 	flags.BoolVar(&options.keepState, "keep-state", false, "Keep BuildKit state")
-	flags.BoolVar(&options.keepDaemon, "keep-daemon", false, "Keep the BuildKit daemon running")
+	flags.BoolVar(&options.keepDaemon, "keep-daemon", false, "Keep the buildkitd daemon running")
 	flags.BoolVar(&options.allInactive, "all-inactive", false, "Remove all inactive builders")
 	flags.BoolVarP(&options.force, "force", "f", false, "Do not prompt for confirmation")
 

commands/root.go

@@ -13,7 +13,6 @@ import (
 	"github.com/docker/cli/cli-plugins/plugin"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/debug"
-	"github.com/moby/buildkit/util/appcontext"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -30,15 +29,12 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
 		CompletionOptions: cobra.CompletionOptions{
 			HiddenDefaultCmd: true,
 		},
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			cmd.SetContext(appcontext.Context())
-			if !isPlugin {
-				return nil
-			}
-			return plugin.PersistentPreRunE(cmd, args)
-		},
 	}
-	if !isPlugin {
+	if isPlugin {
+		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
@@ -63,10 +59,6 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
 		"using default config store",
 	))
 
-	if !isExperimental() {
-		cmd.SetHelpTemplate(cmd.HelpTemplate() + "\nExperimental commands and flags are hidden. Set BUILDX_EXPERIMENTAL=1 to show them.\n")
-	}
-
 	addCommands(cmd, dockerCli)
 	return cmd
 }
@@ -83,7 +75,6 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		buildCmd(dockerCli, opts, nil),
 		bakeCmd(dockerCli, opts),
 		createCmd(dockerCli),
-		dialStdioCmd(dockerCli, opts),
 		rmCmd(dockerCli, opts),
 		lsCmd(dockerCli),
 		useCmd(dockerCli, opts),

commands/stop.go

@@ -7,6 +7,7 @@ import (
 	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
+	"github.com/moby/buildkit/util/appcontext"
 	"github.com/spf13/cobra"
 )
 
@@ -14,7 +15,9 @@ type stopOptions struct {
 	builder string
 }
 
-func runStop(ctx context.Context, dockerCli command.Cli, in stopOptions) error {
+func runStop(dockerCli command.Cli, in stopOptions) error {
+	ctx := appcontext.Context()
+
 	b, err := builder.New(dockerCli,
 		builder.WithName(in.builder),
 		builder.WithSkippedValidation(),
@@ -42,7 +45,7 @@ func stopCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			if len(args) > 0 {
 				options.builder = args[0]
 			}
-			return runStop(cmd.Context(), dockerCli, options)
+			return runStop(dockerCli, options)
 		},
 		ValidArgsFunction: completion.BuilderNames(dockerCli),
 	}

commands/util.go

@@ -1,23 +0,0 @@
-package commands
-
-import (
-	"context"
-	"io"
-
-	"github.com/docker/cli/cli/command"
-)
-
-func prompt(ctx context.Context, ins io.Reader, out io.Writer, msg string) (bool, error) {
-	done := make(chan struct{})
-	var ok bool
-	go func() {
-		ok = command.PromptForConfirmation(ins, out, msg)
-		close(done)
-	}()
-	select {
-	case <-ctx.Done():
-		return false, context.Cause(ctx)
-	case <-done:
-		return ok, nil
-	}
-}

controller/build/build.go

@@ -99,37 +99,37 @@ func RunBuild(ctx context.Context, dockerCli command.Cli, in controllerapi.Build
 		return nil, nil, err
 	}
 	if in.ExportPush {
-		var pushUsed bool
+		if in.ExportLoad {
-		for i := range outputs {
+			return nil, nil, errors.Errorf("push and load may not be set together at the moment")
-			if outputs[i].Type == client.ExporterImage {
-				outputs[i].Attrs["push"] = "true"
-				pushUsed = true
-			}
 		}
-		if !pushUsed {
+		if len(outputs) == 0 {
-			outputs = append(outputs, client.ExportEntry{
+			outputs = []client.ExportEntry{{
-				Type: client.ExporterImage,
+				Type: "image",
 				Attrs: map[string]string{
 					"push": "true",
 				},
-			})
+			}}
+		} else {
+			switch outputs[0].Type {
+			case "image":
+				outputs[0].Attrs["push"] = "true"
+			default:
+				return nil, nil, errors.Errorf("push and %q output can't be used together", outputs[0].Type)
+			}
 		}
 	}
 	if in.ExportLoad {
-		var loadUsed bool
+		if len(outputs) == 0 {
-		for i := range outputs {
+			outputs = []client.ExportEntry{{
-			if outputs[i].Type == client.ExporterDocker {
+				Type:  "docker",
-				if _, ok := outputs[i].Attrs["dest"]; !ok {
-					loadUsed = true
-					break
-				}
-			}
-		}
-		if !loadUsed {
-			outputs = append(outputs, client.ExportEntry{
-				Type:  client.ExporterDocker,
 				Attrs: map[string]string{},
-			})
+			}}
+		} else {
+			switch outputs[0].Type {
+			case "docker":
+			default:
+				return nil, nil, errors.Errorf("load and %q output can't be used together", outputs[0].Type)
+			}
 		}
 	}
 

controller/pb/export.go

@@ -15,7 +15,6 @@ func CreateExports(entries []*ExportEntry) ([]client.ExportEntry, error) {
 	if len(entries) == 0 {
 		return nil, nil
 	}
-	var stdoutUsed bool
 	for _, entry := range entries {
 		if entry.Type == "" {
 			return nil, errors.Errorf("type is required for output")
@@ -69,14 +68,10 @@ func CreateExports(entries []*ExportEntry) ([]client.ExportEntry, error) {
 				entry.Destination = "-"
 			}
 			if entry.Destination == "-" {
-				if stdoutUsed {
-					return nil, errors.Errorf("multiple outputs configured to write to stdout")
-				}
 				if _, err := console.ConsoleFromFile(os.Stdout); err == nil {
 					return nil, errors.Errorf("dest file is required for %s exporter. refusing to write to console", out.Type)
 				}
 				out.Output = wrapWriteCloser(os.Stdout)
-				stdoutUsed = true
 			} else if entry.Destination != "" {
 				fi, err := os.Stat(entry.Destination)
 				if err != nil && !os.IsNotExist(err) {

docker-bake.hcl

@@ -7,9 +7,6 @@ variable "DOCS_FORMATS" {
 variable "DESTDIR" {
   default = "./bin"
 }
-variable "GOLANGCI_LINT_MULTIPLATFORM" {
-  default = null
-}
 
 # Special target: https://github.com/docker/metadata-action#bake-definition
 target "meta-helper" {
@@ -35,17 +32,6 @@ target "lint" {
   inherits = ["_common"]
   dockerfile = "./hack/dockerfiles/lint.Dockerfile"
   output = ["type=cacheonly"]
-  platforms = GOLANGCI_LINT_MULTIPLATFORM != null ? [
-    "darwin/amd64",
-    "darwin/arm64",
-    "linux/amd64",
-    "linux/arm64",
-    "linux/s390x",
-    "linux/ppc64le",
-    "linux/riscv64",
-    "windows/amd64",
-    "windows/arm64"
-  ] : []
 }
 
 target "validate-vendor" {

docs/bake-reference.md

@@ -213,7 +213,7 @@ target "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                                                      |
 | [`annotations`](#targetannotations)             | List    | Exporter annotations                                                 |
 | [`attest`](#targetattest)                       | List    | Build attestations                                                   |
@@ -233,11 +233,9 @@ The following table shows the complete list of attributes that you can assign to
 | [`platforms`](#targetplatforms)                 | List    | Target platforms                                                     |
 | [`pull`](#targetpull)                           | Boolean | Always pull images                                                   |
 | [`secret`](#targetsecret)                       | List    | Secrets to expose to the build                                       |
-| [`shm-size`](#targetshm-size)                   | List    | Size of `/dev/shm`                                                   |
 | [`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                                                   |
-| [`ulimits`](#targetulimits)                     | List    | Ulimit options                                                       |
 
 ### `target.args`
 
@@ -834,29 +832,6 @@ RUN --mount=type=secret,id=KUBECONFIG \
     KUBECONFIG=$(cat /run/secrets/KUBECONFIG) helm upgrade --install
 ```
 
-### `target.shm-size`
-
-Sets the size of the shared memory allocated for build containers when using
-`RUN` instructions.
-
-The format is `<number><unit>`. `number` must be greater than `0`. Unit is
-optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g`
-(gigabytes). If you omit the unit, the system uses bytes.
-
-This is the same as the `--shm-size` flag for `docker build`.
-
-```hcl
-target "default" {
-  shm-size = "128m"
-}
-```
-
-> **Note**
->
-> In most cases, it is recommended to let the builder automatically determine
-> the appropriate configurations. Manual adjustments should only be considered
-> when specific performance tuning is required for complex build scenarios.
-
 ### `target.ssh`
 
 Defines SSH agent sockets or keys to expose to the build.
@@ -903,32 +878,6 @@ target "default" {
 }
 ```
 
-### `target.ulimits`
-
-Ulimits overrides the default ulimits of build's containers when using `RUN`
-instructions and are specified with a soft and hard limit as such:
-`<type>=<soft limit>[:<hard limit>]`, for example:
-
-```hcl
-target "app" {
-  ulimits = [
-    "nofile=1024:1024"
-  ]
-}
-```
-
-> **Note**
->
-> If you do not provide a `hard limit`, the `soft limit` is used
-> for both values. If no `ulimits` are set, they are inherited from
-> the default `ulimits` set on the daemon.
-
-> **Note**
->
-> In most cases, it is recommended to let the builder automatically determine
-> the appropriate configurations. Manual adjustments should only be considered
-> when specific performance tuning is required for complex build scenarios.
-
 ## Group
 
 Groups allow you to invoke multiple builds (targets) at once.

docs/generate.go

@@ -3,7 +3,6 @@ package main
 import (
 	"log"
 	"os"
-	"strings"
 
 	"github.com/docker/buildx/commands"
 	clidocstool "github.com/docker/cli-docs-tool"
@@ -27,28 +26,6 @@ type options struct {
 	formats []string
 }
 
-// fixUpExperimentalCLI trims the " (EXPERIMENTAL)" suffix from the CLI output,
-// as docs.docker.com already displays "experimental (CLI)",
-//
-// https://github.com/docker/buildx/pull/2188#issuecomment-1889487022
-func fixUpExperimentalCLI(cmd *cobra.Command) {
-	const (
-		annotationExperimentalCLI = "experimentalCLI"
-		suffixExperimental        = " (EXPERIMENTAL)"
-	)
-	if _, ok := cmd.Annotations[annotationExperimentalCLI]; ok {
-		cmd.Short = strings.TrimSuffix(cmd.Short, suffixExperimental)
-	}
-	cmd.Flags().VisitAll(func(f *pflag.Flag) {
-		if _, ok := f.Annotations[annotationExperimentalCLI]; ok {
-			f.Usage = strings.TrimSuffix(f.Usage, suffixExperimental)
-		}
-	})
-	for _, c := range cmd.Commands() {
-		fixUpExperimentalCLI(c)
-	}
-}
-
 func gen(opts *options) error {
 	log.SetFlags(0)
 
@@ -80,8 +57,6 @@ func gen(opts *options) error {
 				return err
 			}
 		case "yaml":
-			// fix up is needed only for yaml (used for generating docs.docker.com contents)
-			fixUpExperimentalCLI(cmd)
 			if err = c.GenYamlTree(cmd); err != nil {
 				return err
 			}

docs/reference/buildx.md

@@ -9,22 +9,21 @@ Extended build capabilities with BuildKit
 
 ### Subcommands
 
-| Name                                 | Description                                     |
+| Name                                 | Description                            |
-|:-------------------------------------|:------------------------------------------------|
+|:-------------------------------------|:---------------------------------------|
-| [`bake`](buildx_bake.md)             | Build from a file                               |
+| [`bake`](buildx_bake.md)             | Build from a file                      |
-| [`build`](buildx_build.md)           | Start a build                                   |
+| [`build`](buildx_build.md)           | Start a build                          |
-| [`create`](buildx_create.md)         | Create a new builder instance                   |
+| [`create`](buildx_create.md)         | Create a new builder instance          |
-| [`debug`](buildx_debug.md)           | Start debugger (EXPERIMENTAL)                   |
+| [`debug`](buildx_debug.md)           | Start debugger                         |
-| [`dial-stdio`](buildx_dial-stdio.md) | Proxy current stdio streams to builder instance |
+| [`du`](buildx_du.md)                 | Disk usage                             |
-| [`du`](buildx_du.md)                 | Disk usage                                      |
+| [`imagetools`](buildx_imagetools.md) | Commands to work on images in registry |
-| [`imagetools`](buildx_imagetools.md) | Commands to work on images in registry          |
+| [`inspect`](buildx_inspect.md)       | Inspect current builder instance       |
-| [`inspect`](buildx_inspect.md)       | Inspect current builder instance                |
+| [`ls`](buildx_ls.md)                 | List builder instances                 |
-| [`ls`](buildx_ls.md)                 | List builder instances                          |
+| [`prune`](buildx_prune.md)           | Remove build cache                     |
-| [`prune`](buildx_prune.md)           | Remove build cache                              |
+| [`rm`](buildx_rm.md)                 | Remove a builder instance              |
-| [`rm`](buildx_rm.md)                 | Remove one or more builder instances            |
+| [`stop`](buildx_stop.md)             | Stop builder instance                  |
-| [`stop`](buildx_stop.md)             | Stop builder instance                           |
+| [`use`](buildx_use.md)               | Set the current builder instance       |
-| [`use`](buildx_use.md)               | Set the current builder instance                |
+| [`version`](buildx_version.md)       | Show buildx version information        |
-| [`version`](buildx_version.md)       | Show buildx version information                 |
 
 
 ### Options

docs/reference/buildx_build.md

@@ -25,7 +25,7 @@ Start a build
 | [`--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/reference/cli/docker/image/build/#cgroup-parent)                                                       | `string`      |           | Set the parent cgroup for the `RUN` instructions during build                                       |
-| `--detach`                                                                                                                                         |               |           | Detach buildx server (supported only on linux) (EXPERIMENTAL)                                       |
+| `--detach`                                                                                                                                         |               |           | Detach buildx server (supported only on linux)                                                      |
 | [`-f`](https://docs.docker.com/reference/cli/docker/image/build/#file), [`--file`](https://docs.docker.com/reference/cli/docker/image/build/#file) | `string`      |           | Name of the Dockerfile (default: `PATH/Dockerfile`)                                                 |
 | `--iidfile`                                                                                                                                        | `string`      |           | Write the image ID to the file                                                                      |
 | `--label`                                                                                                                                          | `stringArray` |           | Set metadata for an image                                                                           |
@@ -33,20 +33,20 @@ Start a build
 | [`--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`](#no-cache-filter)                                                                                                            | `stringArray` |           | Do not cache specified stages                                                                       |
+| `--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)                         |
+| `--print`                                                                                                                                          | `string`      |           | Print result of information request (e.g., outline, targets)                                        |
 | [`--progress`](#progress)                                                                                                                          | `string`      | `auto`    | Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output            |
 | [`--provenance`](#provenance)                                                                                                                      | `string`      |           | Shorthand 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                                             |
-| `--root`                                                                                                                                           | `string`      |           | Specify root directory of server to connect (EXPERIMENTAL)                                          |
+| `--root`                                                                                                                                           | `string`      |           | Specify root directory of server to connect                                                         |
 | [`--sbom`](#sbom)                                                                                                                                  | `string`      |           | Shorthand for `--attest=type=sbom`                                                                  |
 | [`--secret`](#secret)                                                                                                                              | `stringArray` |           | Secret to expose to the build (format: `id=mysecret[,src=/local/secret]`)                           |
-| `--server-config`                                                                                                                                  | `string`      |           | Specify buildx server config file (used only when launching new server) (EXPERIMENTAL)              |
+| `--server-config`                                                                                                                                  | `string`      |           | Specify buildx server config file (used only when launching new server)                             |
-| [`--shm-size`](#shm-size)                                                                                                                          | `bytes`       | `0`       | Shared memory size for build containers                                                             |
+| [`--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/reference/cli/docker/image/build/#tag), [`--tag`](https://docs.docker.com/reference/cli/docker/image/build/#tag)    | `stringArray` |           | Name and optionally a tag (format: `name:tag`)                                                      |
 | [`--target`](https://docs.docker.com/reference/cli/docker/image/build/#target)                                                                     | `string`      |           | Set the target build stage to build                                                                 |
@@ -154,7 +154,7 @@ Allow extra privileged entitlement. List of entitlements:
 - `security.insecure` - Allows executions without sandbox. See
   [related Dockerfile extensions](https://docs.docker.com/reference/dockerfile/#run---securitysandbox).
 
-For entitlements to be enabled, the BuildKit daemon also needs to allow them
+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)).
 
 ```console
@@ -327,7 +327,6 @@ $ cat metadata.json
 
 ```json
 {
-  "buildx.build.ref": "mybuilder/mybuilder0/0fjb6ubs52xx3vygf6fgdl611",
   "containerimage.config.digest": "sha256:2937f66a9722f7f4a2df583de2f8cb97fc9196059a410e7f00072fc918930e66",
   "containerimage.descriptor": {
     "annotations": {
@@ -342,61 +341,6 @@ $ cat metadata.json
 }
 ```
 
-### <a name="no-cache-filter"></a> Ignore build cache for specific stages (--no-cache-filter)
-
-The `--no-cache-filter` lets you specify one or more stages of a multi-stage
-Dockerfile for which build cache should be ignored. To specify multiple stages,
-use a comma-separated syntax:
-
-```console
-$ docker buildx build --no-cache-filter stage1,stage2,stage3 .
-```
-
-For example, the following Dockerfile contains four stages:
-
-- `base`
-- `install`
-- `test`
-- `release`
-
-```dockerfile
-# syntax=docker/dockerfile:1
-
-FROM oven/bun:1 as base
-WORKDIR /app
-
-FROM base AS install
-WORKDIR /temp/dev
-RUN --mount=type=bind,source=package.json,target=package.json \
-    --mount=type=bind,source=bun.lockb,target=bun.lockb \
-    bun install --frozen-lockfile
-
-FROM base AS test
-COPY --from=install /temp/dev/node_modules node_modules
-COPY . .
-RUN bun test
-
-FROM base AS release
-ENV NODE_ENV=production
-COPY --from=install /temp/dev/node_modules node_modules
-COPY . .
-ENTRYPOINT ["bun", "run", "index.js"]
-```
-
-To ignore the cache for the `install` stage:
-
-```console
-$ docker buildx build --no-cache-filter install .
-```
-
-To ignore the cache the `install` and `release` stages:
-
-```console
-$ docker buildx build --no-cache-filter install,release .
-```
-
-The arguments for the `--no-cache-filter` flag must be names of stages.
-
 ### <a name="output"></a> Set the export action for the build result (-o, --output)
 
 ```text
@@ -424,10 +368,6 @@ $ docker buildx build -o type=docker,dest=- . > myimage.tar
 $ docker buildx build -t tonistiigi/foo -o type=registry
 ```
 
-> **Note **
->
-> Since BuildKit v0.13.0 multiple outputs can be specified by repeating the flag.
-
 Supported exported types are:
 
 #### `local`
@@ -658,21 +598,12 @@ RUN --mount=type=bind,target=. \
 $ SECRET_TOKEN=token docker buildx build --secret id=SECRET_TOKEN .
 ```
 
-### <a name="shm-size"></a> Shared memory size for build containers (--shm-size)
+### <a name="shm-size"></a> Size of /dev/shm (--shm-size)
-
-Sets the size of the shared memory allocated for build containers when using
-`RUN` instructions.
 
 The format is `<number><unit>`. `number` must be greater than `0`. Unit is
 optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g`
 (gigabytes). If you omit the unit, the system uses bytes.
 
-> **Note**
->
-> In most cases, it is recommended to let the builder automatically determine
-> the appropriate configurations. Manual adjustments should only be considered
-> when specific performance tuning is required for complex build scenarios.
-
 ### <a name="ssh"></a> SSH agent socket or keys to expose to the build (--ssh)
 
 ```text
@@ -706,8 +637,7 @@ $ docker buildx build --ssh default=$SSH_AUTH_SOCK .
 
 ### <a name="ulimit"></a> Set ulimits (--ulimit)
 
-`--ulimit` overrides the default ulimits of build's containers when using `RUN`
+`--ulimit` is specified with a soft and hard limit as such:
-instructions and are specified with a soft and hard limit as such:
 `<type>=<soft limit>[:<hard limit>]`, for example:
 
 ```console
@@ -719,9 +649,3 @@ $ docker buildx build --ulimit nofile=1024:1024 .
 > If you don't provide a `hard limit`, the `soft limit` is used
 > for both values. If no `ulimits` are set, they're inherited from
 > the default `ulimits` set on the daemon.
-
-> **Note**
->
-> In most cases, it is recommended to let the builder automatically determine
-> the appropriate configurations. Manual adjustments should only be considered
-> when specific performance tuning is required for complex build scenarios.

docs/reference/buildx_create.md

@@ -9,19 +9,19 @@ Create a new builder instance
 
 ### Options
 
-| Name                                      | Type          | Default | Description                                                           |
+| Name                                    | Type          | Default | Description                                                           |
-|:------------------------------------------|:--------------|:--------|:----------------------------------------------------------------------|
+|:----------------------------------------|:--------------|:--------|:----------------------------------------------------------------------|
-| [`--append`](#append)                     |               |         | Append a node to builder instead of changing it                       |
+| [`--append`](#append)                   |               |         | Append a node to builder instead of changing it                       |
-| `--bootstrap`                             |               |         | Boot builder after creation                                           |
+| `--bootstrap`                           |               |         | Boot builder after creation                                           |
-| [`--buildkitd-config`](#buildkitd-config) | `string`      |         | BuildKit daemon config file                                           |
+| [`--buildkitd-flags`](#buildkitd-flags) | `string`      |         | Flags for buildkitd daemon                                            |
-| [`--buildkitd-flags`](#buildkitd-flags)   | `string`      |         | BuildKit daemon flags                                                 |
+| [`--config`](#config)                   | `string`      |         | BuildKit config file                                                  |
-| [`--driver`](#driver)                     | `string`      |         | Driver to use (available: `docker-container`, `kubernetes`, `remote`) |
+| [`--driver`](#driver)                   | `string`      |         | Driver to use (available: `docker-container`, `kubernetes`, `remote`) |
-| [`--driver-opt`](#driver-opt)             | `stringArray` |         | Options for the driver                                                |
+| [`--driver-opt`](#driver-opt)           | `stringArray` |         | Options for the driver                                                |
-| [`--leave`](#leave)                       |               |         | Remove a node from builder instead of changing it                     |
+| [`--leave`](#leave)                     |               |         | Remove a node from builder instead of changing it                     |
-| [`--name`](#name)                         | `string`      |         | Builder instance name                                                 |
+| [`--name`](#name)                       | `string`      |         | Builder instance name                                                 |
-| [`--node`](#node)                         | `string`      |         | Create/modify node with given name                                    |
+| [`--node`](#node)                       | `string`      |         | Create/modify node with given name                                    |
-| [`--platform`](#platform)                 | `stringArray` |         | Fixed platforms for current node                                      |
+| [`--platform`](#platform)               | `stringArray` |         | Fixed platforms for current node                                      |
-| [`--use`](#use)                           |               |         | Set the current builder instance                                      |
+| [`--use`](#use)                         |               |         | Set the current builder instance                                      |
 
 
 <!---MARKER_GEN_END-->
@@ -55,15 +55,29 @@ $ docker buildx create --name eager_beaver --append mycontext2
 eager_beaver
 ```
 
-### <a name="buildkitd-config"></a> Specify a configuration file for the BuildKit daemon (--buildkitd-config)
+### <a name="buildkitd-flags"></a> Specify options for the buildkitd daemon (--buildkitd-flags)
 
 ```text
---buildkitd-config FILE
+--buildkitd-flags FLAGS
 ```
 
-Specifies the configuration file for the BuildKit daemon to use. The
+Adds flags when starting the buildkitd daemon. They take precedence over the
-configuration can be overridden by [`--buildkitd-flags`](#buildkitd-flags).
+configuration file specified by [`--config`](#config). See `buildkitd --help`
-See an [example BuildKit daemon configuration file](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md).
+for the available flags.
+
+```text
+--buildkitd-flags '--debug --debugaddr 0.0.0.0:6666'
+```
+
+### <a name="config"></a> Specify a configuration file for the buildkitd daemon (--config)
+
+```text
+--config FILE
+```
+
+Specifies the configuration file for the buildkitd daemon to use. The configuration
+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 you don't specify a configuration file, Buildx looks for one by default in:
 
@@ -76,36 +90,6 @@ certificates for registries in the `buildkitd.toml` configuration, the files
 will be copied into the container under `/etc/buildkit/certs` and configuration
 will be updated to reflect that.
 
-### <a name="buildkitd-flags"></a> Specify options for the BuildKit daemon (--buildkitd-flags)
-
-```text
---buildkitd-flags FLAGS
-```
-
-Adds flags when starting the BuildKit daemon. They take precedence over the
-configuration file specified by [`--buildkitd-config`](#buildkitd-config). See
-`buildkitd --help` for the available flags.
-
-```text
---buildkitd-flags '--debug --debugaddr 0.0.0.0:6666'
-```
-
-#### BuildKit daemon network mode
-
-You can specify the network mode for the BuildKit daemon with either the
-configuration file specified by [`--buildkitd-config`](#buildkitd-config) using the
-`worker.oci.networkMode` option or `--oci-worker-net` flag here. The default
-value is `auto` and can be one of `bridge`, `cni`, `host`:
-
-```text
---buildkitd-flags '--oci-worker-net bridge'
-```
-
-> **Note**
->
-> Network mode "bridge" is supported since BuildKit v0.13 and will become the
-> default in next v0.14.
-
 ### <a name="driver"></a> Set the builder driver to use (--driver)
 
 ```text
@@ -149,8 +133,8 @@ to achieve that.
 
 #### `remote` driver
 
-Uses a remote instance of BuildKit daemon over an arbitrary connection. With
+Uses a remote instance of buildkitd over an arbitrary connection. With this
-this driver, you manually create and manage instances of buildkit yourself, and
+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

docs/reference/buildx_debug.md

@@ -1,7 +1,7 @@
 # docker buildx debug
 
 <!---MARKER_GEN_START-->
-Start debugger (EXPERIMENTAL)
+Start debugger
 
 ### Subcommands
 
@@ -15,12 +15,12 @@ Start debugger (EXPERIMENTAL)
 | Name              | Type     | Default | Description                                                                                              |
 |:------------------|:---------|:--------|:---------------------------------------------------------------------------------------------------------|
 | `--builder`       | `string` |         | Override the configured builder instance                                                                 |
-| `--detach`        | `bool`   | `true`  | Detach buildx server for the monitor (supported only on linux) (EXPERIMENTAL)                            |
+| `--detach`        | `bool`   | `true`  | Detach buildx server for the monitor (supported only on linux)                                           |
-| `--invoke`        | `string` |         | Launch a monitor with executing specified command (EXPERIMENTAL)                                         |
+| `--invoke`        | `string` |         | Launch a monitor with executing specified command                                                        |
-| `--on`            | `string` | `error` | When to launch the monitor ([always, error]) (EXPERIMENTAL)                                              |
+| `--on`            | `string` | `error` | When to launch the monitor ([always, error])                                                             |
 | `--progress`      | `string` | `auto`  | Set type of progress output (`auto`, `plain`, `tty`) for the monitor. Use plain to show container output |
-| `--root`          | `string` |         | Specify root directory of server to connect for the monitor (EXPERIMENTAL)                               |
+| `--root`          | `string` |         | Specify root directory of server to connect for the monitor                                              |
-| `--server-config` | `string` |         | Specify buildx server config file for the monitor (used only when launching new server) (EXPERIMENTAL)   |
+| `--server-config` | `string` |         | Specify buildx server config file for the monitor (used only when launching new server)                  |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_debug_build.md

@@ -21,7 +21,7 @@ Start a build
 | `--cache-from`                                                                                                                                     | `stringArray` |           | External cache sources (e.g., `user/app:cache`, `type=local,src=path/to/dir`)                       |
 | `--cache-to`                                                                                                                                       | `stringArray` |           | Cache export destinations (e.g., `user/app:cache`, `type=local,dest=path/to/dir`)                   |
 | [`--cgroup-parent`](https://docs.docker.com/reference/cli/docker/image/build/#cgroup-parent)                                                       | `string`      |           | Set the parent cgroup for the `RUN` instructions during build                                       |
-| `--detach`                                                                                                                                         |               |           | Detach buildx server (supported only on linux) (EXPERIMENTAL)                                       |
+| `--detach`                                                                                                                                         |               |           | Detach buildx server (supported only on linux)                                                      |
 | [`-f`](https://docs.docker.com/reference/cli/docker/image/build/#file), [`--file`](https://docs.docker.com/reference/cli/docker/image/build/#file) | `string`      |           | Name of the Dockerfile (default: `PATH/Dockerfile`)                                                 |
 | `--iidfile`                                                                                                                                        | `string`      |           | Write the image ID to the file                                                                      |
 | `--label`                                                                                                                                          | `stringArray` |           | Set metadata for an image                                                                           |
@@ -32,17 +32,17 @@ Start a build
 | `--no-cache-filter`                                                                                                                                | `stringArray` |           | Do not cache specified stages                                                                       |
 | `-o`, `--output`                                                                                                                                   | `stringArray` |           | Output destination (format: `type=local,dest=path`)                                                 |
 | `--platform`                                                                                                                                       | `stringArray` |           | Set target platform for build                                                                       |
-| `--print`                                                                                                                                          | `string`      |           | Print result of information request (e.g., outline, targets) (EXPERIMENTAL)                         |
+| `--print`                                                                                                                                          | `string`      |           | Print result of information request (e.g., outline, targets)                                        |
 | `--progress`                                                                                                                                       | `string`      | `auto`    | Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output            |
 | `--provenance`                                                                                                                                     | `string`      |           | Shorthand for `--attest=type=provenance`                                                            |
 | `--pull`                                                                                                                                           |               |           | Always attempt to pull all referenced images                                                        |
 | `--push`                                                                                                                                           |               |           | Shorthand for `--output=type=registry`                                                              |
 | `-q`, `--quiet`                                                                                                                                    |               |           | Suppress the build output and print image ID on success                                             |
-| `--root`                                                                                                                                           | `string`      |           | Specify root directory of server to connect (EXPERIMENTAL)                                          |
+| `--root`                                                                                                                                           | `string`      |           | Specify root directory of server to connect                                                         |
 | `--sbom`                                                                                                                                           | `string`      |           | Shorthand for `--attest=type=sbom`                                                                  |
 | `--secret`                                                                                                                                         | `stringArray` |           | Secret to expose to the build (format: `id=mysecret[,src=/local/secret]`)                           |
-| `--server-config`                                                                                                                                  | `string`      |           | Specify buildx server config file (used only when launching new server) (EXPERIMENTAL)              |
+| `--server-config`                                                                                                                                  | `string`      |           | Specify buildx server config file (used only when launching new server)                             |
-| `--shm-size`                                                                                                                                       | `bytes`       | `0`       | Shared memory size for build containers                                                             |
+| `--shm-size`                                                                                                                                       | `bytes`       | `0`       | Size of `/dev/shm`                                                                                  |
 | `--ssh`                                                                                                                                            | `stringArray` |           | SSH agent socket or keys to expose to the build (format: `default\|<id>[=<socket>\|<key>[,<key>]]`) |
 | [`-t`](https://docs.docker.com/reference/cli/docker/image/build/#tag), [`--tag`](https://docs.docker.com/reference/cli/docker/image/build/#tag)    | `stringArray` |           | Name and optionally a tag (format: `name:tag`)                                                      |
 | [`--target`](https://docs.docker.com/reference/cli/docker/image/build/#target)                                                                     | `string`      |           | Set the target build stage to build                                                                 |

docs/reference/buildx_dial-stdio.md

@@ -1,47 +0,0 @@
-# docker buildx dial-stdio
-
-<!---MARKER_GEN_START-->
-Proxy current stdio streams to builder instance
-
-### Options
-
-| Name         | Type     | Default | Description                                      |
-|:-------------|:---------|:--------|:-------------------------------------------------|
-| `--builder`  | `string` |         | Override the configured builder instance         |
-| `--platform` | `string` |         | Target platform: this is used for node selection |
-| `--progress` | `string` | `quiet` | Set type of progress output (auto, plain, tty).  |
-
-
-<!---MARKER_GEN_END-->
-
-## Description
-
-dial-stdio uses the stdin and stdout streams of the command to proxy to the configured builder instance.
-It is not intended to be used by humans, but rather by other tools that want to interact with the builder instance via BuildKit API.
-
-## Examples
-
-Example go program that uses the dial-stdio command wire up a buildkit client.
-This is for example use only and may not be suitable for production use.
-
-```go
-client.New(ctx, "", client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
-    c1, c2 := net.Pipe()
-    cmd := exec.Command("docker", "buildx", "dial-stdio")
-    cmd.Stdin = c1
-    cmd.Stdout = c1
-
-    if err := cmd.Start(); err != nil {
-        c1.Close()
-        c2.Close()
-        return nil, err
-    }
-
-    go func() {
-        cmd.Wait()
-        c2.Close()
-    }()
-
-    return c2
-}))
-```

docs/reference/buildx_du.md

@@ -13,106 +13,13 @@ Disk usage
 |:------------------------|:---------|:--------|:-----------------------------------------|
 | [`--builder`](#builder) | `string` |         | Override the configured builder instance |
 | `--filter`              | `filter` |         | Provide filter values                    |
-| [`--verbose`](#verbose) |          |         | Provide a more verbose output            |
+| `--verbose`             |          |         | Provide a more verbose output            |
 
 
 <!---MARKER_GEN_END-->
 
 ## Examples
 
-### Show disk usage
-
-The `docker buildx du` command shows the disk usage for the currently selected
-builder.
-
-```console
-$ docker buildx du
-ID                                RECLAIMABLE    SIZE          LAST ACCESSED
-12wgll9os87pazzft8lt0yztp*        true           1.704GB       13 days ago
-iupsv3it5ubh92aweb7c1wojc*        true           1.297GB       36 minutes ago
-ek4ve8h4obyv5kld6vicmtqyn         true           811.7MB       13 days ago
-isovrfnmkelzhtdx942w9vjcb*        true           811.7MB       13 days ago
-0jty7mjrndi1yo7xkv1baralh         true           810.5MB       13 days ago
-jyzkefmsysqiaakgwmjgxjpcz*        true           810.5MB       13 days ago
-z8w1y95jn93gvj92jtaj6uhwk         true           318MB         2 weeks ago
-rz2zgfcwlfxsxd7d41w2sz2tt         true           8.224kB*      43 hours ago
-n5bkzpewmk2eiu6hn9tzx18jd         true           8.224kB*      43 hours ago
-ao94g6vtbzdl6k5zgdmrmnwpt         true           8.224kB*      43 hours ago
-2pyjep7njm0wh39vcingxb97i         true           8.224kB*      43 hours ago
-Shared:        115.5MB
-Private:       10.25GB
-Reclaimable:   10.36GB
-Total:         10.36GB
-```
-
-If `RECLAIMABLE` is false, the `docker buildx du prune` command won't delete
-the record, even if you use `--all`. That's because the record is actively in
-use by some component of the builder.
-
-The asterisks (\*) in the default output indicate the following:
-
-- An asterisk next to an ID (`zu7m6evdpebh5h8kfkpw9dlf2*`) indicates that the record
-  is mutable. The size of the record may change, or another build can take ownership of
-  it and change or commit to it. If you run the `du` command again, this item may
-  not be there anymore, or the size might be different.
-- An asterisk next to a size (`8.288kB*`) indicates that the record is shared.
-  Storage of the record is shared with some other resource, typically an image.
-  If you prune such a record then you will lose build cache but only metadata
-  will be deleted as the image still needs to actual storage layers.
-
-### <a name="verbose"></a> Use verbose output (--verbose)
-
-The verbose output of the `docker buildx du` command is useful for inspecting
-the disk usage records in more detail. The verbose output shows the mutable and
-shared states more clearly, as well as additional information about the
-corresponding layer.
-
-```console
-$ docker buildx du --verbose
-...
-Last used:      2 days ago
-Type:           regular
-
-ID:             05d0elirb4mmvpmnzbrp3ssrg
-Parent:         e8sfdn4mygrg7msi9ak1dy6op
-Created at:     2023-11-20 09:53:30.881558721 +0000 UTC
-Mutable:        false
-Reclaimable:    true
-Shared:         false
-Size:           0B
-Description:    [gobase 3/3] WORKDIR /src
-Usage count:    3
-Last used:      24 hours ago
-Type:           regular
-
-Reclaimable:    4.453GB
-Total:          4.453GB
-```
-
 ### <a name="builder"></a> Override the configured builder instance (--builder)
 
-Use the `--builder` flag to inspect the disk usage of a particular builder.
+Same as [`buildx --builder`](buildx.md#builder).
-
-```console
-$ docker buildx du --builder youthful_shtern
-ID                                RECLAIMABLE    SIZE          LAST ACCESSED
-g41agepgdczekxg2mtw0dujsv*        true           1.312GB       47 hours ago
-e6ycrsa0bn9akigqgzu0sc6kr         true           318MB         47 hours ago
-our9zg4ndly65ze1ccczdksiz         true           204.9MB       45 hours ago
-b7xv3xpxnwupc81tc9ya3mgq6*        true           120.6MB       47 hours ago
-zihgye15ss6vum3wmck9egdoy*        true           79.81MB       2 days ago
-aaydharssv1ug98yhuwclkfrh*        true           79.81MB       2 days ago
-ta1r4vmnjug5dhub76as4kkol*        true           74.51MB       47 hours ago
-murma9f83j9h8miifbq68udjf*        true           74.51MB       47 hours ago
-47f961866a49g5y8myz80ixw1*        true           74.51MB       47 hours ago
-tzh99xtzlaf6txllh3cobag8t         true           74.49MB       47 hours ago
-ld6laoeuo1kwapysu6afwqybl*        true           59.89MB       47 hours ago
-yitxizi5kaplpyomqpos2cryp*        true           59.83MB       47 hours ago
-iy8aa4b7qjn0qmy9wiga9cj8w         true           33.65MB       47 hours ago
-mci7okeijyp8aqqk16j80dy09         true           19.86MB       47 hours ago
-lqvj091he652slxdla4wom3pz         true           14.08MB       47 hours ago
-fkt31oiv793nd26h42llsjcw7*        true           11.87MB       2 days ago
-uj802yxtvkcjysnjb4kgwvn2v         true           11.68MB       45 hours ago
-Reclaimable:    2.627GB
-Total:          2.627GB
-```

docs/reference/buildx_ls.md

@@ -7,78 +7,23 @@ docker buildx ls
 <!---MARKER_GEN_START-->
 List builder instances
 
-### Options
-
-| Name                  | Type     | Default | Description       |
-|:----------------------|:---------|:--------|:------------------|
-| [`--format`](#format) | `string` | `table` | Format the output |
-
 
 <!---MARKER_GEN_END-->
 
 ## Description
 
-Lists all builder instances and the nodes for each instance.
+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  BUILDKIT PLATFORMS
-elated_tesla*       docker-container
+elated_tesla *  docker-container
- \_ elated_tesla0    \_ unix:///var/run/docker.sock   running   v0.10.3    linux/amd64
+  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_tesla1 ssh://ubuntu@1.2.3.4        running v0.10.3  linux/arm64*, linux/arm/v7, linux/arm/v6
-default             docker
+default         docker
- \_ default          \_ default                       running   v0.8.2     linux/amd64
+  default       default                     running v0.8.2   linux/amd64
 ```
 
 Each builder has one or more nodes associated with it. The current builder's
 name is marked with a `*` in `NAME/NODE` and explicit node to build against for
 the target platform marked with a `*` in the `PLATFORMS` column.
-
-## Examples
-
-### <a name="format"></a> Format the output (--format)
-
-The formatting options (`--format`) pretty-prints builder instances output
-using a Go template.
-
-Valid placeholders for the Go template are listed below:
-
-| Placeholder       | Description                                 |
-|-------------------|---------------------------------------------|
-| `.Name`           | Builder or node name                        |
-| `.DriverEndpoint` | Driver (for builder) or Endpoint (for node) |
-| `.LastActivity`   | Builder last activity                       |
-| `.Status`         | Builder or node status                      |
-| `.Buildkit`       | BuildKit version of the node                |
-| `.Platforms`      | Available node's platforms                  |
-| `.Error`          | Error                                       |
-| `.Builder`        | Builder object                              |
-
-When using the `--format` option, the `ls` command will either output the data
-exactly as the template declares or, when using the `table` directive, includes
-column headers as well.
-
-The following example uses a template without headers and outputs the
-`Name` and `DriverEndpoint` entries separated by a colon (`:`):
-
-```console
-$ docker buildx ls --format "{{.Name}}: {{.DriverEndpoint}}"
-elated_tesla: docker-container
-elated_tesla0: unix:///var/run/docker.sock
-elated_tesla1: ssh://ubuntu@1.2.3.4
-default: docker
-default: default
-```
-
-The `Builder` placeholder can be used to access the builder object and its
-fields. For example, the following template outputs the builder's and
-nodes' names with their respective endpoints:
-
-```console
-$ docker buildx ls --format "{{.Builder.Name}}: {{range .Builder.Nodes}}\n  {{.Name}}: {{.Endpoint}}{{end}}"
-elated_tesla:
-  elated_tesla0: unix:///var/run/docker.sock
-  elated_tesla1: ssh://ubuntu@1.2.3.4
-default: docker
-  default: default
-```

docs/reference/buildx_rm.md

@@ -1,11 +1,11 @@
 # buildx rm
 
 ```text
-docker buildx rm [OPTIONS] [NAME] [NAME...]
+docker buildx rm [NAME]
 ```
 
 <!---MARKER_GEN_START-->
-Remove one or more builder instances
+Remove a builder instance
 
 ### Options
 
@@ -14,7 +14,7 @@ Remove one or more builder instances
 | [`--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 BuildKit daemon running         |
+| [`--keep-daemon`](#keep-daemon)     |          |         | Keep the buildkitd daemon running        |
 | [`--keep-state`](#keep-state)       |          |         | Keep BuildKit state                      |
 
 
@@ -48,10 +48,10 @@ Do not prompt for confirmation before removing inactive builders.
 $ docker buildx rm --all-inactive --force
 ```
 
-### <a name="keep-daemon"></a> Keep the BuildKit daemon running (--keep-daemon)
+### <a name="keep-daemon"></a> Keep the buildkitd daemon running (--keep-daemon)
 
 Keep the BuildKit daemon running after the buildx context is removed. This is
-useful when you manage BuildKit daemons and buildx contexts independently.
+useful when you manage buildkitd daemons and buildx contexts independently.
 Only supported by the
 [`docker-container`](https://docs.docker.com/build/drivers/docker-container/)
 and [`kubernetes`](https://docs.docker.com/build/drivers/kubernetes/) drivers.

driver/docker-container/driver.go

@@ -20,10 +20,8 @@ import (
 	"github.com/docker/cli/opts"
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	imagetypes "github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/system"
 	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/docker/errdefs"
 	dockerarchive "github.com/docker/docker/pkg/archive"
@@ -45,18 +43,17 @@ type Driver struct {
 
 	// if you add fields, remember to update docs:
 	// https://github.com/docker/docs/blob/main/content/build/drivers/docker-container.md
-	netMode       string
+	netMode      string
-	image         string
+	image        string
-	memory        opts.MemBytes
+	memory       opts.MemBytes
-	memorySwap    opts.MemSwapBytes
+	memorySwap   opts.MemSwapBytes
-	cpuQuota      int64
+	cpuQuota     int64
-	cpuPeriod     int64
+	cpuPeriod    int64
-	cpuShares     int64
+	cpuShares    int64
-	cpusetCpus    string
+	cpusetCpus   string
-	cpusetMems    string
+	cpusetMems   string
-	cgroupParent  string
+	cgroupParent string
-	restartPolicy container.RestartPolicy
+	env          []string
-	env           []string
 }
 
 func (d *Driver) IsMobyDriver() bool {
@@ -96,7 +93,7 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
 		if err != nil {
 			return err
 		}
-		rc, err := d.DockerAPI.ImageCreate(ctx, imageName, imagetypes.CreateOptions{
+		rc, err := d.DockerAPI.ImageCreate(ctx, imageName, dockertypes.ImageCreateOptions{
 			RegistryAuth: ra,
 		})
 		if err != nil {
@@ -123,8 +120,7 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
 	useInit := true // let it cleanup exited processes created by BuildKit's container API
 	return l.Wrap("creating container "+d.Name, func() error {
 		hc := &container.HostConfig{
-			Privileged:    true,
+			Privileged: true,
-			RestartPolicy: d.restartPolicy,
 			Mounts: []mount.Mount{
 				{
 					Type:   mount.TypeVolume,
@@ -168,7 +164,7 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
 				}
 			}
 
-			secOpts, err := system.DecodeSecurityOptions(info.SecurityOptions)
+			secOpts, err := dockertypes.DecodeSecurityOptions(info.SecurityOptions)
 			if err != nil {
 				return err
 			}
@@ -227,7 +223,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, container.LogsOptions{
+	rc, err := d.DockerAPI.ContainerLogs(ctx, d.Name, dockertypes.ContainerLogsOptions{
 		ShowStdout: true, ShowStderr: true,
 	})
 	if err != nil {
@@ -305,7 +301,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, container.StartOptions{})
+	return d.DockerAPI.ContainerStart(ctx, d.Name, dockertypes.ContainerStartOptions{})
 }
 
 func (d *Driver) Info(ctx context.Context) (*driver.Info, error) {
@@ -363,18 +359,18 @@ func (d *Driver) Rm(ctx context.Context, force, rmVolume, rmDaemon bool) error {
 		return err
 	}
 	if info.Status != driver.Inactive {
-		ctr, err := d.DockerAPI.ContainerInspect(ctx, d.Name)
+		container, err := d.DockerAPI.ContainerInspect(ctx, d.Name)
 		if err != nil {
 			return err
 		}
 		if rmDaemon {
-			if err := d.DockerAPI.ContainerRemove(ctx, d.Name, container.RemoveOptions{
+			if err := d.DockerAPI.ContainerRemove(ctx, d.Name, dockertypes.ContainerRemoveOptions{
 				RemoveVolumes: true,
 				Force:         force,
 			}); err != nil {
 				return err
 			}
-			for _, v := range ctr.Mounts {
+			for _, v := range container.Mounts {
 				if v.Name != d.Name+volumeStateSuffix {
 					continue
 				}
@@ -387,22 +383,15 @@ func (d *Driver) Rm(ctx context.Context, force, rmVolume, rmDaemon bool) error {
 	return nil
 }
 
-func (d *Driver) Dial(ctx context.Context) (net.Conn, error) {
+func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
 	_, conn, err := d.exec(ctx, []string{"buildctl", "dial-stdio"})
 	if err != nil {
 		return nil, err
 	}
+
 	conn = demuxConn(conn)
-	return conn, nil
-}
 
-func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
+	exp, err := detect.Exporter()
-	conn, err := d.Dial(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	exp, _, err := detect.Exporter()
 	if err != nil {
 		return nil, err
 	}
@@ -495,7 +484,7 @@ func writeConfigFiles(m map[string][]byte) (_ string, err error) {
 }
 
 func getBuildkitFlags(initConfig driver.InitConfig) []string {
-	flags := initConfig.BuildkitdFlags
+	flags := initConfig.BuildkitFlags
 	if _, ok := initConfig.Files[buildkitdConfigFile]; ok {
 		// There's no way for us to determine the appropriate default configuration
 		// path and the default path can vary depending on if the image is normal

driver/docker-container/factory.go

@@ -7,14 +7,12 @@ import (
 	"strings"
 
 	"github.com/docker/buildx/driver"
-	dockeropts "github.com/docker/cli/opts"
 	dockerclient "github.com/docker/docker/client"
 	"github.com/pkg/errors"
 )
 
 const prioritySupported = 30
 const priorityUnsupported = 70
-const defaultRestartPolicy = "unless-stopped"
 
 func init() {
 	driver.Register(&factory{})
@@ -42,19 +40,14 @@ func (f *factory) New(ctx context.Context, cfg driver.InitConfig) (driver.Driver
 	if cfg.DockerAPI == nil {
 		return nil, errors.Errorf("%s driver requires docker API access", f.Name())
 	}
-	rp, err := dockeropts.ParseRestartPolicy(defaultRestartPolicy)
+	d := &Driver{factory: f, InitConfig: cfg}
-	if err != nil {
-		return nil, err
-	}
-	d := &Driver{
-		factory:       f,
-		InitConfig:    cfg,
-		restartPolicy: rp,
-	}
 	for k, v := range cfg.DriverOpts {
 		switch {
 		case k == "network":
 			d.netMode = v
+			if v == "host" {
+				d.InitConfig.BuildkitFlags = append(d.InitConfig.BuildkitFlags, "--allow-insecure-entitlement=network.host")
+			}
 		case k == "image":
 			d.image = v
 		case k == "memory":
@@ -89,11 +82,6 @@ func (f *factory) New(ctx context.Context, cfg driver.InitConfig) (driver.Driver
 			d.cpusetMems = v
 		case k == "cgroup-parent":
 			d.cgroupParent = v
-		case k == "restart-policy":
-			d.restartPolicy, err = dockeropts.ParseRestartPolicy(v)
-			if err != nil {
-				return nil, err
-			}
 		case strings.HasPrefix(k, "env."):
 			envName := strings.TrimPrefix(k, "env.")
 			if envName == "" {

driver/docker/driver.go

@@ -57,20 +57,16 @@ func (d *Driver) Rm(ctx context.Context, force, rmVolume, rmDaemon bool) error {
 	return nil
 }
 
-func (d *Driver) Dial(ctx context.Context) (net.Conn, error) {
-	return d.DockerAPI.DialHijack(ctx, "/grpc", "h2c", d.DialMeta)
-}
-
 func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
 	opts := []client.ClientOpt{
 		client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
-			return d.Dial(ctx)
+			return d.DockerAPI.DialHijack(ctx, "/grpc", "h2c", d.DialMeta)
 		}), client.WithSessionDialer(func(ctx context.Context, proto string, meta map[string][]string) (net.Conn, error) {
 			return d.DockerAPI.DialHijack(ctx, "/session", proto, meta)
 		}),
 	}
 
-	exp, _, err := detect.Exporter()
+	exp, err := detect.Exporter()
 	if err != nil {
 		return nil, err
 	}

driver/driver.go

@@ -59,7 +59,6 @@ type Driver interface {
 	Version(context.Context) (string, error)
 	Stop(ctx context.Context, force bool) error
 	Rm(ctx context.Context, force, rmVolume, rmDaemon bool) error
-	Dial(ctx context.Context) (net.Conn, error)
 	Client(ctx context.Context) (*client.Client, error)
 	Features(ctx context.Context) map[Feature]bool
 	HostGatewayIP(ctx context.Context) (net.IP, error)

driver/kubernetes/driver.go

@@ -189,7 +189,7 @@ func (d *Driver) Rm(ctx context.Context, force, rmVolume, rmDaemon bool) error {
 	return nil
 }
 
-func (d *Driver) Dial(ctx context.Context) (net.Conn, error) {
+func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
 	restClient := d.clientset.CoreV1().RESTClient()
 	restClientConfig, err := d.KubeClientConfig.ClientConfig()
 	if err != nil {
@@ -208,18 +208,15 @@ func (d *Driver) Dial(ctx context.Context) (net.Conn, error) {
 	if err != nil {
 		return nil, err
 	}
-	return conn, nil
-}
 
-func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
+	exp, err := detect.Exporter()
-	exp, _, err := detect.Exporter()
 	if err != nil {
 		return nil, err
 	}
 
 	var opts []client.ClientOpt
 	opts = append(opts, client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
-		return d.Dial(ctx)
+		return conn, nil
 	}))
 	if td, ok := exp.(client.TracerDelegate); ok {
 		opts = append(opts, client.WithTracerDelegate(td))

driver/kubernetes/factory.go

@@ -105,7 +105,7 @@ func (f *factory) processDriverOpts(deploymentName string, namespace string, cfg
 		Name:          deploymentName,
 		Image:         bkimage.DefaultImage,
 		Replicas:      1,
-		BuildkitFlags: cfg.BuildkitdFlags,
+		BuildkitFlags: cfg.BuildkitFlags,
 		Rootless:      false,
 		Platforms:     cfg.Platforms,
 		ConfigFiles:   cfg.Files,

driver/manager.go

@@ -52,7 +52,7 @@ type InitConfig struct {
 	EndpointAddr     string
 	DockerAPI        dockerclient.APIClient
 	KubeClientConfig KubeClientConfig
-	BuildkitdFlags   []string
+	BuildkitFlags    []string
 	Files            map[string][]byte
 	DriverOpts       map[string]string
 	Auth             Auth
@@ -103,13 +103,13 @@ func GetFactory(name string, instanceRequired bool) (Factory, error) {
 	return nil, errors.Errorf("failed to find driver %q", name)
 }
 
-func GetDriver(ctx context.Context, name string, f Factory, endpointAddr string, api dockerclient.APIClient, auth Auth, kcc KubeClientConfig, buildkitdFlags []string, files map[string][]byte, do map[string]string, platforms []specs.Platform, contextPathHash string, dialMeta map[string][]string) (*DriverHandle, error) {
+func GetDriver(ctx context.Context, name string, f Factory, endpointAddr string, api dockerclient.APIClient, auth Auth, kcc KubeClientConfig, flags []string, files map[string][]byte, do map[string]string, platforms []specs.Platform, contextPathHash string, dialMeta map[string][]string) (*DriverHandle, error) {
 	ic := InitConfig{
 		EndpointAddr:     endpointAddr,
 		DockerAPI:        api,
 		KubeClientConfig: kcc,
 		Name:             name,
-		BuildkitdFlags:   buildkitdFlags,
+		BuildkitFlags:    flags,
 		DriverOpts:       do,
 		Auth:             auth,
 		Platforms:        platforms,

driver/remote/driver.go

@@ -2,19 +2,13 @@ package remote
 
 import (
 	"context"
-	"crypto/tls"
+	"errors"
-	"crypto/x509"
 	"net"
-	"os"
-	"strings"
-	"time"
 
 	"github.com/docker/buildx/driver"
-	util "github.com/docker/buildx/driver/remote/util"
 	"github.com/docker/buildx/util/progress"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/util/tracing/detect"
-	"github.com/pkg/errors"
 )
 
 type Driver struct {
@@ -38,11 +32,7 @@ func (d *Driver) Bootstrap(ctx context.Context, l progress.Logger) error {
 	if err != nil {
 		return err
 	}
-	return progress.Wrap("[internal] waiting for connection", l, func(_ progress.SubLogger) error {
+	return c.Wait(ctx)
-		ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
-		defer cancel()
-		return c.Wait(ctx)
-	})
 }
 
 func (d *Driver) Info(ctx context.Context) (*driver.Info, error) {
@@ -79,7 +69,7 @@ func (d *Driver) Rm(ctx context.Context, force, rmVolume, rmDaemon bool) error {
 func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
 	opts := []client.ClientOpt{}
 
-	exp, _, err := detect.Exporter()
+	exp, err := detect.Exporter()
 	if err != nil {
 		return nil, err
 	}
@@ -87,60 +77,14 @@ func (d *Driver) Client(ctx context.Context) (*client.Client, error) {
 		opts = append(opts, client.WithTracerDelegate(td))
 	}
 
-	opts = append(opts, client.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) {
-		return d.Dial(ctx)
-	}))
-
-	return client.New(ctx, "", opts...)
-}
-
-func (d *Driver) Dial(ctx context.Context) (net.Conn, error) {
-	network, addr, ok := strings.Cut(d.InitConfig.EndpointAddr, "://")
-	if !ok {
-		return nil, errors.Errorf("invalid endpoint address: %s", d.InitConfig.EndpointAddr)
-	}
-
-	conn, err := util.DialContext(ctx, network, addr)
-
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
 	if d.tlsOpts != nil {
-		cfg, err := loadTLS(d.tlsOpts)
+		opts = append(opts, []client.ClientOpt{
-		if err != nil {
+			client.WithServerConfig(d.tlsOpts.serverName, d.tlsOpts.caCert),
-			return nil, errors.Wrap(err, "error loading tls config")
+			client.WithCredentials(d.tlsOpts.cert, d.tlsOpts.key),
-		}
+		}...)
-		conn = tls.Client(conn, cfg)
-	}
-	return conn, nil
-}
-
-func loadTLS(opts *tlsOpts) (*tls.Config, error) {
-	cfg := &tls.Config{
-		ServerName: opts.serverName,
-		RootCAs:    x509.NewCertPool(),
 	}
 
-	if opts.caCert != "" {
+	return client.New(ctx, d.InitConfig.EndpointAddr, opts...)
-		ca, err := os.ReadFile(opts.caCert)
-		if err != nil {
-			return nil, errors.Wrap(err, "could not read ca certificate")
-		}
-		if ok := cfg.RootCAs.AppendCertsFromPEM(ca); !ok {
-			return nil, errors.New("failed to append ca certs")
-		}
-	}
-
-	if opts.cert != "" || opts.key != "" {
-		cert, err := tls.LoadX509KeyPair(opts.cert, opts.key)
-		if err != nil {
-			return nil, errors.Wrap(err, "could not read certificate/key")
-		}
-		cfg.Certificates = append(cfg.Certificates, cert)
-	}
-
-	return cfg, nil
 }
 
 func (d *Driver) Features(ctx context.Context) map[driver.Feature]bool {

driver/remote/factory.go

@@ -46,7 +46,7 @@ func (f *factory) New(ctx context.Context, cfg driver.InitConfig) (driver.Driver
 	if len(cfg.Files) > 0 {
 		return nil, errors.Errorf("setting config file is not supported for remote driver")
 	}
-	if len(cfg.BuildkitdFlags) > 0 {
+	if len(cfg.BuildkitFlags) > 0 {
 		return nil, errors.Errorf("setting buildkit flags is not supported for remote driver")
 	}
 

driver/remote/util/dialer_unix.go

@@ -1,17 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package remote
-
-import (
-	"context"
-	"net"
-)
-
-func DialContext(ctx context.Context, network string, addr string) (net.Conn, error) {
-	dialer := &net.Dialer{}
-
-	conn, err := dialer.DialContext(ctx, network, addr)
-
-	return conn, err
-}

driver/remote/util/dialer_windows.go

@@ -1,23 +0,0 @@
-package remote
-
-import (
-	"context"
-	"net"
-
-	"github.com/Microsoft/go-winio"
-)
-
-func DialContext(ctx context.Context, network string, addr string) (net.Conn, error) {
-	var conn net.Conn
-	var err error
-
-	// dial context doesn't support named pipes
-	if network == "npipe" {
-		conn, err = winio.DialPipeContext(ctx, addr)
-	} else {
-		dialer := &net.Dialer{}
-		conn, err = dialer.DialContext(ctx, network, addr)
-	}
-
-	return conn, err
-}

driver/remote/util/endpoint.go

@@ -12,7 +12,6 @@ var schemes = map[string]struct{}{
 	"ssh":              {},
 	"docker-container": {},
 	"kube-pod":         {},
-	"npipe":            {},
 }
 
 func IsValidEndpoint(ep string) error {

go.mod

@@ -1,178 +1,164 @@
 module github.com/docker/buildx
 
-go 1.21
+go 1.20
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
-	github.com/Microsoft/go-winio v0.6.1
+	github.com/aws/aws-sdk-go-v2/config v1.18.16
-	github.com/aws/aws-sdk-go-v2/config v1.26.6
+	github.com/compose-spec/compose-go v1.20.0
-	github.com/compose-spec/compose-go/v2 v2.0.0-rc.8
+	github.com/containerd/console v1.0.3
-	github.com/containerd/console v1.0.4
+	github.com/containerd/containerd v1.7.7
-	github.com/containerd/containerd v1.7.13
+	github.com/containerd/continuity v0.4.2
-	github.com/containerd/continuity v0.4.3
 	github.com/containerd/log v0.1.0
 	github.com/containerd/typeurl/v2 v2.1.1
 	github.com/creack/pty v1.1.18
 	github.com/distribution/reference v0.5.0
-	github.com/docker/cli v26.0.0-rc1+incompatible
+	github.com/docker/cli v24.0.5+incompatible
 	github.com/docker/cli-docs-tool v0.7.0
-	github.com/docker/docker v26.0.0-rc1+incompatible
+	github.com/docker/docker v24.0.5+incompatible
 	github.com/docker/go-units v0.5.0
 	github.com/gofrs/flock v0.8.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.3
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
-	github.com/google/uuid v1.6.0
+	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-cty-funcs v0.0.0-20230405223818-a090f58aa992
 	github.com/hashicorp/hcl/v2 v2.19.1
-	github.com/moby/buildkit v0.13.0
+	github.com/moby/buildkit v0.13.0-beta1.0.20231023114302-d5c1d785b042
-	github.com/moby/sys/mountinfo v0.7.1
+	github.com/moby/sys/mountinfo v0.6.2
 	github.com/moby/sys/signal v0.7.0
 	github.com/morikuni/aec v1.0.0
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.0-rc5
 	github.com/pelletier/go-toml v1.9.5
 	github.com/pkg/errors v0.9.1
-	github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b
+	github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.8.0
+	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
 	github.com/zclconf/go-cty v1.14.1
-	go.opentelemetry.io/otel v1.21.0
+	go.opentelemetry.io/otel v1.14.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0
+	go.opentelemetry.io/otel/trace v1.14.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0
+	golang.org/x/mod v0.11.0
-	go.opentelemetry.io/otel/metric v1.21.0
+	golang.org/x/sync v0.3.0
-	go.opentelemetry.io/otel/sdk v1.21.0
+	golang.org/x/term v0.13.0
-	go.opentelemetry.io/otel/sdk/metric v1.21.0
+	google.golang.org/grpc v1.53.0
-	go.opentelemetry.io/otel/trace v1.21.0
-	golang.org/x/mod v0.14.0
-	golang.org/x/sync v0.6.0
-	golang.org/x/sys v0.16.0
-	golang.org/x/term v0.16.0
-	google.golang.org/grpc v1.59.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.29.2
+	k8s.io/api v0.26.7
-	k8s.io/apimachinery v0.29.2
+	k8s.io/apimachinery v0.26.7
-	k8s.io/apiserver v0.29.2
+	k8s.io/apiserver v0.26.7
-	k8s.io/client-go v0.29.2
+	k8s.io/client-go v0.26.7
 )
 
 require (
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/Microsoft/hcsshim v0.11.4 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/hcsshim v0.11.1 // indirect
 	github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-cidr v1.0.1 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.17.6 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.13.16 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.24 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.24 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.31 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.24 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.12.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.18.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect
+	github.com/aws/smithy-go v1.13.5 // indirect
-	github.com/aws/smithy-go v1.19.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/containerd/ttrpc v1.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.8.0 // indirect
+	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fvbommel/sortorder v1.0.1 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/in-toto/in-toto-golang v0.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/compress v1.16.3 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mattn/go-shellwords v1.0.12 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
-	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/sys/user v0.1.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
+	github.com/opencontainers/runc v1.1.9 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.17.0 // indirect
+	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
 	github.com/shibumi/go-pathspec v1.3.0 // indirect
 	github.com/theupdateframework/notary v0.7.0 // indirect
-	github.com/tonistiigi/fsutil v0.0.0-20240301111122-7525a1af2bb5 // indirect
+	github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
 	github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
 	github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.40.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.42.0 // indirect
+	go.opentelemetry.io/otel/metric v0.37.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.14.0 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
-	golang.org/x/oauth2 v0.11.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/oauth2 v0.5.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.17.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )

hack/dockerfiles/docs.Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.21.6
 ARG FORMATS=md,yaml
 
 FROM golang:${GO_VERSION}-alpine AS docsgen

hack/dockerfiles/generated-files.Dockerfile

@@ -5,7 +5,7 @@
 # Copyright The Buildx Authors.
 # Licensed under the Apache License, Version 2.0
 
-ARG GO_VERSION="1.21"
+ARG GO_VERSION="1.21.6"
 ARG PROTOC_VERSION="3.11.4"
 
 # protoc is dynamically linked to glibc so can't use alpine base

hack/dockerfiles/lint.Dockerfile

@@ -1,19 +1,14 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.21.6
-ARG XX_VERSION=1.3.0
 ARG GOLANGCI_LINT_VERSION=1.54.2
 
-FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
+FROM golang:${GO_VERSION}-alpine
-FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine
 RUN apk add --no-cache git gcc musl-dev
 ENV GOFLAGS="-buildvcs=false"
 ARG GOLANGCI_LINT_VERSION
 RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v${GOLANGCI_LINT_VERSION}
-COPY --link --from=xx / /
 WORKDIR /go/src/github.com/docker/buildx
-ARG TARGETPLATFORM
 RUN --mount=target=/go/src/github.com/docker/buildx \
-    --mount=target=/root/.cache,type=cache,id=lint-cache-$TARGETPLATFORM \
+    --mount=target=/root/.cache,type=cache \
-    xx-go --wrap && \
     golangci-lint run

hack/dockerfiles/vendor.Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.21.6
 ARG MODOUTDATED_VERSION=v0.8.0
 
 FROM golang:${GO_VERSION}-alpine AS base

hack/test-driver

@@ -49,7 +49,7 @@ if [ "$DRIVER" != "docker" ]; then
     for platform in ${PLATFORMS//,/ }; do
       createFlags=""
       if [ -f "$BUILDKIT_CFG" ]; then
-        createFlags="$createFlags --buildkitd-config=${BUILDKIT_CFG}"
+        createFlags="$createFlags --config=${BUILDKIT_CFG}"
       fi
       if [ "$firstNode" = "0" ]; then
         createFlags="$createFlags --append"
@@ -71,7 +71,7 @@ if [ "$DRIVER" != "docker" ]; then
   else
     createFlags=""
     if [ -f "$BUILDKIT_CFG" ]; then
-      createFlags="$createFlags --buildkitd-config=${BUILDKIT_CFG}"
+      createFlags="$createFlags --config=${BUILDKIT_CFG}"
     fi
     buildxCmd create ${createFlags} \
       --bootstrap \

store/nodegroup.go

@@ -24,11 +24,11 @@ type NodeGroup struct {
 }
 
 type Node struct {
-	Name           string
+	Name       string
-	Endpoint       string
+	Endpoint   string
-	Platforms      []specs.Platform
+	Platforms  []specs.Platform
-	DriverOpts     map[string]string
+	Flags      []string
-	BuildkitdFlags []string `json:"Flags"` // keep the field name for backward compatibility
+	DriverOpts map[string]string
 
 	Files map[string][]byte
 }
@@ -48,7 +48,7 @@ func (ng *NodeGroup) Leave(name string) error {
 	return nil
 }
 
-func (ng *NodeGroup) Update(name, endpoint string, platforms []string, endpointsSet bool, actionAppend bool, buildkitdFlags []string, buildkitdConfigFile string, do map[string]string) error {
+func (ng *NodeGroup) Update(name, endpoint string, platforms []string, endpointsSet bool, actionAppend bool, flags []string, configFile string, do map[string]string) error {
 	if ng.Dynamic {
 		return errors.New("dynamic node group does not support Update")
 	}
@@ -66,8 +66,8 @@ func (ng *NodeGroup) Update(name, endpoint string, platforms []string, endpoints
 	}
 
 	var files map[string][]byte
-	if buildkitdConfigFile != "" {
+	if configFile != "" {
-		files, err = confutil.LoadConfigFiles(buildkitdConfigFile)
+		files, err = confutil.LoadConfigFiles(configFile)
 		if err != nil {
 			return err
 		}
@@ -83,15 +83,15 @@ func (ng *NodeGroup) Update(name, endpoint string, platforms []string, endpoints
 		if len(platforms) > 0 {
 			n.Platforms = pp
 		}
-		if buildkitdFlags != nil {
+		if flags != nil {
-			n.BuildkitdFlags = buildkitdFlags
+			n.Flags = flags
 			needsRestart = true
 		}
 		if do != nil {
 			n.DriverOpts = do
 			needsRestart = true
 		}
-		if buildkitdConfigFile != "" {
+		if configFile != "" {
 			for k, v := range files {
 				n.Files[k] = v
 			}
@@ -115,12 +115,12 @@ func (ng *NodeGroup) Update(name, endpoint string, platforms []string, endpoints
 	}
 
 	n := Node{
-		Name:           name,
+		Name:       name,
-		Endpoint:       endpoint,
+		Endpoint:   endpoint,
-		Platforms:      pp,
+		Platforms:  pp,
-		DriverOpts:     do,
+		Flags:      flags,
-		BuildkitdFlags: buildkitdFlags,
+		DriverOpts: do,
-		Files:          files,
+		Files:      files,
 	}
 
 	ng.Nodes = append(ng.Nodes, n)
@@ -143,8 +143,8 @@ func (ng *NodeGroup) Copy() *NodeGroup {
 func (n *Node) Copy() *Node {
 	platforms := []specs.Platform{}
 	copy(platforms, n.Platforms)
-	buildkitdFlags := []string{}
+	flags := []string{}
-	copy(buildkitdFlags, n.BuildkitdFlags)
+	copy(flags, n.Flags)
 	driverOpts := map[string]string{}
 	for k, v := range n.DriverOpts {
 		driverOpts[k] = v
@@ -156,12 +156,12 @@ func (n *Node) Copy() *Node {
 		files[k] = vv
 	}
 	return &Node{
-		Name:           n.Name,
+		Name:       n.Name,
-		Endpoint:       n.Endpoint,
+		Endpoint:   n.Endpoint,
-		Platforms:      platforms,
+		Platforms:  platforms,
-		BuildkitdFlags: buildkitdFlags,
+		Flags:      flags,
-		DriverOpts:     driverOpts,
+		DriverOpts: driverOpts,
-		Files:          files,
+		Files:      files,
 	}
 }
 

store/nodegroup_test.go

@@ -28,8 +28,8 @@ func TestNodeGroupUpdate(t *testing.T) {
 	require.Equal(t, []string{"linux/arm64"}, platformutil.Format(ng.Nodes[1].Platforms))
 
 	require.Equal(t, "foo2", ng.Nodes[0].Endpoint)
-	require.Equal(t, []string{"--debug"}, ng.Nodes[0].BuildkitdFlags)
+	require.Equal(t, []string{"--debug"}, ng.Nodes[0].Flags)
-	require.Equal(t, []string(nil), ng.Nodes[1].BuildkitdFlags)
+	require.Equal(t, []string(nil), ng.Nodes[1].Flags)
 
 	// duplicate endpoint
 	err = ng.Update("foo1", "foo2", nil, true, false, nil, "", nil)

tests/bake.go

@@ -1,20 +1,13 @@
 package tests
 
 import (
-	"encoding/json"
-	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/docker/buildx/util/gitutil"
-	"github.com/moby/buildkit/identity"
-	"github.com/moby/buildkit/util/contentutil"
-	"github.com/moby/buildkit/util/testutil"
 	"github.com/moby/buildkit/util/testutil/integration"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 )
 
@@ -31,7 +24,6 @@ var bakeTests = []func(t *testing.T, sb integration.Sandbox){
 	testBakeRemote,
 	testBakeRemoteCmdContext,
 	testBakeRemoteLocalOverride,
-	testBakeLocalCwdOverride,
 	testBakeRemoteCmdContextOverride,
 	testBakeRemoteContextSubdir,
 	testBakeRemoteCmdContextEscapeRoot,
@@ -39,11 +31,6 @@ var bakeTests = []func(t *testing.T, sb integration.Sandbox){
 	testBakeRemoteDockerfileCwd,
 	testBakeRemoteLocalContextRemoteDockerfile,
 	testBakeEmpty,
-	testBakeShmSize,
-	testBakeUlimits,
-	testBakeRefs,
-	testBakeMultiExporters,
-	testBakeLoadPush,
 }
 
 func testBakeLocal(t *testing.T, sb integration.Sandbox) {
@@ -66,7 +53,7 @@ target "default" {
 
 	cmd := buildxCmd(sb, withDir(dir), withArgs("bake", "--progress=plain", "--set", "*.output=type=local,dest="+dirDest))
 	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(out))
+	require.NoError(t, err, out)
 	require.Contains(t, string(out), `#1 [internal] load local bake definitions`)
 	require.Contains(t, string(out), `#1 reading docker-bake.hcl`)
 
@@ -186,41 +173,6 @@ EOT
 	require.FileExists(t, filepath.Join(dirDest, "bar"))
 }
 
-func testBakeLocalCwdOverride(t *testing.T, sb integration.Sandbox) {
-	bakeFile := []byte(`
-target "default" {
-	dockerfile-inline = <<EOT
-FROM scratch
-COPY foo /foo
-EOT
-}
-`)
-	cwdBakefile := []byte(`
-target "default" {
-	dockerfile-inline = <<EOT
-FROM scratch
-COPY bar /bar
-EOT
-}
-`)
-
-	dir := tmpdir(
-		t,
-		fstest.CreateFile("docker-bake.hcl", bakeFile, 0600),
-		fstest.CreateFile("docker-bake-cwd.hcl", cwdBakefile, 0600),
-		fstest.CreateFile("bar", []byte("bar"), 0600),
-	)
-	dirDest := t.TempDir()
-
-	cmd := buildxCmd(sb, withDir(dir), withArgs("bake", "--file", "docker-bake.hcl", "--file", "cwd://docker-bake-cwd.hcl", "--progress=plain", "--set", "*.output=type=local,dest="+dirDest))
-	dt, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(dt))
-	require.Contains(t, string(dt), `#1 [internal] load local bake definitions`)
-	require.Contains(t, string(dt), `#1 reading docker-bake.hcl`)
-	require.Contains(t, string(dt), `#1 reading docker-bake-cwd.hcl`)
-	require.FileExists(t, filepath.Join(dirDest, "bar"))
-}
-
 func testBakeRemoteCmdContext(t *testing.T, sb integration.Sandbox) {
 	bakefile := []byte(`
 target "default" {
@@ -532,262 +484,3 @@ func testBakeEmpty(t *testing.T, sb integration.Sandbox) {
 	require.Error(t, err, out)
 	require.Contains(t, out, "couldn't find a bake definition")
 }
-
-func testBakeShmSize(t *testing.T, sb integration.Sandbox) {
-	dockerfile := []byte(`
-FROM busybox AS build
-RUN mount | grep /dev/shm > /shmsize
-FROM scratch
-COPY --from=build /shmsize /
-	`)
-	bakefile := []byte(`
-target "default" {
-  shm-size = "128m"
-}
-`)
-	dir := tmpdir(
-		t,
-		fstest.CreateFile("docker-bake.hcl", bakefile, 0600),
-		fstest.CreateFile("Dockerfile", dockerfile, 0600),
-	)
-
-	dirDest := t.TempDir()
-
-	out, err := bakeCmd(
-		sb,
-		withDir(dir),
-		withArgs("--set", "*.output=type=local,dest="+dirDest),
-	)
-	require.NoError(t, err, out)
-
-	dt, err := os.ReadFile(filepath.Join(dirDest, "shmsize"))
-	require.NoError(t, err)
-	require.Contains(t, string(dt), `size=131072k`)
-}
-
-func testBakeUlimits(t *testing.T, sb integration.Sandbox) {
-	dockerfile := []byte(`
-FROM busybox AS build
-RUN ulimit -n > first > /ulimit
-FROM scratch
-COPY --from=build /ulimit /
-	`)
-	bakefile := []byte(`
-target "default" {
-  ulimits = ["nofile=1024:1024"]
-}
-`)
-	dir := tmpdir(
-		t,
-		fstest.CreateFile("docker-bake.hcl", bakefile, 0600),
-		fstest.CreateFile("Dockerfile", dockerfile, 0600),
-	)
-
-	dirDest := t.TempDir()
-
-	out, err := bakeCmd(
-		sb,
-		withDir(dir),
-		withArgs("--set", "*.output=type=local,dest="+dirDest),
-	)
-	require.NoError(t, err, out)
-
-	dt, err := os.ReadFile(filepath.Join(dirDest, "ulimit"))
-	require.NoError(t, err)
-	require.Contains(t, string(dt), `1024`)
-}
-
-func testBakeRefs(t *testing.T, sb integration.Sandbox) {
-	dockerfile := []byte(`
-FROM scratch
-COPY foo /foo
-	`)
-	bakefile := []byte(`
-target "default" {
-}
-`)
-	dir := tmpdir(
-		t,
-		fstest.CreateFile("docker-bake.hcl", bakefile, 0600),
-		fstest.CreateFile("Dockerfile", dockerfile, 0600),
-		fstest.CreateFile("foo", []byte("foo"), 0600),
-	)
-
-	dirDest := t.TempDir()
-
-	outFlag := "default.output=type=docker"
-	if sb.DockerAddress() == "" {
-		// there is no Docker atm to load the image
-		outFlag += ",dest=" + dirDest + "/image.tar"
-	}
-
-	cmd := buildxCmd(sb, withDir(dir), withArgs("bake", "--metadata-file", filepath.Join(dirDest, "md.json"), "--set", outFlag))
-	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, out)
-
-	dt, err := os.ReadFile(filepath.Join(dirDest, "md.json"))
-	require.NoError(t, err)
-
-	type mdT struct {
-		Default struct {
-			BuildRef string `json:"buildx.build.ref"`
-		} `json:"default"`
-	}
-	var md mdT
-	err = json.Unmarshal(dt, &md)
-	require.NoError(t, err)
-
-	require.NotEmpty(t, md.Default.BuildRef)
-}
-
-func testBakeMultiExporters(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker" {
-		t.Skip("skipping test for non-docker workers")
-	}
-
-	registry, err := sb.NewRegistry()
-	if errors.Is(err, integration.ErrRequirements) {
-		t.Skip(err.Error())
-	}
-	require.NoError(t, err)
-
-	targetReg := registry + "/buildx/registry:latest"
-	targetStore := "buildx:local-" + identity.NewID()
-
-	var builderName string
-	t.Cleanup(func() {
-		if builderName == "" {
-			return
-		}
-
-		cmd := dockerCmd(sb, withArgs("image", "rm", targetStore))
-		cmd.Stderr = os.Stderr
-		require.NoError(t, cmd.Run())
-
-		out, err := rmCmd(sb, withArgs(builderName))
-		require.NoError(t, err, out)
-	})
-
-	// TODO: use stable buildkit image when v0.13.0 released
-	out, err := createCmd(sb, withArgs(
-		"--driver", "docker-container",
-		"--buildkitd-flags=--allow-insecure-entitlement=network.host",
-		"--driver-opt", "network=host",
-		"--driver-opt", "image=moby/buildkit:v0.13.0-rc3",
-	))
-	require.NoError(t, err, out)
-	builderName = strings.TrimSpace(out)
-
-	dockerfile := []byte(`
-FROM scratch
-COPY foo /foo
-	`)
-	bakefile := []byte(`
-target "default" {
-}
-`)
-	dir := tmpdir(
-		t,
-		fstest.CreateFile("docker-bake.hcl", bakefile, 0600),
-		fstest.CreateFile("Dockerfile", dockerfile, 0600),
-		fstest.CreateFile("foo", []byte("foo"), 0600),
-	)
-
-	outputs := []string{
-		"--set", fmt.Sprintf("*.output=type=image,name=%s,push=true", targetReg),
-		"--set", fmt.Sprintf("*.output=type=docker,name=%s", targetStore),
-		"--set", fmt.Sprintf("*.output=type=oci,dest=%s/result", dir),
-	}
-	cmd := buildxCmd(sb, withDir(dir), withArgs("bake"), withArgs(outputs...))
-	cmd.Env = append(cmd.Env, "BUILDX_BUILDER="+builderName)
-	outb, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(outb))
-
-	// test registry
-	desc, provider, err := contentutil.ProviderFromRef(targetReg)
-	require.NoError(t, err)
-	_, err = testutil.ReadImages(sb.Context(), provider, desc)
-	require.NoError(t, err)
-
-	// test docker store
-	cmd = dockerCmd(sb, withArgs("image", "inspect", targetStore))
-	cmd.Stderr = os.Stderr
-	require.NoError(t, cmd.Run())
-
-	// test oci
-	_, err = os.ReadFile(fmt.Sprintf("%s/result", dir))
-	require.NoError(t, err)
-
-	// TODO: test metadata file when supported by multi exporters https://github.com/docker/buildx/issues/2181
-}
-
-func testBakeLoadPush(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker" {
-		t.Skip("skipping test for non-docker workers")
-	}
-
-	registry, err := sb.NewRegistry()
-	if errors.Is(err, integration.ErrRequirements) {
-		t.Skip(err.Error())
-	}
-	require.NoError(t, err)
-
-	target := registry + "/buildx/registry:" + identity.NewID()
-
-	var builderName string
-	t.Cleanup(func() {
-		if builderName == "" {
-			return
-		}
-
-		cmd := dockerCmd(sb, withArgs("image", "rm", target))
-		cmd.Stderr = os.Stderr
-		require.NoError(t, cmd.Run())
-
-		out, err := rmCmd(sb, withArgs(builderName))
-		require.NoError(t, err, out)
-	})
-
-	// TODO: use stable buildkit image when v0.13.0 released
-	out, err := createCmd(sb, withArgs(
-		"--driver", "docker-container",
-		"--buildkitd-flags=--allow-insecure-entitlement=network.host",
-		"--driver-opt", "network=host",
-		"--driver-opt", "image=moby/buildkit:v0.13.0-rc3",
-	))
-	require.NoError(t, err, out)
-	builderName = strings.TrimSpace(out)
-
-	dockerfile := []byte(`
-FROM scratch
-COPY foo /foo
-	`)
-	bakefile := []byte(`
-target "default" {
-}
-`)
-	dir := tmpdir(
-		t,
-		fstest.CreateFile("docker-bake.hcl", bakefile, 0600),
-		fstest.CreateFile("Dockerfile", dockerfile, 0600),
-		fstest.CreateFile("foo", []byte("foo"), 0600),
-	)
-
-	cmd := buildxCmd(sb, withDir(dir), withArgs("bake", "--push", "--load", fmt.Sprintf("--set=*.tags=%s", target)))
-	cmd.Env = append(cmd.Env, "BUILDX_BUILDER="+builderName)
-	outb, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(outb))
-
-	// test registry
-	desc, provider, err := contentutil.ProviderFromRef(target)
-	require.NoError(t, err)
-	_, err = testutil.ReadImages(sb.Context(), provider, desc)
-	require.NoError(t, err)
-
-	// test docker store
-	cmd = dockerCmd(sb, withArgs("image", "inspect", target))
-	cmd.Stderr = os.Stderr
-	require.NoError(t, cmd.Run())
-
-	// TODO: test metadata file when supported by multi exporters https://github.com/docker/buildx/issues/2181
-}

tests/build.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"net"
 	"os"
 	"path"
 	"path/filepath"
@@ -16,8 +15,6 @@ import (
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/creack/pty"
-	"github.com/moby/buildkit/identity"
-	"github.com/moby/buildkit/util/appdefaults"
 	"github.com/moby/buildkit/util/contentutil"
 	"github.com/moby/buildkit/util/testutil"
 	"github.com/moby/buildkit/util/testutil/integration"
@@ -51,12 +48,6 @@ var buildTests = []func(t *testing.T, sb integration.Sandbox){
 	testBuildOCIExportNotSupported,
 	testBuildMultiPlatformNotSupported,
 	testDockerHostGateway,
-	testBuildNetworkModeBridge,
-	testBuildShmSize,
-	testBuildUlimit,
-	testBuildRef,
-	testBuildMultiExporters,
-	testBuildLoadPush,
 }
 
 func testBuild(t *testing.T, sb integration.Sandbox) {
@@ -127,7 +118,7 @@ func testBuildRegistryExportAttestations(t *testing.T, sb integration.Sandbox) {
 	out, err := buildCmd(sb, withArgs(fmt.Sprintf("--output=type=image,name=%s,push=true", target), "--provenance=true", dir))
 	if sb.Name() == "docker" {
 		require.Error(t, err)
-		require.Contains(t, out, "Attestation is not supported")
+		require.Contains(t, out, "attestations are not supported")
 		return
 	}
 	require.NoError(t, err, string(out))
@@ -288,6 +279,23 @@ RUN exit 1`)
 	require.True(t, buildDetailsPattern.MatchString(string(out)), fmt.Sprintf("expected build details link in output, got %q", out))
 }
 
+func createTestProject(t *testing.T) string {
+	dockerfile := []byte(`
+FROM busybox:latest AS base
+COPY foo /etc/foo
+RUN cp /etc/foo /etc/bar
+
+FROM scratch
+COPY --from=base /etc/bar /bar
+`)
+	dir := tmpdir(
+		t,
+		fstest.CreateFile("Dockerfile", dockerfile, 0600),
+		fstest.CreateFile("foo", []byte("foo"), 0600),
+	)
+	return dir
+}
+
 func testBuildProgress(t *testing.T, sb integration.Sandbox) {
 	dir := createTestProject(t)
 	driver, _, _ := strings.Cut(sb.Name(), "+")
@@ -424,270 +432,3 @@ RUN ping -c 1 buildx.host-gateway-ip.local
 		require.NoError(t, err, string(out))
 	}
 }
-
-func testBuildNetworkModeBridge(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker" {
-		t.Skip("skipping test for non-docker workers")
-	}
-
-	var builderName string
-	t.Cleanup(func() {
-		if builderName == "" {
-			return
-		}
-		out, err := rmCmd(sb, withArgs(builderName))
-		require.NoError(t, err, out)
-	})
-
-	// TODO: use stable buildkit image when v0.13.0 released
-	out, err := createCmd(sb, withArgs("--driver", "docker-container", "--buildkitd-flags=--oci-worker-net=bridge --allow-insecure-entitlement=network.host", "--driver-opt", "image=moby/buildkit:v0.13.0-rc3"))
-	require.NoError(t, err, out)
-	builderName = strings.TrimSpace(out)
-
-	dockerfile := []byte(`
-FROM busybox AS build
-RUN ip a show eth0 | awk '/inet / {split($2, a, "/"); print a[1]}' > /ip-bridge.txt
-RUN --network=host ip a show eth0 | awk '/inet / {split($2, a, "/"); print a[1]}' > /ip-host.txt
-FROM scratch
-COPY --from=build /ip*.txt /`)
-	dir := tmpdir(t, fstest.CreateFile("Dockerfile", dockerfile, 0600))
-
-	cmd := buildxCmd(sb, withArgs("build", "--allow=network.host", fmt.Sprintf("--output=type=local,dest=%s", dir), dir))
-	cmd.Env = append(cmd.Env, "BUILDX_BUILDER="+builderName)
-	outb, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(outb))
-
-	dt, err := os.ReadFile(filepath.Join(dir, "ip-bridge.txt"))
-	require.NoError(t, err)
-
-	ipBridge := net.ParseIP(strings.TrimSpace(string(dt)))
-	require.NotNil(t, ipBridge)
-
-	_, subnet, err := net.ParseCIDR(appdefaults.BridgeSubnet)
-	require.NoError(t, err)
-	require.True(t, subnet.Contains(ipBridge))
-
-	dt, err = os.ReadFile(filepath.Join(dir, "ip-host.txt"))
-	require.NoError(t, err)
-
-	ip := net.ParseIP(strings.TrimSpace(string(dt)))
-	require.NotNil(t, ip)
-
-	require.NotEqual(t, ip, ipBridge)
-}
-
-func testBuildShmSize(t *testing.T, sb integration.Sandbox) {
-	dockerfile := []byte(`
-FROM busybox AS build
-RUN mount | grep /dev/shm > /shmsize
-FROM scratch
-COPY --from=build /shmsize /
-	`)
-	dir := tmpdir(
-		t,
-		fstest.CreateFile("Dockerfile", dockerfile, 0600),
-	)
-
-	cmd := buildxCmd(sb, withArgs("build", "--shm-size=128m", fmt.Sprintf("--output=type=local,dest=%s", dir), dir))
-	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(out))
-
-	dt, err := os.ReadFile(filepath.Join(dir, "shmsize"))
-	require.NoError(t, err)
-	require.Contains(t, string(dt), `size=131072k`)
-}
-
-func testBuildUlimit(t *testing.T, sb integration.Sandbox) {
-	dockerfile := []byte(`
-FROM busybox AS build
-RUN ulimit -n > first > /ulimit
-FROM scratch
-COPY --from=build /ulimit /
-	`)
-	dir := tmpdir(
-		t,
-		fstest.CreateFile("Dockerfile", dockerfile, 0600),
-	)
-
-	cmd := buildxCmd(sb, withArgs("build", "--ulimit=nofile=1024:1024", fmt.Sprintf("--output=type=local,dest=%s", dir), dir))
-	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(out))
-
-	dt, err := os.ReadFile(filepath.Join(dir, "ulimit"))
-	require.NoError(t, err)
-	require.Contains(t, string(dt), `1024`)
-}
-
-func testBuildRef(t *testing.T, sb integration.Sandbox) {
-	dir := createTestProject(t)
-	dirDest := t.TempDir()
-
-	outFlag := "--output=type=docker"
-	if sb.DockerAddress() == "" {
-		// there is no Docker atm to load the image
-		outFlag += ",dest=" + dirDest + "/image.tar"
-	}
-
-	cmd := buildxCmd(sb, withArgs("build", outFlag, "--metadata-file", filepath.Join(dirDest, "md.json"), dir))
-	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(out))
-
-	dt, err := os.ReadFile(filepath.Join(dirDest, "md.json"))
-	require.NoError(t, err)
-
-	type mdT struct {
-		BuildRef string `json:"buildx.build.ref"`
-	}
-	var md mdT
-	err = json.Unmarshal(dt, &md)
-	require.NoError(t, err)
-
-	require.NotEmpty(t, md.BuildRef)
-}
-
-func testBuildMultiExporters(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker" {
-		t.Skip("skipping test for non-docker workers")
-	}
-
-	registry, err := sb.NewRegistry()
-	if errors.Is(err, integration.ErrRequirements) {
-		t.Skip(err.Error())
-	}
-	require.NoError(t, err)
-
-	targetReg := registry + "/buildx/registry:latest"
-	targetStore := "buildx:local-" + identity.NewID()
-
-	var builderName string
-	t.Cleanup(func() {
-		if builderName == "" {
-			return
-		}
-
-		cmd := dockerCmd(sb, withArgs("image", "rm", targetStore))
-		cmd.Stderr = os.Stderr
-		require.NoError(t, cmd.Run())
-
-		out, err := rmCmd(sb, withArgs(builderName))
-		require.NoError(t, err, out)
-	})
-
-	// TODO: use stable buildkit image when v0.13.0 released
-	out, err := createCmd(sb, withArgs(
-		"--driver", "docker-container",
-		"--buildkitd-flags=--allow-insecure-entitlement=network.host",
-		"--driver-opt", "network=host",
-		"--driver-opt", "image=moby/buildkit:v0.13.0-rc3",
-	))
-	require.NoError(t, err, out)
-	builderName = strings.TrimSpace(out)
-
-	dir := createTestProject(t)
-
-	outputs := []string{
-		"--output", fmt.Sprintf("type=image,name=%s,push=true", targetReg),
-		"--output", fmt.Sprintf("type=docker,name=%s", targetStore),
-		"--output", fmt.Sprintf("type=oci,dest=%s/result", dir),
-	}
-	cmd := buildxCmd(sb, withArgs("build"), withArgs(outputs...), withArgs(dir))
-	cmd.Env = append(cmd.Env, "BUILDX_BUILDER="+builderName)
-	outb, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(outb))
-
-	// test registry
-	desc, provider, err := contentutil.ProviderFromRef(targetReg)
-	require.NoError(t, err)
-	_, err = testutil.ReadImages(sb.Context(), provider, desc)
-	require.NoError(t, err)
-
-	// test docker store
-	cmd = dockerCmd(sb, withArgs("image", "inspect", targetStore))
-	cmd.Stderr = os.Stderr
-	require.NoError(t, cmd.Run())
-
-	// test oci
-	_, err = os.ReadFile(fmt.Sprintf("%s/result", dir))
-	require.NoError(t, err)
-
-	// TODO: test metadata file when supported by multi exporters https://github.com/docker/buildx/issues/2181
-}
-
-func testBuildLoadPush(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker" {
-		t.Skip("skipping test for non-docker workers")
-	}
-
-	registry, err := sb.NewRegistry()
-	if errors.Is(err, integration.ErrRequirements) {
-		t.Skip(err.Error())
-	}
-	require.NoError(t, err)
-
-	target := registry + "/buildx/registry:" + identity.NewID()
-
-	var builderName string
-	t.Cleanup(func() {
-		if builderName == "" {
-			return
-		}
-
-		cmd := dockerCmd(sb, withArgs("image", "rm", target))
-		cmd.Stderr = os.Stderr
-		require.NoError(t, cmd.Run())
-
-		out, err := rmCmd(sb, withArgs(builderName))
-		require.NoError(t, err, out)
-	})
-
-	// TODO: use stable buildkit image when v0.13.0 released
-	out, err := createCmd(sb, withArgs(
-		"--driver", "docker-container",
-		"--buildkitd-flags=--allow-insecure-entitlement=network.host",
-		"--driver-opt", "network=host",
-		"--driver-opt", "image=moby/buildkit:v0.13.0-rc3",
-	))
-	require.NoError(t, err, out)
-	builderName = strings.TrimSpace(out)
-
-	dir := createTestProject(t)
-
-	cmd := buildxCmd(sb, withArgs(
-		"build", "--push", "--load",
-		fmt.Sprintf("-t=%s", target),
-		dir,
-	))
-	cmd.Env = append(cmd.Env, "BUILDX_BUILDER="+builderName)
-	outb, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(outb))
-
-	// test registry
-	desc, provider, err := contentutil.ProviderFromRef(target)
-	require.NoError(t, err)
-	_, err = testutil.ReadImages(sb.Context(), provider, desc)
-	require.NoError(t, err)
-
-	// test docker store
-	cmd = dockerCmd(sb, withArgs("image", "inspect", target))
-	cmd.Stderr = os.Stderr
-	require.NoError(t, cmd.Run())
-
-	// TODO: test metadata file when supported by multi exporters https://github.com/docker/buildx/issues/2181
-}
-
-func createTestProject(t *testing.T) string {
-	dockerfile := []byte(`
-FROM busybox:latest AS base
-COPY foo /etc/foo
-RUN cp /etc/foo /etc/bar
-
-FROM scratch
-COPY --from=base /etc/bar /bar
-`)
-	dir := tmpdir(
-		t,
-		fstest.CreateFile("Dockerfile", dockerfile, 0600),
-		fstest.CreateFile("foo", []byte("foo"), 0600),
-	)
-	return dir
-}

tests/create.go

@@ -17,7 +17,6 @@ func createCmd(sb integration.Sandbox, opts ...cmdOpt) (string, error) {
 
 var createTests = []func(t *testing.T, sb integration.Sandbox){
 	testCreateMemoryLimit,
-	testCreateRestartAlways,
 }
 
 func testCreateMemoryLimit(t *testing.T, sb integration.Sandbox) {
@@ -38,22 +37,3 @@ func testCreateMemoryLimit(t *testing.T, sb integration.Sandbox) {
 	require.NoError(t, err, out)
 	builderName = strings.TrimSpace(out)
 }
-
-func testCreateRestartAlways(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker-container" {
-		t.Skip("only testing for docker-container driver")
-	}
-
-	var builderName string
-	t.Cleanup(func() {
-		if builderName == "" {
-			return
-		}
-		out, err := rmCmd(sb, withArgs(builderName))
-		require.NoError(t, err, out)
-	})
-
-	out, err := createCmd(sb, withArgs("--driver", "docker-container", "--driver-opt", "restart-policy=always"))
-	require.NoError(t, err, out)
-	builderName = strings.TrimSpace(out)
-}

tests/dialstdio.go

@@ -1,124 +0,0 @@
-package tests
-
-import (
-	"bytes"
-	"context"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/docker/buildx/util/progress"
-	"github.com/moby/buildkit/client"
-	"github.com/moby/buildkit/client/llb"
-	gwclient "github.com/moby/buildkit/frontend/gateway/client"
-	"github.com/moby/buildkit/util/progress/progressui"
-	"github.com/moby/buildkit/util/testutil/integration"
-	"github.com/pkg/errors"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-var dialstdioTests = []func(t *testing.T, sb integration.Sandbox){
-	testDialStdio,
-}
-
-func testDialStdio(t *testing.T, sb integration.Sandbox) {
-	do := func(t *testing.T, pipe func(t *testing.T, cmd *exec.Cmd) net.Conn) {
-		errBuf := bytes.NewBuffer(nil)
-		defer func() {
-			if t.Failed() {
-				t.Log(errBuf.String())
-			}
-		}()
-		var cmd *exec.Cmd
-		c, err := client.New(sb.Context(), "", client.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) {
-			cmd = buildxCmd(sb, withArgs("dial-stdio", "--progress", "auto"))
-			conn := pipe(t, cmd)
-			cmd.Stderr = errBuf
-			if err := cmd.Start(); err != nil {
-				return nil, errors.Wrap(err, errBuf.String())
-			}
-
-			return conn, nil
-		}))
-		require.NoError(t, err)
-
-		defer func() {
-			c.Close()
-			// Since the client is closed (and as such the connection shutdown), the buildx command should exit cleanly.
-			chErr := make(chan error, 1)
-			go func() {
-				chErr <- cmd.Wait()
-			}()
-			select {
-			case <-time.After(10 * time.Second):
-				t.Error("timeout waiting for buildx command to exit")
-			case <-chErr:
-				assert.NoError(t, err)
-			}
-		}()
-
-		_, err = c.Info(sb.Context())
-		require.NoError(t, err)
-
-		require.Contains(t, errBuf.String(), "builder: "+sb.Address())
-
-		dir := t.TempDir()
-
-		f, err := os.CreateTemp(dir, "log")
-		require.NoError(t, err)
-		defer f.Close()
-
-		defer func() {
-			if t.Failed() {
-				dt, _ := os.ReadFile(f.Name())
-				t.Log(string(dt))
-			}
-		}()
-
-		p, err := progress.NewPrinter(sb.Context(), f, progressui.AutoMode)
-		require.NoError(t, err)
-
-		ch, chDone := progress.NewChannel(p)
-		done := func() {
-			select {
-			case <-sb.Context().Done():
-			case <-chDone:
-			}
-		}
-
-		_, err = c.Build(sb.Context(), client.SolveOpt{
-			Exports: []client.ExportEntry{
-				{Type: "local", OutputDir: dir},
-			},
-		}, "", func(ctx context.Context, gwc gwclient.Client) (*gwclient.Result, error) {
-			def, err := llb.Scratch().File(llb.Mkfile("hello", 0o600, []byte("world"))).Marshal(ctx)
-			if err != nil {
-				return nil, err
-			}
-
-			return gwc.Solve(ctx, gwclient.SolveRequest{
-				Definition: def.ToPB(),
-			})
-		}, ch)
-		done()
-		require.NoError(t, err)
-
-		dt, err := os.ReadFile(filepath.Join(dir, "hello"))
-		require.NoError(t, err)
-		require.Equal(t, "world", string(dt))
-	}
-
-	t.Run("conn=netpipe", func(t *testing.T) {
-		t.Parallel()
-		do(t, func(t *testing.T, cmd *exec.Cmd) net.Conn {
-			c1, c2 := net.Pipe()
-			cmd.Stdin = c1
-			cmd.Stdout = c1
-			return c2
-		})
-	})
-}

tests/inspect.go

@@ -17,8 +17,6 @@ func inspectCmd(sb integration.Sandbox, opts ...cmdOpt) (string, error) {
 
 var inspectTests = []func(t *testing.T, sb integration.Sandbox){
 	testInspect,
-	testInspectBuildkitdFlags,
-	testInspectNetworkHostEntitlement,
 }
 
 func testInspect(t *testing.T, sb integration.Sandbox) {
@@ -49,63 +47,3 @@ func testInspect(t *testing.T, sb integration.Sandbox) {
 		require.Empty(t, hostGatewayIP, "host-gateway-ip worker label should not be set with non-docker driver")
 	}
 }
-
-func testInspectBuildkitdFlags(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker-container" {
-		t.Skip("only testing for docker-container driver")
-	}
-
-	var builderName string
-	t.Cleanup(func() {
-		if builderName == "" {
-			return
-		}
-		out, err := rmCmd(sb, withArgs(builderName))
-		require.NoError(t, err, out)
-	})
-
-	out, err := createCmd(sb, withArgs("--driver", "docker-container", "--buildkitd-flags=--oci-worker-net=bridge"))
-	require.NoError(t, err, out)
-	builderName = strings.TrimSpace(out)
-
-	out, err = inspectCmd(sb, withArgs(builderName))
-	require.NoError(t, err, out)
-
-	for _, line := range strings.Split(out, "\n") {
-		if v, ok := strings.CutPrefix(line, "BuildKit daemon flags:"); ok {
-			require.Contains(t, v, "--oci-worker-net=bridge")
-			return
-		}
-	}
-	require.Fail(t, "--oci-worker-net=bridge not found in inspect output")
-}
-
-func testInspectNetworkHostEntitlement(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker-container" {
-		t.Skip("only testing for docker-container driver")
-	}
-
-	var builderName string
-	t.Cleanup(func() {
-		if builderName == "" {
-			return
-		}
-		out, err := rmCmd(sb, withArgs(builderName))
-		require.NoError(t, err, out)
-	})
-
-	out, err := createCmd(sb, withArgs("--driver", "docker-container"))
-	require.NoError(t, err, out)
-	builderName = strings.TrimSpace(out)
-
-	out, err = inspectCmd(sb, withArgs(builderName))
-	require.NoError(t, err, out)
-
-	for _, line := range strings.Split(out, "\n") {
-		if v, ok := strings.CutPrefix(line, "BuildKit daemon flags:"); ok {
-			require.Contains(t, v, "--allow-insecure-entitlement=network.host")
-			return
-		}
-	}
-	require.Fail(t, "network.host insecure entitlement not found in inspect output")
-}

tests/integration.go

@@ -47,10 +47,8 @@ func buildxCmd(sb integration.Sandbox, opts ...cmdOpt) *exec.Cmd {
 	}
 
 	if builder := sb.Address(); builder != "" {
-		cmd.Env = append(cmd.Env,
+		cmd.Args = append(cmd.Args, "--builder="+builder)
-			"BUILDX_CONFIG=/tmp/buildx-"+builder,
+		cmd.Env = append(cmd.Env, "BUILDX_CONFIG=/tmp/buildx-"+builder)
-			"BUILDX_BUILDER="+builder,
-		)
 	}
 	if context := sb.DockerAddress(); context != "" {
 		cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context)

tests/integration_test.go

@@ -28,8 +28,6 @@ func TestIntegration(t *testing.T) {
 	tests = append(tests, imagetoolsTests...)
 	tests = append(tests, versionTests...)
 	tests = append(tests, createTests...)
-	tests = append(tests, rmTests...)
-	tests = append(tests, dialstdioTests...)
 	testIntegration(t, tests...)
 }
 

tests/ls.go

@@ -20,37 +20,15 @@ var lsTests = []func(t *testing.T, sb integration.Sandbox){
 }
 
 func testLs(t *testing.T, sb integration.Sandbox) {
-	tests := []struct {
+	out, err := lsCmd(sb)
-		name string
+	require.NoError(t, err, string(out))
-		args []string
-	}{
-		{
-			name: "no args",
-			args: []string{},
-		},
-		{
-			name: "format",
-			args: []string{"--format", "{{.Name}}: {{.DriverEndpoint}}"},
-		},
-	}
 
 	sbDriver, _, _ := strings.Cut(sb.Name(), "+")
-	for _, tt := range tests {
+	for _, line := range strings.Split(out, "\n") {
-		tt := tt
+		if strings.Contains(line, sb.Address()) {
-		t.Run(tt.name, func(t *testing.T) {
+			require.Contains(t, line, sbDriver)
-			out, err := lsCmd(sb, withArgs(tt.args...))
+			return
-			require.NoError(t, err, out)
+		}
-			found := false
-			for _, line := range strings.Split(out, "\n") {
-				if strings.Contains(line, sb.Address()) {
-					found = true
-					require.Contains(t, line, sbDriver)
-					break
-				}
-			}
-			if !found {
-				require.Fail(t, out)
-			}
-		})
 	}
+	require.Fail(t, out)
 }

tests/rm.go

@@ -1,11 +1,7 @@
 package tests
 
 import (
-	"strings"
-	"testing"
-
 	"github.com/moby/buildkit/util/testutil/integration"
-	"github.com/stretchr/testify/require"
 )
 
 func rmCmd(sb integration.Sandbox, opts ...cmdOpt) (string, error) {
@@ -14,47 +10,3 @@ func rmCmd(sb integration.Sandbox, opts ...cmdOpt) (string, error) {
 	out, err := cmd.CombinedOutput()
 	return string(out), err
 }
-
-var rmTests = []func(t *testing.T, sb integration.Sandbox){
-	testRm,
-	testRmMulti,
-}
-
-func testRm(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker-container" {
-		t.Skip("only testing for docker-container driver")
-	}
-
-	out, err := rmCmd(sb, withArgs("default"))
-	require.Error(t, err, out) // can't remove a docker builder
-
-	out, err = createCmd(sb, withArgs("--driver", "docker-container"))
-	require.NoError(t, err, out)
-	builderName := strings.TrimSpace(out)
-
-	out, err = inspectCmd(sb, withArgs(builderName, "--bootstrap"))
-	require.NoError(t, err, out)
-
-	out, err = rmCmd(sb, withArgs(builderName))
-	require.NoError(t, err, out)
-}
-
-func testRmMulti(t *testing.T, sb integration.Sandbox) {
-	if sb.Name() != "docker-container" {
-		t.Skip("only testing for docker-container driver")
-	}
-
-	var builderNames []string
-	for i := 0; i < 3; i++ {
-		out, err := createCmd(sb, withArgs("--driver", "docker-container"))
-		require.NoError(t, err, out)
-		builderName := strings.TrimSpace(out)
-
-		out, err = inspectCmd(sb, withArgs(builderName, "--bootstrap"))
-		require.NoError(t, err, out)
-		builderNames = append(builderNames, builderName)
-	}
-
-	out, err := rmCmd(sb, withArgs(builderNames...))
-	require.NoError(t, err, out)
-}

tests/workers/backend.go

@@ -35,10 +35,6 @@ func (s *backend) Rootless() bool {
 	return false
 }
 
-func (s *backend) NetNSDetached() bool {
-	return false
-}
-
 func (s backend) Supports(feature string) bool {
 	if enabledFeatures := os.Getenv("BUILDKIT_TEST_ENABLE_FEATURES"); enabledFeatures != "" {
 		for _, enabledFeature := range strings.Split(enabledFeatures, ",") {

tests/workers/docker-container.go

@@ -37,10 +37,6 @@ func (w *containerWorker) Rootless() bool {
 	return false
 }
 
-func (w *containerWorker) NetNSDetached() bool {
-	return false
-}
-
 func (w *containerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (integration.Backend, func() error, error) {
 	w.dockerOnce.Do(func() {
 		w.docker, w.dockerClose, w.dockerErr = dockerWorker{id: w.id}.New(ctx, cfg)
@@ -58,7 +54,7 @@ func (w *containerWorker) New(ctx context.Context, cfg *integration.BackendConfi
 	cmd := exec.Command("buildx", "create",
 		"--bootstrap",
 		"--name="+name,
-		"--buildkitd-config="+cfgfile,
+		"--config="+cfgfile,
 		"--driver=docker-container",
 		"--driver-opt=network=host",
 	)

tests/workers/docker.go

@@ -35,10 +35,6 @@ func (c dockerWorker) Rootless() bool {
 	return false
 }
 
-func (c *dockerWorker) NetNSDetached() bool {
-	return false
-}
-
 func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) {
 	moby := bkworkers.Moby{
 		ID:                    c.id,

tests/workers/remote.go

@@ -30,10 +30,6 @@ func (w remoteWorker) Rootless() bool {
 	return false
 }
 
-func (w remoteWorker) NetNSDetached() bool {
-	return false
-}
-
 func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) {
 	oci := bkworkers.OCI{ID: w.id}
 	bk, bkclose, err := oci.New(ctx, cfg)

util/cobrautil/cobrautil.go

@@ -1,10 +1,6 @@
 package cobrautil
 
-import (
+import "github.com/spf13/cobra"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
 
 // HideInheritedFlags hides inherited flags
 func HideInheritedFlags(cmd *cobra.Command, hidden ...string) {
@@ -16,38 +12,3 @@ func HideInheritedFlags(cmd *cobra.Command, hidden ...string) {
 		_ = cmd.Flags().MarkHidden(h)
 	}
 }
-
-const annotationExperimentalCLI = "experimentalCLI"
-
-func MarkFlagExperimental(f *pflag.Flag) {
-	if _, ok := f.Annotations[annotationExperimentalCLI]; ok {
-		return
-	}
-	if f.Annotations == nil {
-		f.Annotations = make(map[string][]string)
-	}
-	f.Annotations[annotationExperimentalCLI] = nil
-	f.Usage += " (EXPERIMENTAL)"
-}
-
-func MarkFlagsExperimental(fs *pflag.FlagSet, names ...string) {
-	for _, name := range names {
-		f := fs.Lookup(name)
-		if f == nil {
-			logrus.Warningf("Unknown flag name %q", name)
-			continue
-		}
-		MarkFlagExperimental(f)
-	}
-}
-
-func MarkCommandExperimental(c *cobra.Command) {
-	if _, ok := c.Annotations[annotationExperimentalCLI]; ok {
-		return
-	}
-	if c.Annotations == nil {
-		c.Annotations = make(map[string]string)
-	}
-	c.Annotations[annotationExperimentalCLI] = ""
-	c.Short += " (EXPERIMENTAL)"
-}

util/confutil/exp.go

@@ -1,15 +0,0 @@
-package confutil
-
-import (
-	"os"
-	"strconv"
-)
-
-// IsExperimental checks if the experimental flag has been configured.
-func IsExperimental() bool {
-	if v, ok := os.LookupEnv("BUILDX_EXPERIMENTAL"); ok {
-		vv, _ := strconv.ParseBool(v)
-		return vv
-	}
-	return false
-}

util/confutil/node.go

@@ -1,34 +0,0 @@
-package confutil
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"os"
-	"path/filepath"
-	"sync"
-)
-
-var nodeIdentifierMu sync.Mutex
-
-func TryNodeIdentifier(configDir string) (out string) {
-	nodeIdentifierMu.Lock()
-	defer nodeIdentifierMu.Unlock()
-	sessionFile := filepath.Join(configDir, ".buildNodeID")
-	if _, err := os.Lstat(sessionFile); err != nil {
-		if os.IsNotExist(err) { // create a new file with stored randomness
-			b := make([]byte, 8)
-			if _, err := rand.Read(b); err != nil {
-				return out
-			}
-			if err := os.WriteFile(sessionFile, []byte(hex.EncodeToString(b)), 0600); err != nil {
-				return out
-			}
-		}
-	}
-
-	dt, err := os.ReadFile(sessionFile)
-	if err == nil {
-		return string(dt)
-	}
-	return
-}

util/gitutil/gitutil.go

@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/buildx/util/osutil"
 	"github.com/pkg/errors"
 )
 
@@ -67,11 +66,7 @@ func (c *Git) IsDirty() bool {
 }
 
 func (c *Git) RootDir() (string, error) {
-	root, err := c.clean(c.run("rev-parse", "--show-toplevel"))
+	return c.clean(c.run("rev-parse", "--show-toplevel"))
-	if err != nil {
-		return "", err
-	}
-	return osutil.SanitizePath(root), nil
 }
 
 func (c *Git) GitDir() (string, error) {
@@ -83,13 +78,7 @@ func (c *Git) GitDir() (string, error) {
 }
 
 func (c *Git) RemoteURL() (string, error) {
-	// Try default remote based on remote tracking branch
+	// Try to get the remote URL from the origin remote first
-	if remote, err := c.currentRemote(); err == nil && remote != "" {
-		if ru, err := c.clean(c.run("remote", "get-url", remote)); err == nil && ru != "" {
-			return stripCredentials(ru), nil
-		}
-	}
-	// Next try to get the remote URL from the origin remote first
 	if ru, err := c.clean(c.run("remote", "get-url", "origin")); err == nil && ru != "" {
 		return stripCredentials(ru), nil
 	}
@@ -160,22 +149,6 @@ func (c *Git) clean(out string, err error) (string, error) {
 	return out, err
 }
 
-func (c *Git) currentRemote() (string, error) {
-	symref, err := c.clean(c.run("symbolic-ref", "-q", "HEAD"))
-	if err != nil {
-		return "", err
-	}
-	if symref == "" {
-		return "", nil
-	}
-	// git for-each-ref --format='%(upstream:remotename)'
-	remote, err := c.clean(c.run("for-each-ref", "--format=%(upstream:remotename)", symref))
-	if err != nil {
-		return "", err
-	}
-	return remote, nil
-}
-
 func IsUnknownRevision(err error) bool {
 	if err == nil {
 		return false

util/gitutil/gitutil_test.go

@@ -106,9 +106,8 @@ func TestGitDescribeTags(t *testing.T) {
 
 func TestGitRemoteURL(t *testing.T) {
 	type remote struct {
-		name     string
+		name string
-		url      string
+		url  string
-		tracking string
 	}
 
 	cases := []struct {
@@ -166,36 +165,6 @@ func TestGitRemoteURL(t *testing.T) {
 			},
 			fail: true,
 		},
-		{
-			name: "single tracking branch",
-			remotes: []remote{
-				{
-					name:     "foo",
-					url:      "https://github.com/tonistiigi/buildx.git",
-					tracking: "master",
-				},
-			},
-			expected: "https://github.com/tonistiigi/buildx.git",
-		},
-		{
-			name: "fork tracking branch",
-			remotes: []remote{
-				{
-					name: "origin",
-					url:  "git@github.com:crazy-max/buildx.git",
-				},
-				{
-					name:     "foobranch",
-					url:      "https://github.com/tonistiigi/buildx.git",
-					tracking: "master",
-				},
-				{
-					name: "crazymax",
-					url:  "git@github.com:crazy-max/buildx.git",
-				},
-			},
-			expected: "https://github.com/tonistiigi/buildx.git",
-		},
 	}
 	for _, tt := range cases {
 		tt := tt
@@ -208,9 +177,6 @@ func TestGitRemoteURL(t *testing.T) {
 			GitCommit(c, t, "initial commit")
 			for _, r := range tt.remotes {
 				GitSetRemote(c, t, r.name, r.url)
-				if r.tracking != "" {
-					GitSetMainUpstream(c, t, r.name, r.tracking)
-				}
 			}
 
 			ru, err := c.RemoteURL()

util/gitutil/path_unix_test.go

@@ -1,20 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package gitutil
-
-import (
-	"testing"
-
-	"github.com/docker/buildx/util/osutil"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSanitizePathUnix(t *testing.T) {
-	assert.Equal(t, "/home/foobar", osutil.SanitizePath("/home/foobar"))
-}
-
-func TestSanitizePathWSL(t *testing.T) {
-	t.Setenv("WSL_DISTRO_NAME", "Ubuntu")
-	assert.Equal(t, "/mnt/c/Users/foobar", osutil.SanitizePath("C:\\Users\\foobar"))
-}

util/gitutil/path_windows_test.go

@@ -1,29 +0,0 @@
-package gitutil
-
-import (
-	"os"
-	"testing"
-
-	"github.com/docker/buildx/util/osutil"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSanitizePathWindows(t *testing.T) {
-	expected := "C:\\Users\\foobar"
-	if isGitBash() {
-		expected = "C:/Users/foobar"
-	}
-	assert.Equal(t, expected, osutil.SanitizePath("C:/Users/foobar"))
-}
-
-func isGitBash() bool {
-	// The MSYSTEM environment variable is used in MSYS2 environments,
-	// including Git Bash, to select the active environment. This variable
-	// dictates the environment in which the shell operates, influencing
-	// factors like the path prefixes, default compilers, and system libraries
-	// used: https://www.msys2.org/docs/environments/
-	if _, ok := os.LookupEnv("MSYSTEM"); ok {
-		return true
-	}
-	return false
-}

util/gitutil/testutil.go

@@ -52,15 +52,6 @@ func GitSetRemote(c *Git, tb testing.TB, name string, url string) {
 	require.NoError(tb, err)
 }
 
-func GitSetMainUpstream(c *Git, tb testing.TB, remote, target string) {
-	tb.Helper()
-	_, err := fakeGit(c, "fetch", "--depth", "1", remote, target)
-	require.NoError(tb, err)
-
-	_, err = fakeGit(c, "branch", "--set-upstream-to", remote+"/"+target, "main")
-	require.NoError(tb, err)
-}
-
 func Mktmp(tb testing.TB) string {
 	tb.Helper()
 	folder := tb.TempDir()

util/imagetools/create.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"maps"
 	"net/url"
 	"strings"
 
@@ -231,17 +230,13 @@ func (r *Resolver) Copy(ctx context.Context, src *Source, dest reference.Named)
 	if err != nil {
 		return err
 	}
-
-	desc := src.Desc
-	desc.Annotations = maps.Clone(desc.Annotations)
-	if desc.Annotations == nil {
-		desc.Annotations = make(map[string]string)
-	}
-
 	source, repo := u.Hostname(), strings.TrimPrefix(u.Path, "/")
-	desc.Annotations["containerd.io/distribution.source."+source] = repo
+	if src.Desc.Annotations == nil {
+		src.Desc.Annotations = make(map[string]string)
+	}
+	src.Desc.Annotations["containerd.io/distribution.source."+source] = repo
 
-	err = contentutil.CopyChain(ctx, contentutil.FromPusher(p), contentutil.FromFetcher(f), desc)
+	err = contentutil.CopyChain(ctx, contentutil.FromPusher(p), contentutil.FromFetcher(f), src.Desc)
 	if err != nil {
 		return err
 	}

util/imagetools/loader.go

@@ -4,9 +4,7 @@ package imagetools
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/json"
-	"regexp"
 	"sort"
 	"strings"
 	"sync"
@@ -23,12 +21,6 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-const (
-	inTotoGenericMime        = "application/vnd.in-toto+json"
-	inTotoSPDXDSSEMime       = "application/vnd.in-toto.spdx+dsse"
-	inTotoProvenanceDSSEMime = "application/vnd.in-toto.provenance+dsse"
-)
-
 var (
 	annotationReferences = []string{
 		"com.docker.reference.digest",
@@ -282,7 +274,7 @@ type sbomStub struct {
 }
 
 func (l *loader) scanSBOM(ctx context.Context, fetcher remotes.Fetcher, r *result, refs []digest.Digest, as *asset) error {
-	ctx = withIntotoMediaTypes(ctx)
+	ctx = remotes.WithMediaTypeKeyPrefix(ctx, "application/vnd.in-toto+json", "intoto")
 	as.deferredSbom = func() (*sbomStub, error) {
 		var sbom *sbomStub
 		for _, dgst := range refs {
@@ -291,8 +283,7 @@ func (l *loader) scanSBOM(ctx context.Context, fetcher remotes.Fetcher, r *resul
 				return nil, errors.Errorf("referenced image %s not found", dgst)
 			}
 			for _, layer := range mfst.manifest.Layers {
-				if (layer.MediaType == inTotoGenericMime || isInTotoDSSE(layer.MediaType)) &&
+				if layer.MediaType == "application/vnd.in-toto+json" && layer.Annotations["in-toto.io/predicate-type"] == "https://spdx.dev/Document" {
-					layer.Annotations["in-toto.io/predicate-type"] == "https://spdx.dev/Document" {
 					_, err := remotes.FetchHandler(l.cache, fetcher)(ctx, layer)
 					if err != nil {
 						return nil, err
@@ -301,12 +292,6 @@ func (l *loader) scanSBOM(ctx context.Context, fetcher remotes.Fetcher, r *resul
 					if err != nil {
 						return nil, err
 					}
-
-					dt, err = decodeDSSE(dt, layer.MediaType)
-					if err != nil {
-						return nil, err
-					}
-
 					var spdx struct {
 						Predicate interface{} `json:"predicate"`
 					}
@@ -333,7 +318,7 @@ type provenanceStub struct {
 }
 
 func (l *loader) scanProvenance(ctx context.Context, fetcher remotes.Fetcher, r *result, refs []digest.Digest, as *asset) error {
-	ctx = withIntotoMediaTypes(ctx)
+	ctx = remotes.WithMediaTypeKeyPrefix(ctx, "application/vnd.in-toto+json", "intoto")
 	as.deferredProvenance = func() (*provenanceStub, error) {
 		var provenance *provenanceStub
 		for _, dgst := range refs {
@@ -342,8 +327,7 @@ func (l *loader) scanProvenance(ctx context.Context, fetcher remotes.Fetcher, r
 				return nil, errors.Errorf("referenced image %s not found", dgst)
 			}
 			for _, layer := range mfst.manifest.Layers {
-				if (layer.MediaType == inTotoGenericMime || isInTotoDSSE(layer.MediaType)) &&
+				if layer.MediaType == "application/vnd.in-toto+json" && strings.HasPrefix(layer.Annotations["in-toto.io/predicate-type"], "https://slsa.dev/provenance/") {
-					strings.HasPrefix(layer.Annotations["in-toto.io/predicate-type"], "https://slsa.dev/provenance/") {
 					_, err := remotes.FetchHandler(l.cache, fetcher)(ctx, layer)
 					if err != nil {
 						return nil, err
@@ -352,12 +336,6 @@ func (l *loader) scanProvenance(ctx context.Context, fetcher remotes.Fetcher, r
 					if err != nil {
 						return nil, err
 					}
-
-					dt, err = decodeDSSE(dt, layer.MediaType)
-					if err != nil {
-						return nil, err
-					}
-
 					var slsa struct {
 						Predicate interface{} `json:"predicate"`
 					}
@@ -437,36 +415,3 @@ func (r *result) SBOM() (map[string]sbomStub, error) {
 	}
 	return res, nil
 }
-
-func isInTotoDSSE(mime string) bool {
-	isDSSE, _ := regexp.MatchString("application/vnd\\.in-toto\\..*\\+dsse", mime)
-
-	return isDSSE
-}
-
-func decodeDSSE(dt []byte, mime string) ([]byte, error) {
-	if isInTotoDSSE(mime) {
-		var dsse struct {
-			Payload string `json:"payload"`
-		}
-		if err := json.Unmarshal(dt, &dsse); err != nil {
-			return nil, err
-		}
-
-		decoded, err := base64.StdEncoding.DecodeString(dsse.Payload)
-		if err != nil {
-			return nil, err
-		}
-
-		dt = decoded
-	}
-
-	return dt, nil
-}
-
-func withIntotoMediaTypes(ctx context.Context) context.Context {
-	for _, mime := range []string{inTotoGenericMime, inTotoSPDXDSSEMime, inTotoProvenanceDSSEMime} {
-		ctx = remotes.WithMediaTypeKeyPrefix(ctx, mime, "intoto")
-	}
-	return ctx
-}