From 559d554cf1e50328db4d501a1abbf0f5fb5776e4 Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Mon, 20 Jan 2025 19:13:14 +0000 Subject: [PATCH] vendor: github.com/docker/buildx v0.20.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.yaml | 2 + data/buildx/docker_buildx_bake.yaml | 56 +++++++++++++++++-- data/buildx/docker_buildx_build.yaml | 10 +++- data/buildx/docker_buildx_debug_build.yaml | 2 +- data/buildx/docker_buildx_history.yaml | 46 +++++++++++++++ .../buildx/docker_buildx_history_inspect.yaml | 38 +++++++++++++ ...ker_buildx_history_inspect_attachment.yaml | 53 ++++++++++++++++++ data/buildx/docker_buildx_history_logs.yaml | 45 +++++++++++++++ data/buildx/docker_buildx_history_ls.yaml | 55 ++++++++++++++++++ data/buildx/docker_buildx_history_open.yaml | 34 +++++++++++ data/buildx/docker_buildx_history_rm.yaml | 45 +++++++++++++++ go.mod | 6 +- go.sum | 2 + 15 files changed, 386 insertions(+), 16 deletions(-) create mode 100644 data/buildx/docker_buildx_history.yaml create mode 100644 data/buildx/docker_buildx_history_inspect.yaml create mode 100644 data/buildx/docker_buildx_history_inspect_attachment.yaml create mode 100644 data/buildx/docker_buildx_history_logs.yaml create mode 100644 data/buildx/docker_buildx_history_ls.yaml create mode 100644 data/buildx/docker_buildx_history_open.yaml create mode 100644 data/buildx/docker_buildx_history_rm.yaml diff --git a/_vendor/github.com/docker/buildx/docs/bake-reference.md b/_vendor/github.com/docker/buildx/docs/bake-reference.md index 19483210a5..192dded4fe 100644 --- a/_vendor/github.com/docker/buildx/docs/bake-reference.md +++ b/_vendor/github.com/docker/buildx/docs/bake-reference.md @@ -19,8 +19,8 @@ By default, Bake uses the following lookup order to find the configuration file: 3. `docker-compose.yml` 4. `docker-compose.yaml` 5. `docker-bake.json` -6. `docker-bake.override.json` -7. `docker-bake.hcl` +6. `docker-bake.hcl` +7. `docker-bake.override.json` 8. `docker-bake.override.hcl` You can specify the file location explicitly using the `--file` flag: diff --git a/_vendor/modules.txt b/_vendor/modules.txt index ee53a1a18a..3a19633bb3 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v27.5.0+incompatible -# github.com/moby/buildkit v0.18.1 -# github.com/docker/buildx v0.19.2 +# github.com/moby/buildkit v0.19.0 +# github.com/docker/buildx v0.20.0 # github.com/docker/cli v27.5.0+incompatible # github.com/docker/compose/v2 v2.32.4 # github.com/docker/scout-cli v1.15.0 diff --git a/data/buildx/docker_buildx.yaml b/data/buildx/docker_buildx.yaml index c13fe0b3c3..4c786feff7 100644 --- a/data/buildx/docker_buildx.yaml +++ b/data/buildx/docker_buildx.yaml @@ -11,6 +11,7 @@ cname: - docker buildx debug - docker buildx dial-stdio - docker buildx du + - docker buildx history - docker buildx imagetools - docker buildx inspect - docker buildx ls @@ -26,6 +27,7 @@ clink: - docker_buildx_debug.yaml - docker_buildx_dial-stdio.yaml - docker_buildx_du.yaml + - docker_buildx_history.yaml - docker_buildx_imagetools.yaml - docker_buildx_inspect.yaml - docker_buildx_ls.yaml diff --git a/data/buildx/docker_buildx_bake.yaml b/data/buildx/docker_buildx_bake.yaml index 0836a274ae..203d066a00 100644 --- a/data/buildx/docker_buildx_bake.yaml +++ b/data/buildx/docker_buildx_bake.yaml @@ -59,24 +59,34 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: list + value_type: string + description: List targets or variables + details_url: '#list' + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: list-targets value_type: bool default_value: "false" description: List available targets - deprecated: false + deprecated: true hidden: true experimental: false - experimentalcli: true + experimentalcli: false kubernetes: false swarm: false - option: list-variables value_type: bool default_value: "false" description: List defined variables - deprecated: false + deprecated: true hidden: true experimental: false - experimentalcli: true + experimentalcli: false kubernetes: false swarm: false - option: load @@ -125,7 +135,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output + Set type of progress output (`auto`, `quiet`, `plain`, `tty`, `rawjson`). Use plain to show container output details_url: '#progress' deprecated: false hidden: false @@ -259,6 +269,42 @@ examples: |- See the [Bake file reference](/build/bake/reference/) for more details. + ### List targets and variables (--list) {#list} + + The `--list` flag displays all available targets or variables in the Bake + configuration, along with a description (if set using the `description` + property in the Bake file). + + To list all targets: + + ```console {title="List targets"} + $ docker buildx bake --list=targets + TARGET DESCRIPTION + binaries + default binaries + update-docs + validate + validate-golangci Validate .golangci.yml schema (does not run Go linter) + ``` + + To list variables: + + ```console + $ docker buildx bake --list=variables + VARIABLE VALUE DESCRIPTION + REGISTRY docker.io/username Registry and namespace + IMAGE_NAME my-app Image name + GO_VERSION + ``` + + By default, the output of `docker buildx bake --list` is presented in a table + format. Alternatively, you can use a long-form CSV syntax and specify a + `format` attribute to output the list in JSON. + + ```console + $ docker buildx bake --list=type=targets,format=json + ``` + ### Write build results metadata to a file (--metadata-file) {#metadata-file} Similar to [`buildx build --metadata-file`](/reference/cli/docker/buildx/build/#metadata-file) but diff --git a/data/buildx/docker_buildx_build.yaml b/data/buildx/docker_buildx_build.yaml index b1dc9c44de..39d13d3ac0 100644 --- a/data/buildx/docker_buildx_build.yaml +++ b/data/buildx/docker_buildx_build.yaml @@ -355,7 +355,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output + Set type of progress output (`auto`, `quiet`, `plain`, `tty`, `rawjson`). Use plain to show container output details_url: '#progress' deprecated: false hidden: false @@ -1317,8 +1317,12 @@ examples: |- --progress=VALUE ``` - Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use `plain` to show container - output (default `auto`). + Set type of progress output. Supported values are: + - `auto` (default): Uses the `tty` mode if the client is a TTY, or `plain` otherwise + - `tty`: An interactive stream of the output with color and redrawing + - `plain`: Prints the raw build progress in a plaintext format + - `quiet`: Suppress the build output and print image ID on success (same as `--quiet`) + - `rawjson`: Prints the raw build progress as JSON lines > [!NOTE] > You can also use the `BUILDKIT_PROGRESS` environment variable to set its value. diff --git a/data/buildx/docker_buildx_debug_build.yaml b/data/buildx/docker_buildx_debug_build.yaml index dccc8aa96f..38c3faa67e 100644 --- a/data/buildx/docker_buildx_debug_build.yaml +++ b/data/buildx/docker_buildx_debug_build.yaml @@ -337,7 +337,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output + Set type of progress output (`auto`, `quiet`, `plain`, `tty`, `rawjson`). Use plain to show container output deprecated: false hidden: false experimental: false diff --git a/data/buildx/docker_buildx_history.yaml b/data/buildx/docker_buildx_history.yaml new file mode 100644 index 0000000000..e3e1721935 --- /dev/null +++ b/data/buildx/docker_buildx_history.yaml @@ -0,0 +1,46 @@ +command: docker buildx history +short: Commands to work on build records +long: Commands to work on build records +usage: docker buildx history +pname: docker buildx +plink: docker_buildx.yaml +cname: + - docker buildx history inspect + - docker buildx history logs + - docker buildx history ls + - docker buildx history open + - docker buildx history rm +clink: + - docker_buildx_history_inspect.yaml + - docker_buildx_history_logs.yaml + - docker_buildx_history_ls.yaml + - docker_buildx_history_open.yaml + - docker_buildx_history_rm.yaml +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_inspect.yaml b/data/buildx/docker_buildx_history_inspect.yaml new file mode 100644 index 0000000000..f226342956 --- /dev/null +++ b/data/buildx/docker_buildx_history_inspect.yaml @@ -0,0 +1,38 @@ +command: docker buildx history inspect +short: Inspect a build +long: Inspect a build +usage: docker buildx history inspect [OPTIONS] [REF] +pname: docker buildx history +plink: docker_buildx_history.yaml +cname: + - docker buildx history inspect attachment +clink: + - docker_buildx_history_inspect_attachment.yaml +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_inspect_attachment.yaml b/data/buildx/docker_buildx_history_inspect_attachment.yaml new file mode 100644 index 0000000000..c43308120b --- /dev/null +++ b/data/buildx/docker_buildx_history_inspect_attachment.yaml @@ -0,0 +1,53 @@ +command: docker buildx history inspect attachment +short: Inspect a build attachment +long: Inspect a build attachment +usage: docker buildx history inspect attachment [OPTIONS] REF [DIGEST] +pname: docker buildx history inspect +plink: docker_buildx_history_inspect.yaml +options: + - option: platform + value_type: string + description: Platform of attachment + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: type + value_type: string + description: Type of attachment + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_logs.yaml b/data/buildx/docker_buildx_history_logs.yaml new file mode 100644 index 0000000000..c6afba47cd --- /dev/null +++ b/data/buildx/docker_buildx_history_logs.yaml @@ -0,0 +1,45 @@ +command: docker buildx history logs +short: Print the logs of a build +long: Print the logs of a build +usage: docker buildx history logs [OPTIONS] [REF] +pname: docker buildx history +plink: docker_buildx_history.yaml +options: + - option: progress + value_type: string + default_value: plain + description: Set type of progress output (plain, rawjson, tty) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_ls.yaml b/data/buildx/docker_buildx_history_ls.yaml new file mode 100644 index 0000000000..a1bdf1833e --- /dev/null +++ b/data/buildx/docker_buildx_history_ls.yaml @@ -0,0 +1,55 @@ +command: docker buildx history ls +short: List build records +long: List build records +usage: docker buildx history ls +pname: docker buildx history +plink: docker_buildx_history.yaml +options: + - option: format + value_type: string + default_value: table + description: Format the output + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: no-trunc + value_type: bool + default_value: "false" + description: Don't truncate output + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_open.yaml b/data/buildx/docker_buildx_history_open.yaml new file mode 100644 index 0000000000..e79b0ba569 --- /dev/null +++ b/data/buildx/docker_buildx_history_open.yaml @@ -0,0 +1,34 @@ +command: docker buildx history open +short: Open a build in Docker Desktop +long: Open a build in Docker Desktop +usage: docker buildx history open [OPTIONS] [REF] +pname: docker buildx history +plink: docker_buildx_history.yaml +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_rm.yaml b/data/buildx/docker_buildx_history_rm.yaml new file mode 100644 index 0000000000..aa3ddd173c --- /dev/null +++ b/data/buildx/docker_buildx_history_rm.yaml @@ -0,0 +1,45 @@ +command: docker buildx history rm +short: Remove build records +long: Remove build records +usage: docker buildx history rm [OPTIONS] [REF...] +pname: docker buildx history +plink: docker_buildx_history.yaml +options: + - option: all + value_type: bool + default_value: "false" + description: Remove all build records + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/go.mod b/go.mod index 295c5f5b6f..3e83458659 100644 --- a/go.mod +++ b/go.mod @@ -3,16 +3,16 @@ module github.com/docker/docs go 1.23.1 require ( - github.com/docker/buildx v0.19.2 // indirect + github.com/docker/buildx v0.20.0 // indirect github.com/docker/cli v27.5.0+incompatible // indirect github.com/docker/compose/v2 v2.32.4 // indirect github.com/docker/scout-cli v1.15.0 // indirect - github.com/moby/buildkit v0.18.1 // indirect + github.com/moby/buildkit v0.19.0 // indirect github.com/moby/moby v27.5.0+incompatible // indirect ) replace ( - github.com/docker/buildx => github.com/docker/buildx v0.19.2 + github.com/docker/buildx => github.com/docker/buildx v0.20.0 github.com/docker/cli => github.com/docker/cli v27.5.0+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.32.4 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 diff --git a/go.sum b/go.sum index d3b46ccdf9..1490486893 100644 --- a/go.sum +++ b/go.sum @@ -88,6 +88,8 @@ github.com/docker/buildx v0.19.1 h1:muQEvRJLvOCS0p/67gPwjnQPWqE5ot3sGkb2Eq7vCmw= github.com/docker/buildx v0.19.1/go.mod h1:k4WP+XmGRYL0a7l4RZAI2TqpwhuAuSQ5U/rosRgFmAA= github.com/docker/buildx v0.19.2 h1:2zXzgP2liQKgQ5BiOqMc+wz7hfWgAIMWw5MR6QDG++I= github.com/docker/buildx v0.19.2/go.mod h1:k4WP+XmGRYL0a7l4RZAI2TqpwhuAuSQ5U/rosRgFmAA= +github.com/docker/buildx v0.20.0 h1:XM2EvwEfohbxLPAheVm03biNHpspB/dA6U9F0c6yJsI= +github.com/docker/buildx v0.20.0/go.mod h1:VVi4Nvo4jd/IkRvwyExbIyW7u82fivK61MRx5I0oKic= 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=