Skip to content

Commit 8dbdd7f

Browse files
authored
Merge pull request #22273 from docker-tools-robot/dispatch/buildx-ref-v0.22.0
Update buildx reference to v0.22.0
2 parents eec54cf + 01f9f3d commit 8dbdd7f

File tree

7 files changed

+93
-6
lines changed

7 files changed

+93
-6
lines changed

_vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# github.com/moby/moby v28.0.1+incompatible
22
# github.com/moby/buildkit v0.20.1
3-
# github.com/docker/buildx v0.21.3
3+
# github.com/docker/buildx v0.22.0
44
# github.com/docker/cli v28.0.1+incompatible
55
# github.com/docker/compose/v2 v2.34.0
66
# github.com/docker/scout-cli v1.15.0
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
datafolder: buildx
3+
datafile: docker_buildx_history_import
4+
title: docker buildx history import
5+
layout: cli
6+
aliases:
7+
- /engine/reference/commandline/buildx_history_import/
8+
---
9+
10+
<!--
11+
This page is automatically generated from Docker's source code. If you want to
12+
suggest a change to the text that appears here, open a ticket or pull request
13+
in the source repository on GitHub:
14+
15+
https://github.com/docker/buildx
16+
-->

data/buildx/docker_buildx_bake.yaml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -515,18 +515,22 @@ examples: |-
515515
```console
516516
$ docker buildx bake --set target.args.mybuildarg=value
517517
$ docker buildx bake --set target.platform=linux/arm64
518-
$ docker buildx bake --set foo*.args.mybuildarg=value # overrides build arg for all targets starting with 'foo'
519-
$ docker buildx bake --set *.platform=linux/arm64 # overrides platform for all targets
520-
$ docker buildx bake --set foo*.no-cache # bypass caching only for targets starting with 'foo'
518+
$ docker buildx bake --set foo*.args.mybuildarg=value # overrides build arg for all targets starting with 'foo'
519+
$ docker buildx bake --set *.platform=linux/arm64 # overrides platform for all targets
520+
$ docker buildx bake --set foo*.no-cache # bypass caching only for targets starting with 'foo'
521+
$ docker buildx bake --set target.platform+=linux/arm64 # appends 'linux/arm64' to the platform list
521522
```
522523
523524
You can override the following fields:
524525
526+
* `annotations`
527+
* `attest`
525528
* `args`
526529
* `cache-from`
527530
* `cache-to`
528531
* `context`
529532
* `dockerfile`
533+
* `entitlements`
530534
* `labels`
531535
* `load`
532536
* `no-cache`
@@ -539,6 +543,23 @@ examples: |-
539543
* `ssh`
540544
* `tags`
541545
* `target`
546+
547+
You can append using `+=` operator for the following fields:
548+
549+
* `annotations`¹
550+
* `attest`¹
551+
* `cache-from`
552+
* `cache-to`
553+
* `entitlements`¹
554+
* `no-cache-filter`
555+
* `output`
556+
* `platform`
557+
* `secrets`
558+
* `ssh`
559+
* `tags`
560+
561+
> [!NOTE]
562+
> ¹ These fields already append by default.
542563
deprecated: false
543564
hidden: false
544565
experimental: false

data/buildx/docker_buildx_history.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ usage: docker buildx history
55
pname: docker buildx
66
plink: docker_buildx.yaml
77
cname:
8+
- docker buildx history import
89
- docker buildx history inspect
910
- docker buildx history logs
1011
- docker buildx history ls
1112
- docker buildx history open
1213
- docker buildx history rm
1314
- docker buildx history trace
1415
clink:
16+
- docker_buildx_history_import.yaml
1517
- docker_buildx_history_inspect.yaml
1618
- docker_buildx_history_logs.yaml
1719
- docker_buildx_history_ls.yaml
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
command: docker buildx history import
2+
short: Import a build into Docker Desktop
3+
long: Import a build into Docker Desktop
4+
usage: docker buildx history import [OPTIONS] < bundle.dockerbuild
5+
pname: docker buildx history
6+
plink: docker_buildx_history.yaml
7+
options:
8+
- option: file
9+
shorthand: f
10+
value_type: stringArray
11+
default_value: '[]'
12+
description: Import from a file path
13+
deprecated: false
14+
hidden: false
15+
experimental: false
16+
experimentalcli: false
17+
kubernetes: false
18+
swarm: false
19+
inherited_options:
20+
- option: builder
21+
value_type: string
22+
description: Override the configured builder instance
23+
deprecated: false
24+
hidden: false
25+
experimental: false
26+
experimentalcli: false
27+
kubernetes: false
28+
swarm: false
29+
- option: debug
30+
shorthand: D
31+
value_type: bool
32+
default_value: "false"
33+
description: Enable debug logging
34+
deprecated: false
35+
hidden: false
36+
experimental: false
37+
experimentalcli: false
38+
kubernetes: false
39+
swarm: false
40+
deprecated: false
41+
hidden: false
42+
experimental: false
43+
experimentalcli: false
44+
kubernetes: false
45+
swarm: false
46+

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/docker/docs
33
go 1.23.6
44

55
require (
6-
github.com/docker/buildx v0.21.3 // indirect
6+
github.com/docker/buildx v0.22.0 // indirect
77
github.com/docker/cli v28.0.1+incompatible // indirect
88
github.com/docker/compose/v2 v2.34.0 // indirect
99
github.com/docker/scout-cli v1.15.0 // indirect
@@ -12,7 +12,7 @@ require (
1212
)
1313

1414
replace (
15-
github.com/docker/buildx => github.com/docker/buildx v0.21.3
15+
github.com/docker/buildx => github.com/docker/buildx v0.22.0
1616
github.com/docker/cli => github.com/docker/cli v28.0.1+incompatible
1717
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.34.0
1818
github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ github.com/docker/buildx v0.21.2 h1:r09paH8q9nvAX2PR1ntRrc+C6FBH93bvKUsn1WOb/jU=
100100
github.com/docker/buildx v0.21.2/go.mod h1:8V4UMnlKsaGYwz83BygmIbJIFEAYGHT6KAv8akDZmqo=
101101
github.com/docker/buildx v0.21.3 h1:LEmhk3D9WOboMeC+hlfOUnB1jylXcDfGHjqAL7Tvwks=
102102
github.com/docker/buildx v0.21.3/go.mod h1:8V4UMnlKsaGYwz83BygmIbJIFEAYGHT6KAv8akDZmqo=
103+
github.com/docker/buildx v0.22.0 h1:pGTcGZa+kxpYUlM/6ACsp1hXhkEDulz++RNXPdE8Afk=
104+
github.com/docker/buildx v0.22.0/go.mod h1:ThbnUe4kNiStlq6cLXruElyEdSTdPL3k/QerNUmPvHE=
103105
github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM=
104106
github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
105107
github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw=

0 commit comments

Comments
 (0)