Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update buildx reference to v0.21.0 #22058

Merged
merged 2 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions _vendor/github.com/docker/buildx/docs/bake-reference.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions _vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# github.com/moby/moby v27.5.1+incompatible
# github.com/moby/buildkit v0.19.0
# github.com/docker/buildx v0.20.1
# github.com/docker/cli v27.5.1+incompatible
# github.com/moby/buildkit v0.20.0
# github.com/docker/buildx v0.21.0
# github.com/docker/cli v28.0.0-rc.2+incompatible
# github.com/docker/compose/v2 v2.33.0
# github.com/docker/scout-cli v1.15.0
16 changes: 16 additions & 0 deletions content/reference/cli/docker/buildx/history/trace.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
datafolder: buildx
datafile: docker_buildx_history_trace
title: docker buildx history trace
layout: cli
aliases:
- /engine/reference/commandline/buildx_history_trace/
---

<!--
This page is automatically generated from Docker's source code. If you want to
suggest a change to the text that appears here, open a ticket or pull request
in the source repository on GitHub:

https://github.com/docker/buildx
-->
2 changes: 1 addition & 1 deletion data/buildx/docker_buildx_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ options:
kubernetes: false
swarm: false
- option: allow
value_type: stringSlice
value_type: stringArray
default_value: '[]'
description: |
Allow extra privileged entitlement (e.g., `network.host`, `security.insecure`)
Expand Down
2 changes: 1 addition & 1 deletion data/buildx/docker_buildx_debug_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ options:
kubernetes: false
swarm: false
- option: allow
value_type: stringSlice
value_type: stringArray
default_value: '[]'
description: |
Allow extra privileged entitlement (e.g., `network.host`, `security.insecure`)
Expand Down
2 changes: 2 additions & 0 deletions data/buildx/docker_buildx_history.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ cname:
- docker buildx history ls
- docker buildx history open
- docker buildx history rm
- docker buildx history trace
clink:
- docker_buildx_history_inspect.yaml
- docker_buildx_history_logs.yaml
- docker_buildx_history_ls.yaml
- docker_buildx_history_open.yaml
- docker_buildx_history_rm.yaml
- docker_buildx_history_trace.yaml
inherited_options:
- option: builder
value_type: string
Expand Down
105 changes: 105 additions & 0 deletions data/buildx/docker_buildx_history_inspect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@ cname:
- docker buildx history inspect attachment
clink:
- docker_buildx_history_inspect_attachment.yaml
options:
- option: format
value_type: string
default_value: pretty
description: Format the output
details_url: '#format'
deprecated: false
hidden: false
experimental: false
experimentalcli: false
kubernetes: false
swarm: false
inherited_options:
- option: builder
value_type: string
Expand All @@ -29,6 +41,99 @@ inherited_options:
experimentalcli: false
kubernetes: false
swarm: false
examples: |-
### Format the output (--format) {#format}

The formatting options (`--format`) pretty-prints the output to `pretty` (default),
`json` or using a Go template.

```console
$ docker buildx history inspect
Name: buildx (binaries)
Context: .
Dockerfile: Dockerfile
VCS Repository: https://github.com/crazy-max/buildx.git
VCS Revision: f15eaa1ee324ffbbab29605600d27a84cab86361
Target: binaries
Platforms: linux/amd64
Keep Git Dir: true

Started: 2025-02-07 11:56:24
Duration: 1m 1s
Build Steps: 16/16 (25% cached)

Image Resolve Mode: local

Materials:
URI DIGEST
pkg:docker/docker/dockerfile@1 sha256:93bfd3b68c109427185cd78b4779fc82b484b0b7618e36d0f104d4d801e66d25
pkg:docker/[email protected]?platform=linux%2Famd64 sha256:2c49857f2295e89b23b28386e57e018a86620a8fede5003900f2d138ba9c4037
pkg:docker/tonistiigi/[email protected]?platform=linux%2Famd64 sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3

Attachments:
DIGEST PLATFORM TYPE
sha256:217329d2af959d4f02e3a96dcbe62bf100cab1feb8006a047ddfe51a5397f7e3 https://slsa.dev/provenance/v0.2

Print build logs: docker buildx history logs g9808bwrjrlkbhdamxklx660b
```

