Merge pull request #22643 from crazy-max/buildx-0.24.0-rc1

Update buildx reference to v0.24.0-rc1

Author: crazy-max

_vendor/modules.txt

@@ -1,5 +1,5 @@
 # github.com/moby/moby v28.1.0-rc.2+incompatible
-# github.com/moby/buildkit v0.21.1
+# github.com/moby/buildkit v0.22.0-rc1
 # github.com/docker/buildx v0.23.0
 # github.com/docker/cli v28.1.1+incompatible
 # github.com/docker/compose/v2 v2.36.0

data/buildx/docker_buildx_build.yaml

@@ -187,16 +187,6 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
-    - option: detach
-      value_type: bool
-      default_value: "false"
-      description: Detach buildx server (supported only on linux)
-      deprecated: false
-      hidden: false
-      experimental: false
-      experimentalcli: true
-      kubernetes: false
-      swarm: false
     - option: file
       shorthand: f
       value_type: string
@@ -415,15 +405,6 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
-    - option: root
-      value_type: string
-      description: Specify root directory of server to connect
-      deprecated: false
-      hidden: false
-      experimental: false
-      experimentalcli: true
-      kubernetes: false
-      swarm: false
     - option: sbom
       value_type: string
       description: Shorthand for `--attest=type=sbom`
@@ -456,16 +437,6 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
-    - option: server-config
-      value_type: string
-      description: |
-        Specify buildx server config file (used only when launching new server)
-      deprecated: false
-      hidden: false
-      experimental: false
-      experimentalcli: true
-      kubernetes: false
-      swarm: false
     - option: shm-size
       value_type: bytes
       default_value: "0"

data/buildx/docker_buildx_debug.yaml

@@ -9,16 +9,6 @@ cname:
 clink:
     - docker_buildx_debug_build.yaml
 options:
-    - option: detach
-      value_type: bool
-      default_value: "true"
-      description: Detach buildx server for the monitor (supported only on linux)
-      deprecated: false
-      hidden: false
-      experimental: false
-      experimentalcli: true
-      kubernetes: false
-      swarm: false
     - option: invoke
       value_type: string
       description: Launch a monitor with executing specified command
@@ -49,25 +39,6 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
-    - option: root
-      value_type: string
-      description: Specify root directory of server to connect for the monitor
-      deprecated: false
-      hidden: false
-      experimental: false
-      experimentalcli: true
-      kubernetes: false
-      swarm: false
-    - option: server-config
-      value_type: string
-      description: |
-        Specify buildx server config file for the monitor (used only when launching new server)
-      deprecated: false
-      hidden: false
-      experimental: false
-      experimentalcli: true
-      kubernetes: false
-      swarm: false
 inherited_options:
     - option: builder
       value_type: string

data/buildx/docker_buildx_debug_build.yaml

@@ -176,16 +176,6 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
-    - option: detach
-      value_type: bool
-      default_value: "false"
-      description: Detach buildx server (supported only on linux)
-      deprecated: false
-      hidden: false
-      experimental: false
-      experimentalcli: true
-      kubernetes: false
-      swarm: false
     - option: file
       shorthand: f
       value_type: string
@@ -394,15 +384,6 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
-    - option: root
-      value_type: string
-      description: Specify root directory of server to connect
-      deprecated: false
-      hidden: false
-      experimental: false
-      experimentalcli: true
-      kubernetes: false
-      swarm: false
     - option: sbom
       value_type: string
       description: Shorthand for `--attest=type=sbom`
@@ -433,16 +414,6 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
-    - option: server-config
-      value_type: string
-      description: |
-        Specify buildx server config file (used only when launching new server)
-      deprecated: false
-      hidden: false
-      experimental: false
-      experimentalcli: true
-      kubernetes: false
-      swarm: false
     - option: shm-size
       value_type: bytes
       default_value: "0"

data/buildx/docker_buildx_dial-stdio.yaml

@@ -1,8 +1,10 @@
 command: docker buildx dial-stdio
 short: Proxy current stdio streams to builder instance
 long: |-
-    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.
+    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.
 usage: docker buildx dial-stdio
 pname: docker buildx
 plink: docker_buildx.yaml
@@ -50,7 +52,7 @@ inherited_options:
       swarm: false
 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.
