Skip to content

Commit 815e17f

Browse files
crazy-maxgithub-actions[bot]
authored andcommitted
vendor: github.com/docker/buildx v0.14.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 9a15213 commit 815e17f

File tree

6 files changed

+108
-15
lines changed

6 files changed

+108
-15
lines changed

_vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# github.com/moby/moby v26.0.0+incompatible
22
# github.com/moby/buildkit v0.13.1
3-
# github.com/docker/buildx v0.13.1
4-
# github.com/docker/cli v26.0.0+incompatible
3+
# github.com/docker/buildx v0.14.0
4+
# github.com/docker/cli v26.0.1-0.20240410153731-b6c552212837+incompatible
55
# github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000
66
# github.com/docker/scout-cli v1.7.0

data/buildx/docker_buildx_bake.yaml

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ options:
4141
swarm: false
4242
- option: metadata-file
4343
value_type: string
44-
description: Write build result metadata to the file
44+
description: Write build result metadata to a file
45+
details_url: '#metadata-file'
4546
deprecated: false
4647
hidden: false
4748
experimental: false
@@ -189,6 +190,77 @@ examples: |-
189190
See the [Bake file reference](/build/bake/reference/)
190191
for more details.
191192
193+
### Write build results metadata to a file (--metadata-file) {#metadata-file}
194+
195+
Similar to [`buildx build --metadata-file`](/reference/cli/docker/buildx/build/#metadata-file) but
196+
writes a map of results for each target such as:
197+
198+
```hcl
199+
# docker-bake.hcl
200+
group "default" {
201+
targets = ["db", "webapp-dev"]
202+
}
203+
204+
target "db" {
205+
dockerfile = "Dockerfile.db"
206+
tags = ["docker.io/username/db"]
207+
}
208+
209+
target "webapp-dev" {
210+
dockerfile = "Dockerfile.webapp"
211+
tags = ["docker.io/username/webapp"]
212+
}
213+
```
214+
215+
```console
216+
$ docker buildx bake --load --metadata-file metadata.json .
217+
$ cat metadata.json
218+
```
219+
220+
```json
221+
{
222+
"db": {
223+
"buildx.build.provenance": {},
224+
"buildx.build.ref": "mybuilder/mybuilder0/0fjb6ubs52xx3vygf6fgdl611",
225+
"containerimage.config.digest": "sha256:2937f66a9722f7f4a2df583de2f8cb97fc9196059a410e7f00072fc918930e66",
226+
"containerimage.descriptor": {
227+
"annotations": {
228+
"config.digest": "sha256:2937f66a9722f7f4a2df583de2f8cb97fc9196059a410e7f00072fc918930e66",
229+
"org.opencontainers.image.created": "2022-02-08T21:28:03Z"
230+
},
231+
"digest": "sha256:19ffeab6f8bc9293ac2c3fdf94ebe28396254c993aea0b5a542cfb02e0883fa3",
232+
"mediaType": "application/vnd.oci.image.manifest.v1+json",
233+
"size": 506
234+
},
235+
"containerimage.digest": "sha256:19ffeab6f8bc9293ac2c3fdf94ebe28396254c993aea0b5a542cfb02e0883fa3"
236+
},
237+
"webapp-dev": {
238+
"buildx.build.provenance": {},
239+
"buildx.build.ref": "mybuilder/mybuilder0/kamngmcgyzebqxwu98b4lfv3n",
240+
"containerimage.config.digest": "sha256:9651cc2b3c508f697c9c43b67b64c8359c2865c019e680aac1c11f4b875b67e0",
241+
"containerimage.descriptor": {
242+
"annotations": {
243+
"config.digest": "sha256:9651cc2b3c508f697c9c43b67b64c8359c2865c019e680aac1c11f4b875b67e0",
244+
"org.opencontainers.image.created": "2022-02-08T21:28:15Z"
245+
},
246+
"digest": "sha256:6d9ac9237a84afe1516540f40a0fafdc86859b2141954b4d643af7066d598b74",
247+
"mediaType": "application/vnd.oci.image.manifest.v1+json",
248+
"size": 506
249+
},
250+
"containerimage.digest": "sha256:6d9ac9237a84afe1516540f40a0fafdc86859b2141954b4d643af7066d598b74"
251+
}
252+
}
253+
```
254+
255+
> **Note**
256+
>
257+
> Build record [provenance](/build/attestations/slsa-provenance/#provenance-attestation-example)
258+
> (`buildx.build.provenance`) includes minimal provenance by default. Set the
259+
> `BUILDX_METADATA_PROVENANCE` environment variable to customize this behavior:
260+
> * `min` sets minimal provenance (default).
261+
> * `max` sets full provenance.
262+
> * `disabled`, `false` or `0` does not set any provenance.
263+
192264
### Don't use cache when building the image (--no-cache) {#no-cache}
193265
194266
Same as `build --no-cache`. Don't use cache when building the image.
@@ -261,6 +333,7 @@ examples: |-
261333
* `context`
262334
* `dockerfile`
263335
* `labels`
336+
* `load`
264337
* `no-cache`
265338
* `no-cache-filter`
266339
* `output`

data/buildx/docker_buildx_build.yaml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ options:
205205
swarm: false
206206
- option: iidfile
207207
value_type: string
208-
description: Write the image ID to the file
208+
description: Write the image ID to a file
209209
deprecated: false
210210
hidden: false
211211
experimental: false
@@ -264,7 +264,7 @@ options:
264264
swarm: false
265265
- option: metadata-file
266266
value_type: string
267-
description: Write build result metadata to the file
267+
description: Write build result metadata to a file
268268
details_url: '#metadata-file'
269269
deprecated: false
270270
hidden: false
@@ -773,7 +773,7 @@ examples: |-
773773
Shorthand for [`--output=type=docker`](#docker). Will automatically load the
774774
single-platform build result to `docker images`.
775775
776-
### Write build result metadata to the file (--metadata-file) {#metadata-file}
776+
### Write build result metadata to a file (--metadata-file) {#metadata-file}
777777
778778
To output build metadata such as the image digest, pass the `--metadata-file` flag.
779779
The metadata will be written as a JSON object to the specified file. The
@@ -786,6 +786,7 @@ examples: |-
786786
787787
```json
788788
{
789+
"buildx.build.provenance": {},
789790
"buildx.build.ref": "mybuilder/mybuilder0/0fjb6ubs52xx3vygf6fgdl611",
790791
"containerimage.config.digest": "sha256:2937f66a9722f7f4a2df583de2f8cb97fc9196059a410e7f00072fc918930e66",
791792
"containerimage.descriptor": {
@@ -801,6 +802,15 @@ examples: |-
801802
}
802803
```
803804
805+
> **Note**
806+
>
807+
> Build record [provenance](/build/attestations/slsa-provenance/#provenance-attestation-example)
808+
> (`buildx.build.provenance`) includes minimal provenance by default. Set the
809+
> `BUILDX_METADATA_PROVENANCE` environment variable to customize this behavior:
810+
> * `min` sets minimal provenance (default).
811+
> * `max` sets full provenance.
812+
> * `disabled`, `false` or `0` does not set any provenance.
813+
804814
### Ignore build cache for specific stages (--no-cache-filter) {#no-cache-filter}
805815
806816
The `--no-cache-filter` lets you specify one or more stages of a multi-stage
@@ -877,7 +887,7 @@ examples: |-
877887
```console
878888
$ docker buildx build -o . .
879889
$ docker buildx build -o outdir .
880-
$ docker buildx build -o - - > out.tar
890+
$ docker buildx build -o - . > out.tar
881891
$ docker buildx build -o type=docker .
882892
$ docker buildx build -o type=docker,dest=- . > myimage.tar
883893
$ docker buildx build -t tonistiigi/foo -o type=registry
@@ -1074,10 +1084,18 @@ examples: |-
10741084
--secret=[type=TYPE[,KEY=VALUE]
10751085
```
10761086
1077-
Exposes secret to the build. The secret can be used by the build using
1078-
[`RUN --mount=type=secret` mount](/reference/dockerfile/#run---mounttypesecret).
1087+
Exposes secrets (authentication credentials, tokens) to the build.
1088+
A secret can be mounted into the build using a `RUN --mount=type=secret` mount in the
1089+
[Dockerfile](/reference/dockerfile/#run---mounttypesecret).
1090+
For more information about how to use build secrets, see
1091+
[Build secrets](/build/building/secrets/).
1092+
1093+
Supported types are:
1094+
1095+
- [`file`](#file)
1096+
- [`env`](#env)
10791097
1080-
If `type` is unset it will be detected. Supported types are:
1098+
Buildx attempts to detect the `type` automatically if unset.
10811099
10821100
#### `file`
10831101

data/buildx/docker_buildx_debug_build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ options:
192192
swarm: false
193193
- option: iidfile
194194
value_type: string
195-
description: Write the image ID to the file
195+
description: Write the image ID to a file
196196
deprecated: false
197197
hidden: false
198198
experimental: false
@@ -250,7 +250,7 @@ options:
250250
swarm: false
251251
- option: metadata-file
252252
value_type: string
253-
description: Write build result metadata to the file
253+
description: Write build result metadata to a file
254254
deprecated: false
255255
hidden: false
256256
experimental: false

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ go 1.21
55
toolchain go1.21.1
66

77
require (
8-
github.com/docker/buildx v0.13.1 // indirect
9-
github.com/docker/cli v26.0.0+incompatible // indirect
8+
github.com/docker/buildx v0.14.0 // indirect
9+
github.com/docker/cli v26.0.1-0.20240410153731-b6c552212837+incompatible // indirect
1010
github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 // indirect
1111
github.com/docker/scout-cli v1.7.0 // indirect
1212
github.com/moby/buildkit v0.13.1 // indirect
1313
github.com/moby/moby v26.0.0+incompatible // indirect
1414
)
1515

1616
replace (
17-
github.com/docker/buildx => github.com/docker/buildx v0.13.1
17+
github.com/docker/buildx => github.com/docker/buildx v0.14.0
1818
github.com/docker/cli => github.com/docker/cli v26.0.0+incompatible
1919
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.26.1
2020
github.com/docker/scout-cli => github.com/docker/scout-cli v1.7.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ github.com/docker/buildx v0.13.1-0.20240307093612-37b7ad1465d2 h1:kuFvsZyZCYqxWB
6666
github.com/docker/buildx v0.13.1-0.20240307093612-37b7ad1465d2/go.mod h1:f2n6vggoX4sNNZ0XoRZ0Wtv6J1/rbDTabgdHtpW9NNM=
6767
github.com/docker/buildx v0.13.1 h1:uZjBcb477zh02tnHk0rqNV/DZOxbf/OiHw6Mc8OhDYU=
6868
github.com/docker/buildx v0.13.1/go.mod h1:f2n6vggoX4sNNZ0XoRZ0Wtv6J1/rbDTabgdHtpW9NNM=
69+
github.com/docker/buildx v0.14.0 h1:FxqcfE7xgeEC4oQlKLpuvfobRDVDXrHE3jByM+mdyqk=
70+
github.com/docker/buildx v0.14.0/go.mod h1:Vy/2lC9QsJvo33+7KKkN/GDE5WxnVqW0/dpcN7ZqPJY=
6971
github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM=
7072
github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
7173
github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw=

0 commit comments

Comments
 (0)