From b1b6504d0e9656c868ef231a5ebc5a6e66e822f7 Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Tue, 15 Apr 2025 17:00:07 +0000 Subject: [PATCH 1/2] vendor: github.com/docker/buildx v0.23.0 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- _vendor/modules.txt | 4 +- data/buildx/docker_buildx_build.yaml | 2 +- data/buildx/docker_buildx_history.yaml | 2 + data/buildx/docker_buildx_history_export.yaml | 55 +++++++++++++++++++ data/buildx/docker_buildx_history_ls.yaml | 20 +++++++ go.mod | 6 +- go.sum | 2 + 7 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 data/buildx/docker_buildx_history_export.yaml diff --git a/_vendor/modules.txt b/_vendor/modules.txt index add37c2758..a945859abb 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v28.0.2+incompatible -# github.com/moby/buildkit v0.20.1 -# github.com/docker/buildx v0.22.0 +# github.com/moby/buildkit v0.21.0 +# github.com/docker/buildx v0.23.0 # github.com/docker/cli v28.0.4+incompatible # github.com/docker/compose/v2 v2.35.0 # github.com/docker/scout-cli v1.15.0 diff --git a/data/buildx/docker_buildx_build.yaml b/data/buildx/docker_buildx_build.yaml index d924074072..57a0d8cbfe 100644 --- a/data/buildx/docker_buildx_build.yaml +++ b/data/buildx/docker_buildx_build.yaml @@ -1433,7 +1433,7 @@ examples: |- ###### `type=file` usage In the following example, `type=file` is automatically detected because no - environment variable mathing `aws` (the ID) is set. + environment variable matching `aws` (the ID) is set. ```console $ docker buildx build --secret id=aws,src=$HOME/.aws/credentials . diff --git a/data/buildx/docker_buildx_history.yaml b/data/buildx/docker_buildx_history.yaml index e563d56c7b..cc77851b07 100644 --- a/data/buildx/docker_buildx_history.yaml +++ b/data/buildx/docker_buildx_history.yaml @@ -5,6 +5,7 @@ usage: docker buildx history pname: docker buildx plink: docker_buildx.yaml cname: + - docker buildx history export - docker buildx history import - docker buildx history inspect - docker buildx history logs @@ -13,6 +14,7 @@ cname: - docker buildx history rm - docker buildx history trace clink: + - docker_buildx_history_export.yaml - docker_buildx_history_import.yaml - docker_buildx_history_inspect.yaml - docker_buildx_history_logs.yaml diff --git a/data/buildx/docker_buildx_history_export.yaml b/data/buildx/docker_buildx_history_export.yaml new file mode 100644 index 0000000000..e70b8f8fba --- /dev/null +++ b/data/buildx/docker_buildx_history_export.yaml @@ -0,0 +1,55 @@ +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] +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 + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: output + shorthand: o + value_type: string + description: Output file path + 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 index a1bdf1833e..ab7a3abbb3 100644 --- a/data/buildx/docker_buildx_history_ls.yaml +++ b/data/buildx/docker_buildx_history_ls.yaml @@ -5,6 +5,16 @@ usage: docker buildx history ls pname: docker buildx history plink: docker_buildx_history.yaml options: + - option: filter + value_type: stringArray + default_value: '[]' + description: Provide filter values (e.g., `status=error`) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: format value_type: string default_value: table @@ -15,6 +25,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: local + value_type: bool + default_value: "false" + description: List records for current repository only + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: no-trunc value_type: bool default_value: "false" diff --git a/go.mod b/go.mod index 7bb751dbd1..b19b80e56f 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,16 @@ go 1.23.8 toolchain go1.24.1 require ( - github.com/docker/buildx v0.22.0 // indirect + github.com/docker/buildx v0.23.0 // indirect github.com/docker/cli v28.0.4+incompatible // indirect github.com/docker/compose/v2 v2.35.0 // indirect github.com/docker/scout-cli v1.15.0 // indirect - github.com/moby/buildkit v0.20.1 // indirect + github.com/moby/buildkit v0.21.0 // indirect github.com/moby/moby v28.0.2+incompatible // indirect ) replace ( - github.com/docker/buildx => github.com/docker/buildx v0.22.0 + github.com/docker/buildx => github.com/docker/buildx v0.23.0 github.com/docker/cli => github.com/docker/cli v28.0.2+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.35.0 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 diff --git a/go.sum b/go.sum index a5d17463c6..4c52ab50f7 100644 --- a/go.sum +++ b/go.sum @@ -102,6 +102,8 @@ github.com/docker/buildx v0.21.3 h1:LEmhk3D9WOboMeC+hlfOUnB1jylXcDfGHjqAL7Tvwks= github.com/docker/buildx v0.21.3/go.mod h1:8V4UMnlKsaGYwz83BygmIbJIFEAYGHT6KAv8akDZmqo= github.com/docker/buildx v0.22.0 h1:pGTcGZa+kxpYUlM/6ACsp1hXhkEDulz++RNXPdE8Afk= github.com/docker/buildx v0.22.0/go.mod h1:ThbnUe4kNiStlq6cLXruElyEdSTdPL3k/QerNUmPvHE= +github.com/docker/buildx v0.23.0 h1:qoYhuWyZ6PVCrWbkxClLzBWDBCUkyFK6Chjzg6nU+V8= +github.com/docker/buildx v0.23.0/go.mod h1:y/6Zf/y3Bf0zTWqgg8PuNFATcqnuhFmQuNf4VyrnPtg= 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= From 5226053fe9532565e8bfac0fa250d4a4e5b60192 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Wed, 16 Apr 2025 15:17:35 +0200 Subject: [PATCH 2/2] buildx: buildx history export stub Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .../cli/docker/buildx/history/export.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 content/reference/cli/docker/buildx/history/export.md diff --git a/content/reference/cli/docker/buildx/history/export.md b/content/reference/cli/docker/buildx/history/export.md new file mode 100644 index 0000000000..6f38ca2064 --- /dev/null +++ b/content/reference/cli/docker/buildx/history/export.md @@ -0,0 +1,16 @@ +--- +datafolder: buildx +datafile: docker_buildx_history_export +title: docker buildx history export +layout: cli +aliases: +- /engine/reference/commandline/buildx_history_export/ +--- + +