From 9b83ecb76772e1b6bb99384d893901fe4049315f Mon Sep 17 00:00:00 2001 From: tonistiigi <585223+tonistiigi@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:00:40 +0000 Subject: [PATCH] vendor: github.com/docker/buildx v0.15.0 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../docker/buildx/docs/bake-reference.md | 4 ++- _vendor/modules.txt | 4 +-- data/buildx/docker_buildx_bake.yaml | 2 +- data/buildx/docker_buildx_build.yaml | 34 +++++++++++++++---- data/buildx/docker_buildx_debug.yaml | 2 +- data/buildx/docker_buildx_debug_build.yaml | 23 +++++++++++-- data/buildx/docker_buildx_dial-stdio.yaml | 3 +- .../docker_buildx_imagetools_create.yaml | 22 ++++++++++-- go.mod | 6 ++-- go.sum | 2 ++ 10 files changed, 82 insertions(+), 20 deletions(-) diff --git a/_vendor/github.com/docker/buildx/docs/bake-reference.md b/_vendor/github.com/docker/buildx/docs/bake-reference.md index c10e8c1320..0c4126be30 100644 --- a/_vendor/github.com/docker/buildx/docs/bake-reference.md +++ b/_vendor/github.com/docker/buildx/docs/bake-reference.md @@ -1,4 +1,6 @@ -# Bake file reference +--- +title: Bake file reference +--- The Bake file is a file for defining workflows that you run using `docker buildx bake`. diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 842c9ee1ec..a7c92acef8 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v26.1.2+incompatible -# github.com/moby/buildkit v0.14.0-rc2.0.20240611065153-eed17a45c62b -# github.com/docker/buildx v0.14.1 +# github.com/moby/buildkit v0.14.0 +# github.com/docker/buildx v0.15.0 # github.com/docker/cli v26.1.4+incompatible # github.com/docker/compose/v2 v2.27.0 # github.com/docker/scout-cli v1.9.3 diff --git a/data/buildx/docker_buildx_bake.yaml b/data/buildx/docker_buildx_bake.yaml index 2393e6fd6f..b143edf952 100644 --- a/data/buildx/docker_buildx_bake.yaml +++ b/data/buildx/docker_buildx_bake.yaml @@ -75,7 +75,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output + Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output details_url: '#progress' deprecated: false hidden: false diff --git a/data/buildx/docker_buildx_build.yaml b/data/buildx/docker_buildx_build.yaml index d3def059f6..b8b869ee58 100644 --- a/data/buildx/docker_buildx_build.yaml +++ b/data/buildx/docker_buildx_build.yaml @@ -103,6 +103,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: call + value_type: string + default_value: build + description: Set method for evaluating build (`check`, `outline`, `targets`) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: cgroup-parent value_type: string description: Set the parent cgroup for the `RUN` instructions during build @@ -113,6 +123,15 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: check + value_type: bool + description: Shorthand for `--call=check` + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: compress value_type: bool default_value: "false" @@ -330,7 +349,7 @@ options: value_type: string description: Print result of information request (e.g., outline, targets) deprecated: false - hidden: false + hidden: true experimental: false experimentalcli: true kubernetes: false @@ -339,7 +358,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output + Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output details_url: '#progress' deprecated: false hidden: false @@ -1009,8 +1028,8 @@ examples: |- --progress=VALUE ``` - Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container - output (default "auto"). + Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use `plain` to show container + output (default `auto`). > **Note** > @@ -1033,8 +1052,11 @@ examples: |- > **Note** > - > Check also our [Color output controls guide](https://github.com/docker/buildx/blob/master/docs/guides/color-output.md) - > for modifying the colors that are used to output information to the terminal. + > Check also the [`BUILDKIT_COLORS`](/build/building/variables/#buildkit_colors) + > environment variable for modifying the colors of the terminal output. + + The `rawjson` output marshals the solve status events from BuildKit to JSON lines. + This mode is designed to be read by an external program. ### Create provenance attestations (--provenance) {#provenance} diff --git a/data/buildx/docker_buildx_debug.yaml b/data/buildx/docker_buildx_debug.yaml index 2f4787b1fd..efd408a651 100644 --- a/data/buildx/docker_buildx_debug.yaml +++ b/data/buildx/docker_buildx_debug.yaml @@ -42,7 +42,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`) for the monitor. Use plain to show container output + Set type of progress output (`auto`, `plain`, `tty`, `rawjson`) for the monitor. Use plain to show container output deprecated: false hidden: false experimental: false diff --git a/data/buildx/docker_buildx_debug_build.yaml b/data/buildx/docker_buildx_debug_build.yaml index 8e13dcd476..af2b6f565a 100644 --- a/data/buildx/docker_buildx_debug_build.yaml +++ b/data/buildx/docker_buildx_debug_build.yaml @@ -90,6 +90,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: call + value_type: string + default_value: build + description: Set method for evaluating build (`check`, `outline`, `targets`) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: cgroup-parent value_type: string description: Set the parent cgroup for the `RUN` instructions during build @@ -100,6 +110,15 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: check + value_type: bool + description: Shorthand for `--call=check` + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: compress value_type: bool default_value: "false" @@ -312,7 +331,7 @@ options: value_type: string description: Print result of information request (e.g., outline, targets) deprecated: false - hidden: false + hidden: true experimental: false experimentalcli: true kubernetes: false @@ -321,7 +340,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output + Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output deprecated: false hidden: false experimental: false diff --git a/data/buildx/docker_buildx_dial-stdio.yaml b/data/buildx/docker_buildx_dial-stdio.yaml index 40a339ddc7..b757f4ead0 100644 --- a/data/buildx/docker_buildx_dial-stdio.yaml +++ b/data/buildx/docker_buildx_dial-stdio.yaml @@ -19,7 +19,8 @@ options: - option: progress value_type: string default_value: quiet - description: Set type of progress output (auto, plain, tty). + description: | + Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output deprecated: false hidden: false experimental: false diff --git a/data/buildx/docker_buildx_imagetools_create.yaml b/data/buildx/docker_buildx_imagetools_create.yaml index bec8f691aa..12324c4316 100644 --- a/data/buildx/docker_buildx_imagetools_create.yaml +++ b/data/buildx/docker_buildx_imagetools_create.yaml @@ -3,8 +3,13 @@ short: Create a new image based on source images long: |- Create a new manifest list based on source manifests. The source manifests can be manifest lists or single platform distribution manifests and must already - exist in the registry where the new manifest is created. If only one source is - specified, create performs a carbon copy. + exist in the registry where the new manifest is created. + + If only one source is specified and that source is a manifest list or image index, + create performs a carbon copy. If one source is specified and that source is *not* + a list or index, the output will be a manifest list, however you can disable this + behavior with `--prefer-index=false` which attempts to preserve the source manifest + format in the output. usage: docker buildx imagetools create [OPTIONS] [SOURCE] [SOURCE...] pname: docker buildx imagetools plink: docker_buildx_imagetools.yaml @@ -54,11 +59,22 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: prefer-index + value_type: bool + default_value: "true" + description: | + When only a single source is specified, prefer outputting an image index or manifest list instead of performing a carbon copy + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: progress value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`). Use plain to show container output + Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output deprecated: false hidden: false experimental: false diff --git a/go.mod b/go.mod index 1a59166757..86c2f4a1f0 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,16 @@ go 1.21 toolchain go1.21.1 require ( - github.com/docker/buildx v0.14.1 // indirect + github.com/docker/buildx v0.15.0 // indirect github.com/docker/cli v26.1.4+incompatible // indirect github.com/docker/compose/v2 v2.27.0 // indirect github.com/docker/scout-cli v1.9.3 // indirect - github.com/moby/buildkit v0.14.0-rc2.0.20240611065153-eed17a45c62b // indirect + github.com/moby/buildkit v0.14.0 // indirect github.com/moby/moby v26.1.2+incompatible // indirect ) replace ( - github.com/docker/buildx => github.com/docker/buildx v0.14.1 + github.com/docker/buildx => github.com/docker/buildx v0.15.0 github.com/docker/cli => github.com/docker/cli v26.1.3-0.20240513184838-60f2d38d5341+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.27.0 github.com/docker/scout-cli => github.com/docker/scout-cli v1.9.3 diff --git a/go.sum b/go.sum index c38995079b..e4b17e6a43 100644 --- a/go.sum +++ b/go.sum @@ -70,6 +70,8 @@ github.com/docker/buildx v0.14.0 h1:FxqcfE7xgeEC4oQlKLpuvfobRDVDXrHE3jByM+mdyqk= github.com/docker/buildx v0.14.0/go.mod h1:Vy/2lC9QsJvo33+7KKkN/GDE5WxnVqW0/dpcN7ZqPJY= github.com/docker/buildx v0.14.1 h1:Pr3HdtHoDsCghlIExgGp0WOIgvbiViushOKIPUIyFI4= github.com/docker/buildx v0.14.1/go.mod h1:s6xxLYXZIWnkdYpSvxRmoqZTb1vViV9q2f+Hg8cWA3Y= +github.com/docker/buildx v0.15.0 h1:PVq4IMnTvw1Sx0RKDWbfi2eTGawFd9CMBYnz9xat93Y= +github.com/docker/buildx v0.15.0/go.mod h1:AdkB1RIcU4rfZ6mpw2PA2pOi1ppI9yvFXkVEpq5EmS4= github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM= github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw=