Merge pull request #1501 from tonistiigi/v0.10-picks

[v0.10] cherry-picks

.github/workflows/build.yml

@@ -21,8 +21,8 @@ on:
       - 'docs/**'
 
 env:
-  BUILDX_VERSION: "v0.10.0-rc1"
+  BUILDX_VERSION: "v0.10.0-rc3"
-  BUILDKIT_IMAGE: "moby/buildkit:v0.11.0-rc3"
+  BUILDKIT_IMAGE: "moby/buildkit:v0.11.0"
   REPO_SLUG: "docker/buildx-bin"
   DESTDIR: "./bin"
 

Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile-upstream:master
+# syntax=docker/dockerfile-upstream:1.5.0
 
 ARG GO_VERSION=1.19
 ARG XX_VERSION=1.1.2

commands/build.go

@@ -470,7 +470,7 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	flags := cmd.Flags()
 
 	flags.StringSliceVar(&options.extraHosts, "add-host", []string{}, `Add a custom host-to-IP mapping (format: "host:ip")`)
-	flags.SetAnnotation("add-host", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#add-entries-to-container-hosts-file---add-host"})
+	flags.SetAnnotation("add-host", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#add-host"})
 
 	flags.StringSliceVar(&options.allow, "allow", []string{}, `Allow extra privileged entitlement (e.g., "network.host", "security.insecure")`)
 
@@ -481,12 +481,12 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	flags.StringArrayVar(&options.cacheTo, "cache-to", []string{}, `Cache export destinations (e.g., "user/app:cache", "type=local,dest=path/to/dir")`)
 
 	flags.StringVar(&options.cgroupParent, "cgroup-parent", "", "Optional parent cgroup for the container")
-	flags.SetAnnotation("cgroup-parent", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#use-a-custom-parent-cgroup---cgroup-parent"})
+	flags.SetAnnotation("cgroup-parent", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#cgroup-parent"})
 
 	flags.StringArrayVar(&options.contexts, "build-context", []string{}, "Additional build contexts (e.g., name=path)")
 
 	flags.StringVarP(&options.dockerfileName, "file", "f", "", `Name of the Dockerfile (default: "PATH/Dockerfile")`)
-	flags.SetAnnotation("file", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#specify-a-dockerfile--f"})
+	flags.SetAnnotation("file", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#file"})
 
 	flags.StringVar(&options.imageIDFile, "iidfile", "", "Write the image ID to the file")
 
@@ -517,10 +517,10 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	flags.StringArrayVar(&options.ssh, "ssh", []string{}, `SSH agent socket or keys to expose to the build (format: "default|<id>[=<socket>|<key>[,<key>]]")`)
 
 	flags.StringArrayVarP(&options.tags, "tag", "t", []string{}, `Name and optionally a tag (format: "name:tag")`)
-	flags.SetAnnotation("tag", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#tag-an-image--t"})
+	flags.SetAnnotation("tag", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#tag"})
 
 	flags.StringVar(&options.target, "target", "", "Set the target build stage to build")
-	flags.SetAnnotation("target", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#specifying-target-build-stage---target"})
+	flags.SetAnnotation("target", annotation.ExternalURL, []string{"https://docs.docker.com/engine/reference/commandline/build/#target"})
 
 	flags.Var(options.ulimits, "ulimit", "Ulimit options")
 

docs/reference/buildx.md

@@ -9,29 +9,29 @@ 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              |
-| [`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           |
-| [`install`](buildx_install.md) | Install buildx as a 'docker builder' alias |
+| [`install`](buildx_install.md)       | Install buildx as a 'docker builder' alias |
-| [`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 a builder instance                  |
-| [`stop`](buildx_stop.md) | Stop builder instance |
+| [`stop`](buildx_stop.md)             | Stop builder instance                      |
-| [`uninstall`](buildx_uninstall.md) | Uninstall the 'docker builder' alias |
+| [`uninstall`](buildx_uninstall.md)   | Uninstall the 'docker builder' alias       |
-| [`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
 
-| Name | Type | Default | Description |
+| Name                    | Type     | Default | Description                              |
-| --- | --- | --- | --- |
+|:------------------------|:---------|:--------|:-----------------------------------------|
-| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`--builder`](#builder) | `string` |         | Override the configured builder instance |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_bake.md

@@ -13,20 +13,20 @@ Build from a file
 
 ### Options
 
-| Name | Type | Default | Description |
+| Name                             | Type          | Default | Description                                                                              |
-| --- | --- | --- | --- |
+|:---------------------------------|:--------------|:--------|:-----------------------------------------------------------------------------------------|
-| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`--builder`](#builder)          | `string`      |         | Override the configured builder instance                                                 |
-| [`-f`](#file), [`--file`](#file) | `stringArray` |  | Build definition file |
+| [`-f`](#file), [`--file`](#file) | `stringArray` |         | Build definition file                                                                    |
-| `--load` |  |  | Shorthand for `--set=*.output=type=docker` |
+| `--load`                         |               |         | Shorthand for `--set=*.output=type=docker`                                               |
-| `--metadata-file` | `string` |  | Write build result metadata to the file |
+| `--metadata-file`                | `string`      |         | Write build result metadata to the file                                                  |
-| [`--no-cache`](#no-cache) |  |  | Do not use cache when building the image |
+| [`--no-cache`](#no-cache)        |               |         | Do not use cache when building the image                                                 |
-| [`--print`](#print) |  |  | Print the options without building |
+| [`--print`](#print)              |               |         | Print the options without building                                                       |
-| [`--progress`](#progress) | `string` | `auto` | Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output |
+| [`--progress`](#progress)        | `string`      | `auto`  | Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output |
-| `--provenance` | `string` |  | Shorthand for `--set=*.attest=type=provenance` |
+| `--provenance`                   | `string`      |         | Shorthand for `--set=*.attest=type=provenance`                                           |
-| [`--pull`](#pull) |  |  | Always attempt to pull all referenced images |
+| [`--pull`](#pull)                |               |         | Always attempt to pull all referenced images                                             |
-| `--push` |  |  | Shorthand for `--set=*.output=type=registry` |
+| `--push`                         |               |         | Shorthand for `--set=*.output=type=registry`                                             |
-| `--sbom` | `string` |  | Shorthand for `--set=*.attest=type=sbom` |
+| `--sbom`                         | `string`      |         | Shorthand for `--set=*.attest=type=sbom`                                                 |
-| [`--set`](#set) | `stringArray` |  | Override target value (e.g., `targetpattern.key=value`) |
+| [`--set`](#set)                  | `stringArray` |         | Override target value (e.g., `targetpattern.key=value`)                                  |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_build.md

@@ -13,41 +13,41 @@ Start a build
 
 ### Options
 
-| Name | Type | Default | Description |
+| Name                                                                                                                                                   | Type          | Default   | Description                                                                                         |
-| --- | --- | --- | --- |
+|:-------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------|:----------|:----------------------------------------------------------------------------------------------------|
-| [`--add-host`](https://docs.docker.com/engine/reference/commandline/build/#add-entries-to-container-hosts-file---add-host) | `stringSlice` |  | Add a custom host-to-IP mapping (format: `host:ip`) |
+| [`--add-host`](https://docs.docker.com/engine/reference/commandline/build/#add-host)                                                                   | `stringSlice` |           | Add a custom host-to-IP mapping (format: `host:ip`)                                                 |
-| [`--allow`](#allow) | `stringSlice` |  | Allow extra privileged entitlement (e.g., `network.host`, `security.insecure`) |
+| [`--allow`](#allow)                                                                                                                                    | `stringSlice` |           | Allow extra privileged entitlement (e.g., `network.host`, `security.insecure`)                      |
-| `--attest` | `stringArray` |  | Attestation parameters (format: `type=sbom,generator=image`) |
+| `--attest`                                                                                                                                             | `stringArray` |           | Attestation parameters (format: `type=sbom,generator=image`)                                        |
-| [`--build-arg`](#build-arg) | `stringArray` |  | Set build-time variables |
+| [`--build-arg`](#build-arg)                                                                                                                            | `stringArray` |           | Set build-time variables                                                                            |
-| [`--build-context`](#build-context) | `stringArray` |  | Additional build contexts (e.g., name=path) |
+| [`--build-context`](#build-context)                                                                                                                    | `stringArray` |           | Additional build contexts (e.g., name=path)                                                         |
-| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`--builder`](#builder)                                                                                                                                | `string`      |           | Override the configured builder instance                                                            |
-| [`--cache-from`](#cache-from) | `stringArray` |  | External cache sources (e.g., `user/app:cache`, `type=local,src=path/to/dir`) |
+| [`--cache-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`) |
+| [`--cache-to`](#cache-to)                                                                                                                              | `stringArray` |           | Cache export destinations (e.g., `user/app:cache`, `type=local,dest=path/to/dir`)                   |
-| [`--cgroup-parent`](https://docs.docker.com/engine/reference/commandline/build/#use-a-custom-parent-cgroup---cgroup-parent) | `string` |  | Optional parent cgroup for the container |
+| [`--cgroup-parent`](https://docs.docker.com/engine/reference/commandline/build/#cgroup-parent)                                                         | `string`      |           | Optional parent cgroup for the container                                                            |
-| [`-f`](https://docs.docker.com/engine/reference/commandline/build/#specify-a-dockerfile--f), [`--file`](https://docs.docker.com/engine/reference/commandline/build/#specify-a-dockerfile--f) | `string` |  | Name of the Dockerfile (default: `PATH/Dockerfile`) |
+| [`-f`](https://docs.docker.com/engine/reference/commandline/build/#file), [`--file`](https://docs.docker.com/engine/reference/commandline/build/#file) | `string`      |           | Name of the Dockerfile (default: `PATH/Dockerfile`)                                                 |
-| `--iidfile` | `string` |  | Write the image ID to the file |
+| `--iidfile`                                                                                                                                            | `string`      |           | Write the image ID to the file                                                                      |
-| `--invoke` | `string` |  | Invoke a command after the build [experimental] |
+| `--invoke`                                                                                                                                             | `string`      |           | Invoke a command after the build [experimental]                                                     |
-| `--label` | `stringArray` |  | Set metadata for an image |
+| `--label`                                                                                                                                              | `stringArray` |           | Set metadata for an image                                                                           |
-| [`--load`](#load) |  |  | Shorthand for `--output=type=docker` |
+| [`--load`](#load)                                                                                                                                      |               |           | Shorthand for `--output=type=docker`                                                                |
-| [`--metadata-file`](#metadata-file) | `string` |  | Write build result metadata to the file |
+| [`--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 |
+| `--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`                                                                                                                                           |               |           | Do not use cache when building the image                                                            |
-| `--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`) |
+| [`-o`](#output), [`--output`](#output)                                                                                                                 | `stringArray` |           | Output destination (format: `type=local,dest=path`)                                                 |
-| [`--platform`](#platform) | `stringArray` |  | Set target platform for build |
+| [`--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) [experimental]                         |
-| [`--progress`](#progress) | `string` | `auto` | Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output |
+| [`--progress`](#progress)                                                                                                                              | `string`      | `auto`    | Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output            |
-| `--provenance` | `string` |  | Shortand for `--attest=type=provenance` |
+| `--provenance`                                                                                                                                         | `string`      |           | Shortand for `--attest=type=provenance`                                                             |
-| `--pull` |  |  | Always attempt to pull all referenced images |
+| `--pull`                                                                                                                                               |               |           | Always attempt to pull all referenced images                                                        |
-| [`--push`](#push) |  |  | Shorthand for `--output=type=registry` |
+| [`--push`](#push)                                                                                                                                      |               |           | Shorthand for `--output=type=registry`                                                              |
-| `-q`, `--quiet` |  |  | Suppress the build output and print image ID on success |
+| `-q`, `--quiet`                                                                                                                                        |               |           | Suppress the build output and print image ID on success                                             |
-| `--sbom` | `string` |  | Shorthand for `--attest=type=sbom` |
+| `--sbom`                                                                                                                                               | `string`      |           | Shorthand for `--attest=type=sbom`                                                                  |
-| [`--secret`](#secret) | `stringArray` |  | Secret to expose to the build (format: `id=mysecret[,src=/local/secret]`) |
+| [`--secret`](#secret)                                                                                                                                  | `stringArray` |           | Secret to expose to the build (format: `id=mysecret[,src=/local/secret]`)                           |
-| [`--shm-size`](#shm-size) | `bytes` | `0` | Size of `/dev/shm` |
+| [`--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>]]`) |
+| [`--ssh`](#ssh)                                                                                                                                        | `stringArray` |           | SSH agent socket or keys to expose to the build (format: `default\|<id>[=<socket>\|<key>[,<key>]]`) |
-| [`-t`](https://docs.docker.com/engine/reference/commandline/build/#tag-an-image--t), [`--tag`](https://docs.docker.com/engine/reference/commandline/build/#tag-an-image--t) | `stringArray` |  | Name and optionally a tag (format: `name:tag`) |
+| [`-t`](https://docs.docker.com/engine/reference/commandline/build/#tag), [`--tag`](https://docs.docker.com/engine/reference/commandline/build/#tag)    | `stringArray` |           | Name and optionally a tag (format: `name:tag`)                                                      |
-| [`--target`](https://docs.docker.com/engine/reference/commandline/build/#specifying-target-build-stage---target) | `string` |  | Set the target build stage to build |
+| [`--target`](https://docs.docker.com/engine/reference/commandline/build/#target)                                                                       | `string`      |           | Set the target build stage to build                                                                 |
-| [`--ulimit`](#ulimit) | `ulimit` |  | Ulimit options |
+| [`--ulimit`](#ulimit)                                                                                                                                  | `ulimit`      |           | Ulimit options                                                                                      |
 
 
 <!---MARKER_GEN_END-->
@@ -90,7 +90,7 @@ $ docker buildx build --allow security.insecure .
 
 ### <a name="build-arg"></a> Set build-time variables (--build-arg)
 
-Same as [`docker build` command](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg).
+Same as [`docker build` command](https://docs.docker.com/engine/reference/commandline/build/#build-arg).
 
 There are also useful built-in build args like:
 

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-flags`](#buildkitd-flags) | `string` |  | Flags for buildkitd daemon |
+| [`--buildkitd-flags`](#buildkitd-flags) | `string`      |         | Flags for buildkitd daemon                                            |
-| [`--config`](#config) | `string` |  | BuildKit config file |
+| [`--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-->

docs/reference/buildx_du.md

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

docs/reference/buildx_imagetools.md

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

docs/reference/buildx_imagetools_create.md

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

docs/reference/buildx_imagetools_inspect.md

@@ -9,11 +9,11 @@ Show details of an image in the registry
 
 ### Options
 
-| Name | Type | Default | Description |
+| Name                    | Type     | Default         | Description                                   |
-| --- | --- | --- | --- |
+|:------------------------|:---------|:----------------|:----------------------------------------------|
-| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`--builder`](#builder) | `string` |                 | Override the configured builder instance      |
-| [`--format`](#format) | `string` | `{{.Manifest}}` | Format the output using the given Go template |
+| [`--format`](#format)   | `string` | `{{.Manifest}}` | Format the output using the given Go template |
-| [`--raw`](#raw) |  |  | Show original, unformatted JSON manifest |
+| [`--raw`](#raw)         |          |                 | Show original, unformatted JSON manifest      |
 
 
 <!---MARKER_GEN_END-->
@@ -287,69 +287,57 @@ $ docker buildx imagetools inspect moby/buildkit:master --format "{{json .Manife
 Following command provides [SLSA](https://github.com/moby/buildkit/blob/master/docs/attestations/slsa-provenance.md) JSON output:
 
 ```console
-$ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .SLSA}}"
+$ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .Provenance}}"
 ```
 ```json
 {
-  "Provenance": {
+  "SLSA": {
-    "_type": "https://in-toto.io/Statement/v0.1",
+    "builder": {
-    "predicateType": "https://slsa.dev/provenance/v0.2",
+      "id": ""
-    "subject": [
+    },
+    "buildType": "https://mobyproject.org/buildkit@v1",
+    "materials": [
       {
-        "name": "pkg:docker/crazymax/buildkit@attest?platform=linux%2Famd64",
+        "uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
         "digest": {
-          "sha256": "fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55"
+          "sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
+        }
+      },
+      {
+        "uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
+        "digest": {
+          "sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
         }
       }
     ],
-    "predicate": {
+    "invocation": {
-      "builder": {
+      "configSource": {},
-        "id": ""
+      "parameters": {
-      },
+        "frontend": "dockerfile.v0",
-      "buildType": "https://mobyproject.org/buildkit@v1",
+        "locals": [
-      "materials": [
+          {
-        {
+            "name": "context"
-          "uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
+          },
-          "digest": {
+          {
-            "sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
+            "name": "dockerfile"
           }
-        },
+        ]
-        {
-          "uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
-          "digest": {
-            "sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
-          }
-        }
-      ],
-      "invocation": {
-        "configSource": {},
-        "parameters": {
-          "frontend": "dockerfile.v0",
-          "locals": [
-            {
-              "name": "context"
-            },
-            {
-              "name": "dockerfile"
-            }
-          ]
-        },
-        "environment": {
-          "platform": "linux/amd64"
-        }
       },
-      "metadata": {
+      "environment": {
-        "buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
+        "platform": "linux/amd64"
-        "buildStartedOn": "2022-12-01T11:50:07.264704131Z",
-        "buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
-        "reproducible": false,
-        "completeness": {
-          "parameters": true,
-          "environment": true,
-          "materials": false
-        },
-        "https://mobyproject.org/buildkit@v1#metadata": {}
       }
+    },
+    "metadata": {
+      "buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
+      "buildStartedOn": "2022-12-01T11:50:07.264704131Z",
+      "buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
+      "reproducible": false,
+      "completeness": {
+        "parameters": true,
+        "environment": true,
+        "materials": false
+      },
+      "https://mobyproject.org/buildkit@v1#metadata": {}
     }
   }
 }
@@ -363,32 +351,20 @@ $ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .SB
 ```json
 {
   "SPDX": {
-    "_type": "https://in-toto.io/Statement/v0.1",
+    "SPDXID": "SPDXRef-DOCUMENT",
-    "predicateType": "https://spdx.dev/Document",
+    "creationInfo": {
-    "subject": [
+      "created": "2022-12-01T11:46:48.063400162Z",
-      {
+      "creators": [
-        "name": "pkg:docker/crazymax/buildkit@attest?platform=linux%2Famd64",
+        "Tool: syft-v0.60.3",
-        "digest": {
+        "Tool: buildkit-1ace2bb",
-          "sha256": "fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55"
+        "Organization: Anchore, Inc"
-        }
+      ],
-      }
+      "licenseListVersion": "3.18"
-    ],
+    },
-    "predicate": {
+    "dataLicense": "CC0-1.0",
-      "SPDXID": "SPDXRef-DOCUMENT",
+    "documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
-      "creationInfo": {
+    "files": [...],
-        "created": "2022-12-01T11:46:48.063400162Z",
+    "spdxVersion": "SPDX-2.2"
-        "creators": [
-          "Tool: syft-v0.60.3",
-          "Tool: buildkit-1ace2bb",
-          "Organization: Anchore, Inc"
-        ],
-        "licenseListVersion": "3.18"
-      },
-      "dataLicense": "CC0-1.0",
-      "documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
-      "files": [...],
-      "spdxVersion": "SPDX-2.2"
-    }
   }
 }
 ```
@@ -465,97 +441,73 @@ $ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .}}
       }
     ]
   },
-  "SLSA": {
+  "Provenance": {
-    "Provenance": {
+    "SLSA": {
-      "_type": "https://in-toto.io/Statement/v0.1",
+      "builder": {
-      "predicateType": "https://slsa.dev/provenance/v0.2",
+        "id": ""
-      "subject": [
+      },
+      "buildType": "https://mobyproject.org/buildkit@v1",
+      "materials": [
         {
-          "name": "pkg:docker/crazymax/buildkit@attest?platform=linux%2Famd64",
+          "uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
           "digest": {
-            "sha256": "fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55"
+            "sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
+          }
+        },
+        {
+          "uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
+          "digest": {
+            "sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
           }
         }
       ],
-      "predicate": {
+      "invocation": {
-        "builder": {
+        "configSource": {},
-          "id": ""
+        "parameters": {
-        },
+          "frontend": "dockerfile.v0",
-        "buildType": "https://mobyproject.org/buildkit@v1",
+          "locals": [
-        "materials": [
+            {
-          {
+              "name": "context"
-            "uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
+            },
-            "digest": {
+            {
-              "sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
+              "name": "dockerfile"
             }
-          },
+          ]
-          {
-            "uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
-            "digest": {
-              "sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
-            }
-          }
-        ],
-        "invocation": {
-          "configSource": {},
-          "parameters": {
-            "frontend": "dockerfile.v0",
-            "locals": [
-              {
-                "name": "context"
-              },
-              {
-                "name": "dockerfile"
-              }
-            ]
-          },
-          "environment": {
-            "platform": "linux/amd64"
-          }
         },
-        "metadata": {
+        "environment": {
-          "buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
+          "platform": "linux/amd64"
-          "buildStartedOn": "2022-12-01T11:50:07.264704131Z",
-          "buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
-          "reproducible": false,
-          "completeness": {
-            "parameters": true,
-            "environment": true,
-            "materials": false
-          },
-          "https://mobyproject.org/buildkit@v1#metadata": {}
         }
+      },
+      "metadata": {
+        "buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
+        "buildStartedOn": "2022-12-01T11:50:07.264704131Z",
+        "buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
+        "reproducible": false,
+        "completeness": {
+          "parameters": true,
+          "environment": true,
+          "materials": false
+        },
+        "https://mobyproject.org/buildkit@v1#metadata": {}
       }
     }
   },
   "SBOM": {
     "SPDX": {
-      "_type": "https://in-toto.io/Statement/v0.1",
+      "SPDXID": "SPDXRef-DOCUMENT",
-      "predicateType": "https://spdx.dev/Document",
+      "creationInfo": {
-      "subject": [
+        "created": "2022-12-01T11:46:48.063400162Z",
-        {
+        "creators": [
-          "name": "pkg:docker/crazymax/buildkit@attest?platform=linux%2Famd64",
+          "Tool: syft-v0.60.3",
-          "digest": {
+          "Tool: buildkit-1ace2bb",
-            "sha256": "fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55"
+          "Organization: Anchore, Inc"
-          }
+        ],
-        }
+        "licenseListVersion": "3.18"
-      ],
+      },
-      "predicate": {
+      "dataLicense": "CC0-1.0",
-        "SPDXID": "SPDXRef-DOCUMENT",
+      "documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
-        "creationInfo": {
+      "files": [...],
-          "created": "2022-12-01T11:46:48.063400162Z",
+      "spdxVersion": "SPDX-2.2"
-          "creators": [
-            "Tool: syft-v0.60.3",
-            "Tool: buildkit-1ace2bb",
-            "Organization: Anchore, Inc"
-          ],
-          "licenseListVersion": "3.18"
-        },
-        "dataLicense": "CC0-1.0",
-        "documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
-        "files": [...],
-        "spdxVersion": "SPDX-2.2"
-      }
     }
   }
 }

docs/reference/buildx_inspect.md

@@ -9,10 +9,10 @@ Inspect current builder instance
 
 ### Options
 
-| Name | Type | Default | Description |
+| Name                        | Type     | Default | Description                                 |
-| --- | --- | --- | --- |
+|:----------------------------|:---------|:--------|:--------------------------------------------|
-| [`--bootstrap`](#bootstrap) |  |  | Ensure builder has booted before inspecting |
+| [`--bootstrap`](#bootstrap) |          |         | Ensure builder has booted before inspecting |
-| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`--builder`](#builder)     | `string` |         | Override the configured builder instance    |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_prune.md

@@ -9,14 +9,14 @@ Remove build cache
 
 ### Options
 
-| Name | Type | Default | Description |
+| Name                    | Type     | Default | Description                               |
-| --- | --- | --- | --- |
+|:------------------------|:---------|:--------|:------------------------------------------|
-| `-a`, `--all` |  |  | Include internal/frontend images |
+| `-a`, `--all`           |          |         | Include internal/frontend images          |
-| [`--builder`](#builder) | `string` |  | Override the configured builder instance |
+| [`--builder`](#builder) | `string` |         | Override the configured builder instance  |
-| `--filter` | `filter` |  | Provide filter values (e.g., `until=24h`) |
+| `--filter`              | `filter` |         | Provide filter values (e.g., `until=24h`) |
-| `-f`, `--force` |  |  | Do not prompt for confirmation |
+| `-f`, `--force`         |          |         | Do not prompt for confirmation            |
-| `--keep-storage` | `bytes` | `0` | Amount of disk space to keep for cache |
+| `--keep-storage`        | `bytes`  | `0`     | Amount of disk space to keep for cache    |
-| `--verbose` |  |  | Provide a more verbose output |
+| `--verbose`             |          |         | Provide a more verbose output             |
 
 
 <!---MARKER_GEN_END-->

docs/reference/buildx_rm.md

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

docs/reference/buildx_stop.md

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

docs/reference/buildx_use.md

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

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/containerd/console v1.0.3
 	github.com/containerd/containerd v1.6.14
 	github.com/docker/cli v23.0.0-rc.1+incompatible
-	github.com/docker/cli-docs-tool v0.5.0
+	github.com/docker/cli-docs-tool v0.5.1
 	github.com/docker/distribution v2.8.1+incompatible
 	github.com/docker/docker v23.0.0-rc.1+incompatible
 	github.com/docker/go-units v0.5.0
@@ -16,7 +16,7 @@ require (
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840
 	github.com/hashicorp/hcl/v2 v2.8.2
-	github.com/moby/buildkit v0.11.0-rc4
+	github.com/moby/buildkit v0.11.0
 	github.com/moby/sys/mountinfo v0.6.2
 	github.com/morikuni/aec v1.0.0
 	github.com/opencontainers/go-digest v1.0.0

go.sum

@@ -165,8 +165,8 @@ github.com/distribution/distribution/v3 v3.0.0-20220725133111-4bf3547399eb h1:oC
 github.com/distribution/distribution/v3 v3.0.0-20220725133111-4bf3547399eb/go.mod h1:28YO/VJk9/64+sTGNuYaBjWxrXTPrj0C0XmgTIOjxX4=
 github.com/docker/cli v23.0.0-rc.1+incompatible h1:Vl3pcUK4/LFAD56Ys3BrqgAtuwpWd/IO3amuSL0ZbP0=
 github.com/docker/cli v23.0.0-rc.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli-docs-tool v0.5.0 h1:EjGwI6EyB7YemHCC7R8mwXszJTbuq0T0pFuDC5bMhcE=
+github.com/docker/cli-docs-tool v0.5.1 h1:jIk/cCZurZERhALPVKhqlNxTQGxn2kcI+56gE57PQXg=
-github.com/docker/cli-docs-tool v0.5.0/go.mod h1:zMjqTFCU361PRh8apiXzeAZ1Q/xupbIwTusYpzCXS/o=
+github.com/docker/cli-docs-tool v0.5.1/go.mod h1:zMjqTFCU361PRh8apiXzeAZ1Q/xupbIwTusYpzCXS/o=
 github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v23.0.0-rc.1+incompatible h1:Dmn88McWuHc7BSNN1s6RtfhMmt6ZPQAYUEf7FhqpiQI=
@@ -401,8 +401,8 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZX
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/moby/buildkit v0.11.0-rc4 h1:PxvzcqZn2IOrMzIS2nEqRQxk67xeSQnhdYxEj0YQuLM=
+github.com/moby/buildkit v0.11.0 h1:GqBC/ETDqwdu61g4tCxX1GFZuGWg/nuqFxamb2or1dw=
-github.com/moby/buildkit v0.11.0-rc4/go.mod h1:v43oa6H2Fx/cdzc7j0UlUu8p6188yy1P3vrujAs99uw=
+github.com/moby/buildkit v0.11.0/go.mod h1:v43oa6H2Fx/cdzc7j0UlUu8p6188yy1P3vrujAs99uw=
 github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=

util/imagetools/loader.go

@@ -46,9 +46,9 @@ type index struct {
 }
 
 type asset struct {
-	config *ocispec.Image
+	config     *ocispec.Image
-	sbom   *sbomStub
+	sbom       *sbomStub
-	slsa   *slsaStub
+	provenance *provenanceStub
 }
 
 type result struct {
@@ -255,7 +255,8 @@ func (l *loader) scanConfig(ctx context.Context, fetcher remotes.Fetcher, desc o
 }
 
 type sbomStub struct {
-	SPDX json.RawMessage `json:",omitempty"`
+	SPDX            interface{}   `json:",omitempty"`
+	AdditionalSPDXs []interface{} `json:",omitempty"`
 }
 
 func (l *loader) scanSBOM(ctx context.Context, fetcher remotes.Fetcher, r *result, refs []digest.Digest, as *asset) error {
@@ -275,8 +276,18 @@ func (l *loader) scanSBOM(ctx context.Context, fetcher remotes.Fetcher, r *resul
 				if err != nil {
 					return err
 				}
-				as.sbom = &sbomStub{
+				var spdx struct {
-					SPDX: dt,
+					Predicate interface{} `json:"predicate"`
+				}
+				if err := json.Unmarshal(dt, &spdx); err != nil {
+					return err
+				}
+
+				if as.sbom == nil {
+					as.sbom = &sbomStub{}
+					as.sbom.SPDX = spdx.Predicate
+				} else {
+					as.sbom.AdditionalSPDXs = append(as.sbom.AdditionalSPDXs, spdx.Predicate)
 				}
 			}
 		}
@@ -284,8 +295,8 @@ func (l *loader) scanSBOM(ctx context.Context, fetcher remotes.Fetcher, r *resul
 	return nil
 }
 
-type slsaStub struct {
+type provenanceStub struct {
-	Provenance json.RawMessage `json:",omitempty"`
+	SLSA interface{} `json:",omitempty"`
 }
 
 func (l *loader) scanProvenance(ctx context.Context, fetcher remotes.Fetcher, r *result, refs []digest.Digest, as *asset) error {
@@ -305,9 +316,16 @@ func (l *loader) scanProvenance(ctx context.Context, fetcher remotes.Fetcher, r
 				if err != nil {
 					return err
 				}
-				as.slsa = &slsaStub{
+				var slsa struct {
-					Provenance: dt,
+					Predicate interface{} `json:"predicate"`
 				}
+				if err := json.Unmarshal(dt, &slsa); err != nil {
+					return err
+				}
+				as.provenance = &provenanceStub{
+					SLSA: slsa.Predicate,
+				}
+				break
 			}
 		}
 	}
@@ -328,16 +346,16 @@ func (r *result) Configs() map[string]*ocispec.Image {
 	return res
 }
 
-func (r *result) SLSA() map[string]slsaStub {
+func (r *result) Provenance() map[string]provenanceStub {
 	if len(r.assets) == 0 {
 		return nil
 	}
-	res := make(map[string]slsaStub)
+	res := make(map[string]provenanceStub)
 	for p, a := range r.assets {
-		if a.slsa == nil {
+		if a.provenance == nil {
 			continue
 		}
-		res[p] = *a.slsa
+		res[p] = *a.provenance
 	}
 	return res
 }

util/imagetools/printers.go

@@ -99,7 +99,7 @@ func (p *Printer) Print(raw bool, out io.Writer) error {
 	}
 
 	imageconfigs := res.Configs()
-	slsas := res.SLSA()
+	provenances := res.Provenance()
 	sboms := res.SBOM()
 	format := tpl.Root.String()
 
@@ -143,43 +143,43 @@ func (p *Printer) Print(raw bool, out io.Writer) error {
 	default:
 		if len(res.platforms) > 1 {
 			return tpl.Execute(out, struct {
-				Name     string                     `json:"name,omitempty"`
+				Name       string                     `json:"name,omitempty"`
-				Manifest interface{}                `json:"manifest,omitempty"`
+				Manifest   interface{}                `json:"manifest,omitempty"`
-				Image    map[string]*ocispecs.Image `json:"image,omitempty"`
+				Image      map[string]*ocispecs.Image `json:"image,omitempty"`
-				SLSA     map[string]slsaStub        `json:"SLSA,omitempty"`
+				Provenance map[string]provenanceStub  `json:"Provenance,omitempty"`
-				SBOM     map[string]sbomStub        `json:"SBOM,omitempty"`
+				SBOM       map[string]sbomStub        `json:"SBOM,omitempty"`
 			}{
-				Name:     p.name,
+				Name:       p.name,
-				Manifest: mfst,
+				Manifest:   mfst,
-				Image:    imageconfigs,
+				Image:      imageconfigs,
-				SLSA:     slsas,
+				Provenance: provenances,
-				SBOM:     sboms,
+				SBOM:       sboms,
 			})
 		}
 		var ic *ocispecs.Image
 		for _, v := range imageconfigs {
 			ic = v
 		}
-		var slsa slsaStub
+		var provenance provenanceStub
-		for _, v := range slsas {
+		for _, v := range provenances {
-			slsa = v
+			provenance = v
 		}
 		var sbom sbomStub
 		for _, v := range sboms {
 			sbom = v
 		}
 		return tpl.Execute(out, struct {
-			Name     string          `json:"name,omitempty"`
+			Name       string          `json:"name,omitempty"`
-			Manifest interface{}     `json:"manifest,omitempty"`
+			Manifest   interface{}     `json:"manifest,omitempty"`
-			Image    *ocispecs.Image `json:"image,omitempty"`
+			Image      *ocispecs.Image `json:"image,omitempty"`
-			SLSA     slsaStub        `json:"SLSA,omitempty"`
+			Provenance provenanceStub  `json:"Provenance,omitempty"`
-			SBOM     sbomStub        `json:"SBOM,omitempty"`
+			SBOM       sbomStub        `json:"SBOM,omitempty"`
 		}{
-			Name:     p.name,
+			Name:       p.name,
-			Manifest: mfst,
+			Manifest:   mfst,
-			Image:    ic,
+			Image:      ic,
-			SLSA:     slsa,
+			Provenance: provenance,
-			SBOM:     sbom,
+			SBOM:       sbom,
 		})
 	}
 

vendor/github.com/docker/cli-docs-tool/README.md

@@ -1,5 +1,5 @@
 [![PkgGoDev](https://img.shields.io/badge/go.dev-docs-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/docker/cli-docs-tool)
-[![Test Status](https://img.shields.io/github/workflow/status/docker/cli-docs-tool/test?label=test&logo=github&style=flat-square)](https://github.com/docker/cli-docs-tool/actions?query=workflow%3Atest)
+[![Test Status](https://img.shields.io/github/actions/workflow/status/docker/cli-docs-tool/test.yml?branch=main&label=test&logo=github&style=flat-square)](https://github.com/docker/cli-docs-tool/actions?query=workflow%3Atest)
 [![Go Report Card](https://goreportcard.com/badge/github.com/docker/cli-docs-tool)](https://goreportcard.com/report/github.com/docker/cli-docs-tool)
 
 ## About

vendor/github.com/docker/cli-docs-tool/clidocstool_md.go

@@ -20,7 +20,9 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
+	"text/tabwriter"
 	"text/template"
 
 	"github.com/docker/cli-docs-tool/annotation"
@@ -28,6 +30,11 @@ import (
 	"github.com/spf13/pflag"
 )
 
+var (
+	nlRegexp  = regexp.MustCompile(`\r?\n`)
+	adjustSep = regexp.MustCompile(`\|:---(\s+)`)
+)
+
 // GenMarkdownTree will generate a markdown page for this command and all
 // descendants in the directory given.
 func (c *Client) GenMarkdownTree(cmd *cobra.Command) error {
@@ -144,6 +151,42 @@ func mdMakeLink(txt, link string, f *pflag.Flag, isAnchor bool) string {
 	return "[" + txt + "](" + link + ")"
 }
 
+type mdTable struct {
+	out       *strings.Builder
+	tabWriter *tabwriter.Writer
+}
+
+func newMdTable(headers ...string) *mdTable {
+	w := &strings.Builder{}
+	t := &mdTable{
+		out: w,
+		// Using tabwriter.Debug, which uses "|" as separator instead of tabs,
+		// which is what we want. It's a bit of a hack, but does the job :)
+		tabWriter: tabwriter.NewWriter(w, 5, 5, 1, ' ', tabwriter.Debug),
+	}
+	t.addHeader(headers...)
+	return t
+}
+
+func (t *mdTable) addHeader(cols ...string) {
+	t.AddRow(cols...)
+	_, _ = t.tabWriter.Write([]byte("|" + strings.Repeat(":---\t", len(cols)) + "\n"))
+}
+
+func (t *mdTable) AddRow(cols ...string) {
+	for i := range cols {
+		cols[i] = mdEscapePipe(cols[i])
+	}
+	_, _ = t.tabWriter.Write([]byte("| " + strings.Join(cols, "\t ") + "\t\n"))
+}
+
+func (t *mdTable) String() string {
+	_ = t.tabWriter.Flush()
+	return adjustSep.ReplaceAllStringFunc(t.out.String()+"\n", func(in string) string {
+		return strings.ReplaceAll(in, " ", "-")
+	})
+}
+
 func mdCmdOutput(cmd *cobra.Command, old string) (string, error) {
 	b := &strings.Builder{}
 
@@ -152,46 +195,41 @@ func mdCmdOutput(cmd *cobra.Command, old string) (string, error) {
 		desc = cmd.Long
 	}
 	if desc != "" {
-		fmt.Fprintf(b, "%s\n\n", desc)
+		b.WriteString(desc + "\n\n")
 	}
 
 	if aliases := getAliases(cmd); len(aliases) != 0 {
-		fmt.Fprint(b, "### Aliases\n\n")
+		b.WriteString("### Aliases\n\n")
-		fmt.Fprint(b, "`"+strings.Join(aliases, "`, `")+"`")
+		b.WriteString("`" + strings.Join(aliases, "`, `") + "`")
-		fmt.Fprint(b, "\n\n")
+		b.WriteString("\n\n")
 	}
 
 	if len(cmd.Commands()) != 0 {
-		fmt.Fprint(b, "### Subcommands\n\n")
+		b.WriteString("### Subcommands\n\n")
-		fmt.Fprint(b, "| Name | Description |\n")
+		table := newMdTable("Name", "Description")
-		fmt.Fprint(b, "| --- | --- |\n")
 		for _, c := range cmd.Commands() {
-			fmt.Fprintf(b, "| [`%s`](%s) | %s |\n", c.Name(), mdFilename(c), c.Short)
+			table.AddRow(fmt.Sprintf("[`%s`](%s)", c.Name(), mdFilename(c)), c.Short)
 		}
-		fmt.Fprint(b, "\n\n")
+		b.WriteString(table.String() + "\n")
 	}
 
 	// add inherited flags before checking for flags availability
 	cmd.Flags().AddFlagSet(cmd.InheritedFlags())
 
 	if cmd.Flags().HasAvailableFlags() {
-		fmt.Fprint(b, "### Options\n\n")
+		b.WriteString("### Options\n\n")
-		fmt.Fprint(b, "| Name | Type | Default | Description |\n")
+		table := newMdTable("Name", "Type", "Default", "Description")
-		fmt.Fprint(b, "| --- | --- | --- | --- |\n")
-
 		cmd.Flags().VisitAll(func(f *pflag.Flag) {
 			if f.Hidden {
 				return
 			}
 			isLink := strings.Contains(old, "<a name=\""+f.Name+"\"></a>")
-			fmt.Fprint(b, "| ")
+			var name string
 			if f.Shorthand != "" {
-				name := "`-" + f.Shorthand + "`"
+				name = mdMakeLink("`-"+f.Shorthand+"`", f.Name, f, isLink)
-				name = mdMakeLink(name, f.Name, f, isLink)
+				name += ", "
-				fmt.Fprintf(b, "%s, ", name)
 			}
-			name := "`--" + f.Name + "`"
+			name += mdMakeLink("`--"+f.Name+"`", f.Name, f, isLink)
-			name = mdMakeLink(name, f.Name, f, isLink)
 
 			var ftype string
 			if f.Value.Type() != "bool" {
@@ -216,9 +254,9 @@ func mdCmdOutput(cmd *cobra.Command, old string) (string, error) {
 			} else if cd, ok := cmd.Annotations[annotation.CodeDelimiter]; ok {
 				usage = strings.ReplaceAll(usage, cd, "`")
 			}
-			fmt.Fprintf(b, "%s | %s | %s | %s |\n", mdEscapePipe(name), mdEscapePipe(ftype), mdEscapePipe(defval), mdEscapePipe(usage))
+			table.AddRow(name, ftype, defval, mdReplaceNewline(usage))
 		})
-		fmt.Fprintln(b, "")
+		b.WriteString(table.String())
 	}
 
 	return b.String(), nil
@@ -227,3 +265,7 @@ func mdCmdOutput(cmd *cobra.Command, old string) (string, error) {
 func mdEscapePipe(s string) string {
 	return strings.ReplaceAll(s, `|`, `\|`)
 }
+
+func mdReplaceNewline(s string) string {
+	return nlRegexp.ReplaceAllString(s, "<br>")
+}

vendor/modules.txt

@@ -219,7 +219,7 @@ github.com/docker/cli/cli/streams
 github.com/docker/cli/cli/trust
 github.com/docker/cli/cli/version
 github.com/docker/cli/opts
-# github.com/docker/cli-docs-tool v0.5.0
+# github.com/docker/cli-docs-tool v0.5.1
 ## explicit; go 1.18
 github.com/docker/cli-docs-tool
 github.com/docker/cli-docs-tool/annotation
@@ -433,7 +433,7 @@ github.com/mitchellh/go-wordwrap
 # github.com/mitchellh/mapstructure v1.5.0
 ## explicit; go 1.14
 github.com/mitchellh/mapstructure
-# github.com/moby/buildkit v0.11.0-rc4
+# github.com/moby/buildkit v0.11.0
 ## explicit; go 1.18
 github.com/moby/buildkit/api/services/control
 github.com/moby/buildkit/api/types