Skip to content

Commit 98e1ebf

Browse files
crazy-maxcrazy-max
authored
Merge pull request #22058 from docker-tools-robot/dispatch/buildx-ref-v0.21.0
Update buildx reference to v0.21.0
2 parents 9bfe7ad + 54c2a9c commit 98e1ebf

File tree

10 files changed

+218
-29
lines changed

10 files changed

+218
-29
lines changed

‎_vendor/github.com/docker/buildx/docs/bake-reference.md‎

Lines changed: 30 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/modules.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# github.com/moby/moby v27.5.1+incompatible
2-
# github.com/moby/buildkit v0.19.0
3-
# github.com/docker/buildx v0.20.1
4-
# github.com/docker/cli v27.5.1+incompatible
2+
# github.com/moby/buildkit v0.20.0
3+
# github.com/docker/buildx v0.21.0
4+
# github.com/docker/cli v28.0.0-rc.2+incompatible
55
# github.com/docker/compose/v2 v2.33.0
66
# github.com/docker/scout-cli v1.15.0

‎content/reference/cli/docker/buildx/history/trace.md‎

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_trace
4+
title: docker buildx history trace
5+
layout: cli
6+
aliases:
7+
- /engine/reference/commandline/buildx_history_trace/
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_build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ options:
1818
kubernetes: false
1919
swarm: false
2020
- option: allow
21-
value_type: stringSlice
21+
value_type: stringArray
2222
default_value: '[]'
2323
description: |
2424
Allow extra privileged entitlement (e.g., `network.host`, `security.insecure`)

‎data/buildx/docker_buildx_debug_build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ options:
1717
kubernetes: false
1818
swarm: false
1919
- option: allow
20-
value_type: stringSlice
20+
value_type: stringArray
2121
default_value: '[]'
2222
description: |
2323
Allow extra privileged entitlement (e.g., `network.host`, `security.insecure`)

‎data/buildx/docker_buildx_history.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ cname:
1010
- docker buildx history ls
1111
- docker buildx history open
1212
- docker buildx history rm
13+
- docker buildx history trace
1314
clink:
1415
- docker_buildx_history_inspect.yaml
1516
- docker_buildx_history_logs.yaml
1617
- docker_buildx_history_ls.yaml
1718
- docker_buildx_history_open.yaml
1819
- docker_buildx_history_rm.yaml
20+
- docker_buildx_history_trace.yaml
1921
inherited_options:
2022
- option: builder
2123
value_type: string

‎data/buildx/docker_buildx_history_inspect.yaml‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ cname:
88
- docker buildx history inspect attachment
99
clink:
1010
- docker_buildx_history_inspect_attachment.yaml
11+
options:
12+
- option: format
13+
value_type: string
14+
default_value: pretty
15+
description: Format the output
16+
details_url: '#format'
17+
deprecated: false
18+
hidden: false
19+
experimental: false
20+
experimentalcli: false
21+
kubernetes: false
22+
swarm: false
1123
inherited_options:
1224
- option: builder
1325
value_type: string
@@ -29,6 +41,99 @@ inherited_options:
2941
experimentalcli: false
3042
kubernetes: false
3143
swarm: false
44+
examples: |-
45+
### Format the output (--format) {#format}
46+
47+
The formatting options (`--format`) pretty-prints the output to `pretty` (default),
48+
`json` or using a Go template.
49+
50+
```console
51+
$ docker buildx history inspect
52+
Name: buildx (binaries)
53+
Context: .
54+
Dockerfile: Dockerfile
55+
VCS Repository: https://github.com/crazy-max/buildx.git
56+
VCS Revision: f15eaa1ee324ffbbab29605600d27a84cab86361
57+
Target: binaries
58+
Platforms: linux/amd64
59+
Keep Git Dir: true
60+
61+
Started: 2025-02-07 11:56:24
62+
Duration: 1m 1s
63+
Build Steps: 16/16 (25% cached)
64+
65+
Image Resolve Mode: local
66+
67+
Materials:
68+
URI DIGEST
69+
pkg:docker/docker/dockerfile@1 sha256:93bfd3b68c109427185cd78b4779fc82b484b0b7618e36d0f104d4d801e66d25
70+
pkg:docker/[email protected]?platform=linux%2Famd64 sha256:2c49857f2295e89b23b28386e57e018a86620a8fede5003900f2d138ba9c4037
71+
pkg:docker/tonistiigi/[email protected]?platform=linux%2Famd64 sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3
72+
73+
Attachments:
74+
DIGEST PLATFORM TYPE
75+
sha256:217329d2af959d4f02e3a96dcbe62bf100cab1feb8006a047ddfe51a5397f7e3 https://slsa.dev/provenance/v0.2
76+
77+
Print build logs: docker buildx history logs g9808bwrjrlkbhdamxklx660b
78+
```
79+
80+
```console
81+
$ docker buildx history inspect --format json
82+
{
83+
"Name": "buildx (binaries)",
84+
"Ref": "5w7vkqfi0rf59hw4hnmn627r9",
85+
"Context": ".",
86+
"Dockerfile": "Dockerfile",
87+
"VCSRepository": "https://github.com/crazy-max/buildx.git",
88+
"VCSRevision": "f15eaa1ee324ffbbab29605600d27a84cab86361",
89+
"Target": "binaries",
90+
"Platform": [
91+
"linux/amd64"
92+
],
93+
"KeepGitDir": true,
94+
"StartedAt": "2025-02-07T12:01:05.75807272+01:00",
95+
"CompletedAt": "2025-02-07T12:02:07.991778875+01:00",
96+
"Duration": 62233706155,
97+
"Status": "completed",
98+
"NumCompletedSteps": 16,
99+
"NumTotalSteps": 16,
100+
"NumCachedSteps": 4,
101+
"Config": {
102+
"ImageResolveMode": "local"
103+
},
104+
"Materials": [
105+
{
106+
"URI": "pkg:docker/docker/dockerfile@1",
107+
"Digests": [
108+
"sha256:93bfd3b68c109427185cd78b4779fc82b484b0b7618e36d0f104d4d801e66d25"
109+
]
110+
},
111+
{
112+
"URI": "pkg:docker/[email protected]?platform=linux%2Famd64",
113+
"Digests": [
114+
"sha256:2c49857f2295e89b23b28386e57e018a86620a8fede5003900f2d138ba9c4037"
115+
]
116+
},
117+
{
118+
"URI": "pkg:docker/tonistiigi/[email protected]?platform=linux%2Famd64",
119+
"Digests": [
120+
"sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3"
121+
]
122+
}
123+
],
124+
"Attachments": [
125+
{
126+
"Digest": "sha256:450fdd2e6b868fecd69e9891c2c404ba461aa38a47663b4805edeb8d2baf80b1",
127+
"Type": "https://slsa.dev/provenance/v0.2"
128+
}
129+
]
130+
}
131+
```
132+
133+
```console
134+
$ docker buildx history inspect --format "{{.Name}}: {{.VCSRepository}} ({{.VCSRevision}})"
135+
buildx (binaries): https://github.com/crazy-max/buildx.git (f15eaa1ee324ffbbab29605600d27a84cab86361)
136+
```
32137
deprecated: false
33138
hidden: false
34139
experimental: false

