diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 1dd17acc4c24..16698adfcd05 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v28.0.1+incompatible # github.com/moby/buildkit v0.20.1 -# github.com/docker/buildx v0.21.3 +# github.com/docker/buildx v0.22.0 # github.com/docker/cli v28.0.1+incompatible # github.com/docker/compose/v2 v2.34.0 # github.com/docker/scout-cli v1.15.0 diff --git a/content/reference/cli/docker/buildx/history/import.md b/content/reference/cli/docker/buildx/history/import.md new file mode 100644 index 000000000000..cd918893cdda --- /dev/null +++ b/content/reference/cli/docker/buildx/history/import.md @@ -0,0 +1,16 @@ +--- +datafolder: buildx +datafile: docker_buildx_history_import +title: docker buildx history import +layout: cli +aliases: +- /engine/reference/commandline/buildx_history_import/ +--- + + diff --git a/data/buildx/docker_buildx_bake.yaml b/data/buildx/docker_buildx_bake.yaml index 14666cf341a3..066d67119da0 100644 --- a/data/buildx/docker_buildx_bake.yaml +++ b/data/buildx/docker_buildx_bake.yaml @@ -515,18 +515,22 @@ examples: |- ```console $ docker buildx bake --set target.args.mybuildarg=value $ docker buildx bake --set target.platform=linux/arm64 - $ docker buildx bake --set foo*.args.mybuildarg=value # overrides build arg for all targets starting with 'foo' - $ docker buildx bake --set *.platform=linux/arm64 # overrides platform for all targets - $ docker buildx bake --set foo*.no-cache # bypass caching only for targets starting with 'foo' + $ docker buildx bake --set foo*.args.mybuildarg=value # overrides build arg for all targets starting with 'foo' + $ docker buildx bake --set *.platform=linux/arm64 # overrides platform for all targets + $ docker buildx bake --set foo*.no-cache # bypass caching only for targets starting with 'foo' + $ docker buildx bake --set target.platform+=linux/arm64 # appends 'linux/arm64' to the platform list ``` You can override the following fields: + * `annotations` + * `attest` * `args` * `cache-from` * `cache-to` * `context` * `dockerfile` + * `entitlements` * `labels` * `load` * `no-cache` @@ -539,6 +543,23 @@ examples: |- * `ssh` * `tags` * `target` + + You can append using `+=` operator for the following fields: + + * `annotations`¹ + * `attest`¹ + * `cache-from` + * `cache-to` + * `entitlements`¹ + * `no-cache-filter` + * `output` + * `platform` + * `secrets` + * `ssh` + * `tags` + + > [!NOTE] + > ¹ These fields already append by default. deprecated: false hidden: false experimental: false diff --git a/data/buildx/docker_buildx_history.yaml b/data/buildx/docker_buildx_history.yaml index eaf966456fe8..e563d56c7bea 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 import - docker buildx history inspect - docker buildx history logs - docker buildx history ls @@ -12,6 +13,7 @@ cname: - docker buildx history rm - docker buildx history trace clink: + - docker_buildx_history_import.yaml - docker_buildx_history_inspect.yaml - docker_buildx_history_logs.yaml - docker_buildx_history_ls.yaml diff --git a/data/buildx/docker_buildx_history_import.yaml b/data/buildx/docker_buildx_history_import.yaml new file mode 100644 index 000000000000..089a7b328da0 --- /dev/null +++ b/data/buildx/docker_buildx_history_import.yaml @@ -0,0 +1,46 @@ +command: docker buildx history import +short: Import a build into Docker Desktop +long: Import a build into Docker Desktop +usage: docker buildx history import [OPTIONS] < bundle.dockerbuild +pname: docker buildx history +plink: docker_buildx_history.yaml +options: + - option: file + shorthand: f + value_type: stringArray + default_value: '[]' + description: Import from a 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/go.mod b/go.mod index fe250809f80b..9433cab62826 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/docker/docs go 1.23.6 require ( - github.com/docker/buildx v0.21.3 // indirect + github.com/docker/buildx v0.22.0 // indirect github.com/docker/cli v28.0.1+incompatible // indirect github.com/docker/compose/v2 v2.34.0 // indirect github.com/docker/scout-cli v1.15.0 // indirect @@ -12,7 +12,7 @@ require ( ) replace ( - github.com/docker/buildx => github.com/docker/buildx v0.21.3 + github.com/docker/buildx => github.com/docker/buildx v0.22.0 github.com/docker/cli => github.com/docker/cli v28.0.1+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.34.0 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 diff --git a/go.sum b/go.sum index d311417d379a..a57e80b192e6 100644 --- a/go.sum +++ b/go.sum @@ -100,6 +100,8 @@ github.com/docker/buildx v0.21.2 h1:r09paH8q9nvAX2PR1ntRrc+C6FBH93bvKUsn1WOb/jU= github.com/docker/buildx v0.21.2/go.mod h1:8V4UMnlKsaGYwz83BygmIbJIFEAYGHT6KAv8akDZmqo= 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/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=