```console
$ docker buildx history inspect --format json
{
"Name": "buildx (binaries)",
"Ref": "5w7vkqfi0rf59hw4hnmn627r9",
"Context": ".",
"Dockerfile": "Dockerfile",
"VCSRepository": "https://github.com/crazy-max/buildx.git",
"VCSRevision": "f15eaa1ee324ffbbab29605600d27a84cab86361",
"Target": "binaries",
"Platform": [
"linux/amd64"
],
"KeepGitDir": true,
"StartedAt": "2025-02-07T12:01:05.75807272+01:00",
"CompletedAt": "2025-02-07T12:02:07.991778875+01:00",
"Duration": 62233706155,
"Status": "completed",
"NumCompletedSteps": 16,
"NumTotalSteps": 16,
"NumCachedSteps": 4,
"Config": {
"ImageResolveMode": "local"
},
"Materials": [
{
"URI": "pkg:docker/docker/dockerfile@1",
"Digests": [
"sha256:93bfd3b68c109427185cd78b4779fc82b484b0b7618e36d0f104d4d801e66d25"
]
},
{
"URI": "pkg:docker/[email protected]?platform=linux%2Famd64",
"Digests": [
"sha256:2c49857f2295e89b23b28386e57e018a86620a8fede5003900f2d138ba9c4037"
]
},
{
"URI": "pkg:docker/tonistiigi/[email protected]?platform=linux%2Famd64",
"Digests": [
"sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3"
]
}
],
"Attachments": [
{
"Digest": "sha256:450fdd2e6b868fecd69e9891c2c404ba461aa38a47663b4805edeb8d2baf80b1",
"Type": "https://slsa.dev/provenance/v0.2"
}
]
}
```

```console
$ docker buildx history inspect --format "{{.Name}}: {{.VCSRepository}} ({{.VCSRevision}})"
buildx (binaries): https://github.com/crazy-max/buildx.git (f15eaa1ee324ffbbab29605600d27a84cab86361)
```
deprecated: false
hidden: false
experimental: false
Expand Down
54 changes: 54 additions & 0 deletions data/buildx/docker_buildx_history_trace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
command: docker buildx history trace
short: Show the OpenTelemetry trace of a build record
long: Show the OpenTelemetry trace of a build record
usage: docker buildx history trace [OPTIONS] [REF]
pname: docker buildx history
plink: docker_buildx_history.yaml
options:
- option: addr
value_type: string
default_value: 127.0.0.1:0
description: Address to bind the UI server
deprecated: false
hidden: false
experimental: false
experimentalcli: false
kubernetes: false
swarm: false
- option: compare
value_type: string
description: Compare with another build reference
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

8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ module github.com/docker/docs
go 1.23.1

require (
github.com/docker/buildx v0.20.1 // indirect
github.com/docker/cli v27.5.1+incompatible // indirect
github.com/docker/buildx v0.21.0 // indirect
github.com/docker/cli v28.0.0-rc.2+incompatible // indirect
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change is related to docker/buildx#2996 (comment) but the replace directive avoid vendoring this RC so we are safe here.

github.com/docker/compose/v2 v2.33.0 // indirect
github.com/docker/scout-cli v1.15.0 // indirect
github.com/moby/buildkit v0.19.0 // indirect
github.com/moby/buildkit v0.20.0 // indirect
github.com/moby/moby v27.5.1+incompatible // indirect
)

replace (
github.com/docker/buildx => github.com/docker/buildx v0.20.1
github.com/docker/buildx => github.com/docker/buildx v0.21.0
github.com/docker/cli => github.com/docker/cli v27.5.1+incompatible
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.32.4
github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ github.com/docker/buildx v0.20.0 h1:XM2EvwEfohbxLPAheVm03biNHpspB/dA6U9F0c6yJsI=
github.com/docker/buildx v0.20.0/go.mod h1:VVi4Nvo4jd/IkRvwyExbIyW7u82fivK61MRx5I0oKic=
github.com/docker/buildx v0.20.1 h1:q88EfoYwrWEKVqNb9stOFq8fUlFp/OPlDcFE+QUYZBM=
github.com/docker/buildx v0.20.1/go.mod h1:VVi4Nvo4jd/IkRvwyExbIyW7u82fivK61MRx5I0oKic=
github.com/docker/buildx v0.21.0 h1:cp++wh60cjMraq8VXM59jV1aolR3eFIkCx1Z7o5Q2ZY=
github.com/docker/buildx v0.21.0/go.mod h1:8V4UMnlKsaGYwz83BygmIbJIFEAYGHT6KAv8akDZmqo=
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=
Expand Down
Loading