‎data/buildx/docker_buildx_history_trace.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
command: docker buildx history trace
2+
short: Show the OpenTelemetry trace of a build record
3+
long: Show the OpenTelemetry trace of a build record
4+
usage: docker buildx history trace [OPTIONS] [REF]
5+
pname: docker buildx history
6+
plink: docker_buildx_history.yaml
7+
options:
8+
- option: addr
9+
value_type: string
10+
default_value: 127.0.0.1:0
11+
description: Address to bind the UI server
12+
deprecated: false
13+
hidden: false
14+
experimental: false
15+
experimentalcli: false
16+
kubernetes: false
17+
swarm: false
18+
- option: compare
19+
value_type: string
20+
description: Compare with another build reference
21+
deprecated: false
22+
hidden: false
23+
experimental: false
24+
experimentalcli: false
25+
kubernetes: false
26+
swarm: false
27+
inherited_options:
28+
- option: builder
29+
value_type: string
30+
description: Override the configured builder instance
31+
deprecated: false
32+
hidden: false
33+
experimental: false
34+
experimentalcli: false
35+
kubernetes: false
36+
swarm: false
37+
- option: debug
38+
shorthand: D
39+
value_type: bool
40+
default_value: "false"
41+
description: Enable debug logging
42+
deprecated: false
43+
hidden: false
44+
experimental: false
45+
experimentalcli: false
46+
kubernetes: false
47+
swarm: false
48+
deprecated: false
49+
hidden: false
50+
experimental: false
51+
experimentalcli: false
52+
kubernetes: false
53+
swarm: false
54+

‎go.mod‎

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

55
require (
6-
github.com/docker/buildx v0.20.1 // indirect
7-
github.com/docker/cli v27.5.1+incompatible // indirect
6+
github.com/docker/buildx v0.21.0 // indirect
7+
github.com/docker/cli v28.0.0-rc.2+incompatible // indirect
88
github.com/docker/compose/v2 v2.33.0 // indirect
99
github.com/docker/scout-cli v1.15.0 // indirect
10-
github.com/moby/buildkit v0.19.0 // indirect
10+
github.com/moby/buildkit v0.20.0 // indirect
1111
github.com/moby/moby v27.5.1+incompatible // indirect
1212
)
1313

1414
replace (
15-
github.com/docker/buildx => github.com/docker/buildx v0.20.1
15+
github.com/docker/buildx => github.com/docker/buildx v0.21.0
1616
github.com/docker/cli => github.com/docker/cli v27.5.1+incompatible
1717
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.32.4
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
@@ -92,6 +92,8 @@ github.com/docker/buildx v0.20.0 h1:XM2EvwEfohbxLPAheVm03biNHpspB/dA6U9F0c6yJsI=
9292
github.com/docker/buildx v0.20.0/go.mod h1:VVi4Nvo4jd/IkRvwyExbIyW7u82fivK61MRx5I0oKic=
9393
github.com/docker/buildx v0.20.1 h1:q88EfoYwrWEKVqNb9stOFq8fUlFp/OPlDcFE+QUYZBM=
9494
github.com/docker/buildx v0.20.1/go.mod h1:VVi4Nvo4jd/IkRvwyExbIyW7u82fivK61MRx5I0oKic=
95+
github.com/docker/buildx v0.21.0 h1:cp++wh60cjMraq8VXM59jV1aolR3eFIkCx1Z7o5Q2ZY=
96+
github.com/docker/buildx v0.21.0/go.mod h1:8V4UMnlKsaGYwz83BygmIbJIFEAYGHT6KAv8akDZmqo=
9597
github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM=
9698
github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
9799
github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw=

0 commit comments

Comments
 (0)