+    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) {

data/buildx/docker_buildx_history_export.yaml

@@ -1,14 +1,29 @@
 command: docker buildx history export
-short: Export a build into Docker Desktop bundle
-long: Export a build into Docker Desktop bundle
-usage: docker buildx history export [OPTIONS] [REF]
+short: Export build records into Docker Desktop bundle
+long: |-
+    Export one or more build records to `.dockerbuild` archive files. These archives
+    contain metadata, logs, and build outputs, and can be imported into Docker
+    Desktop or shared across environments.
+usage: docker buildx history export [OPTIONS] [REF...]
 pname: docker buildx history
 plink: docker_buildx_history.yaml
 options:
     - option: all
       value_type: bool
       default_value: "false"
-      description: Export all records for the builder
+      description: Export all build records for the builder
+      details_url: '#all'
+      deprecated: false
+      hidden: false
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
+    - option: finalize
+      value_type: bool
+      default_value: "false"
+      description: Ensure build records are finalized before exporting
+      details_url: '#finalize'
       deprecated: false
       hidden: false
       experimental: false
@@ -19,6 +34,7 @@ options:
       shorthand: o
       value_type: string
       description: Output file path
+      details_url: '#output'
       deprecated: false
       hidden: false
       experimental: false
@@ -29,6 +45,7 @@ inherited_options:
     - option: builder
       value_type: string
       description: Override the configured builder instance
+      details_url: '#builder'
       deprecated: false
       hidden: false
       experimental: false
@@ -40,12 +57,78 @@ inherited_options:
       value_type: bool
       default_value: "false"
       description: Enable debug logging
+      details_url: '#debug'
       deprecated: false
       hidden: false
       experimental: false
       experimentalcli: false
       kubernetes: false
       swarm: false
+examples: |-
+    ### Export all build records to a file (--all) {#all}
+
+    Use the `--all` flag and redirect the output:
+
+    ```console
+    docker buildx history export --all > all-builds.dockerbuild
+    ```
+
+    Or use the `--output` flag:
+
+    ```console
+    docker buildx history export --all -o all-builds.dockerbuild
+    ```
+
+    ### Use a specific builder instance (--builder) {#builder}
+
+    ```console
+    docker buildx history export --builder builder0 ^1 -o builder0-build.dockerbuild
+    ```
+
+    ### Enable debug logging (--debug) {#debug}
+
+    ```console
+    docker buildx history export --debug qu2gsuo8ejqrwdfii23xkkckt -o debug-build.dockerbuild
+    ```
+
+    ### Ensure build records are finalized before exporting (--finalize) {#finalize}
+
+    Clients can report their own traces concurrently, and not all traces may be
+    saved yet by the time of the export. Use the `--finalize` flag to ensure all
+    traces are finalized before exporting.
+
+    ```console
+    docker buildx history export --finalize qu2gsuo8ejqrwdfii23xkkckt -o finalized-build.dockerbuild
+    ```
+
+    ### Export a single build to a custom file (--output) {#output}
+
+    ```console
+    docker buildx history export qu2gsuo8ejqrwdfii23xkkckt --output mybuild.dockerbuild
+    ```
+
+    You can find build IDs by running:
+
+    ```console
+    docker buildx history ls
+    ```
+
+    To export two builds to separate files:
+
+    ```console
+    # Using build IDs
+    docker buildx history export qu2gsuo8ejqrwdfii23xkkckt qsiifiuf1ad9pa9qvppc0z1l3 -o multi.dockerbuild
+
+    # Or using relative offsets
+    docker buildx history export ^1 ^2 -o multi.dockerbuild
+    ```
+
+    Or use shell redirection:
+
+    ```console
+    docker buildx history export ^1 > mybuild.dockerbuild
+    docker buildx history export ^2 > backend-build.dockerbuild
+    ```
 deprecated: false
 hidden: false
 experimental: false

data/buildx/docker_buildx_history_import.yaml

@@ -1,7 +1,10 @@
 command: docker buildx history import
-short: Import a build into Docker Desktop
-long: Import a build into Docker Desktop
-usage: docker buildx history import [OPTIONS] < bundle.dockerbuild
+short: Import build records into Docker Desktop
+long: |-
+    Import a build record from a `.dockerbuild` archive into Docker Desktop. This
+    lets you view, inspect, and analyze builds created in other environments or CI
+    pipelines.
+usage: docker buildx history import [OPTIONS] -
 pname: docker buildx history
 plink: docker_buildx_history.yaml
 options:
@@ -10,6 +13,7 @@ options:
       value_type: stringArray
       default_value: '[]'
       description: Import from a file path
+      details_url: '#file'
       deprecated: false
       hidden: false
       experimental: false
@@ -37,6 +41,30 @@ inherited_options:
       experimentalcli: false
       kubernetes: false
       swarm: false
+examples: |-
+    ### Import a `.dockerbuild` archive from standard input
+
+    ```console
+    docker buildx history import < mybuild.dockerbuild
+    ```
+
+    ### Import a build archive from a file (--file) {#file}
+
+    ```console
+    docker buildx history import --file ./artifacts/backend-build.dockerbuild
+    ```
+
+    ### Open a build manually
+
+    By default, the `import` command automatically opens the imported build in Docker
+    Desktop. You don't need to run `open` unless you're opening a specific build
+    or re-opening it later.
+
+    If you've imported multiple builds, you can open one manually:
+
+    ```console
+    docker buildx history open ci-build
+    ```
 deprecated: false
 hidden: false
 experimental: false