Skip to content

Commit 4e15a5a

Browse files
authored
Merge pull request #3968 from tonistiigi/vendor-buildkit-v0.32.0-rc1
vendor: update buildkit to v0.32.0-rc1
2 parents efd9aa1 + 9869706 commit 4e15a5a

466 files changed

Lines changed: 20302 additions & 16127 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build/policy_test.go

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ import (
99
"github.com/stretchr/testify/require"
1010
)
1111

12-
func boolPtr(v bool) *bool {
13-
return &v
14-
}
15-
16-
func levelPtr(v logrus.Level) *logrus.Level {
17-
return &v
18-
}
19-
2012
// TestWithPolicyConfigDefaults ensures default policy is returned when no configs are provided.
2113
func TestWithPolicyConfigDefaults(t *testing.T) {
2214
defaultPolicy := policyOpt{
@@ -46,12 +38,12 @@ func TestWithPolicyConfigDisabled(t *testing.T) {
4638
require.Error(t, err)
4739

4840
_, err = withPolicyConfig(policyOpt{}, []buildflags.PolicyConfig{
49-
{Disabled: true, Strict: boolPtr(true)},
41+
{Disabled: true, Strict: new(true)},
5042
})
5143
require.Error(t, err)
5244

5345
_, err = withPolicyConfig(policyOpt{}, []buildflags.PolicyConfig{
54-
{Disabled: true, LogLevel: levelPtr(logrus.WarnLevel)},
46+
{Disabled: true, LogLevel: new(logrus.WarnLevel)},
5547
})
5648
require.Error(t, err)
5749

@@ -91,7 +83,7 @@ func TestWithPolicyConfigStrictAndLogLevel(t *testing.T) {
9183
}
9284

9385
out, err := withPolicyConfig(defaultPolicy, []buildflags.PolicyConfig{
94-
{Strict: boolPtr(true), LogLevel: levelPtr(logrus.WarnLevel)},
86+
{Strict: new(true), LogLevel: new(logrus.WarnLevel)},
9587
})
9688
require.NoError(t, err)
9789
require.Len(t, out, 1)
@@ -103,7 +95,7 @@ func TestWithPolicyConfigStrictAndLogLevel(t *testing.T) {
10395
// TestWithPolicyConfigStrictIgnoredWithoutPolicy ensures strict without any policy produces no entries.
10496
func TestWithPolicyConfigStrictIgnoredWithoutPolicy(t *testing.T) {
10597
out, err := withPolicyConfig(policyOpt{}, []buildflags.PolicyConfig{
106-
{Strict: boolPtr(true)},
98+
{Strict: new(true)},
10799
})
108100
require.NoError(t, err)
109101
require.Len(t, out, 0)
@@ -117,8 +109,8 @@ func TestWithPolicyConfigMultipleFilesAndOverrides(t *testing.T) {
117109

118110
out, err := withPolicyConfig(defaultPolicy, []buildflags.PolicyConfig{
119111
{Files: []policy.File{{Filename: "a.rego"}}},
120-
{Strict: boolPtr(true), LogLevel: levelPtr(logrus.WarnLevel)},
121-
{Files: []policy.File{{Filename: "b.rego"}}, Strict: boolPtr(true)},
112+
{Strict: new(true), LogLevel: new(logrus.WarnLevel)},
113+
{Files: []policy.File{{Filename: "b.rego"}}, Strict: new(true)},
122114
})
123115
require.NoError(t, err)
124116
require.Len(t, out, 3)

commands/root.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,16 @@ func NewRootCmd(name string, isPlugin bool, dockerCli *command.DockerCli) *cobra
9191

9292
logrus.AddHook(logutil.NewFilter([]logrus.Level{
9393
logrus.DebugLevel,
94+
logrus.WarnLevel,
9495
},
9596
"serving grpc connection",
9697
"stopping session",
9798
"using default config store",
99+
// containerd's local content store probes fsverity support by trying to
100+
// enable it on a temp file, which fails on filesystems without fsverity
101+
// (overlayfs, tmpfs, etc.) and logs a warning. This is expected and not
102+
// actionable for oci-layout operations, so keep it out of user output.
103+
"failed check for fsverity support",
98104
))
99105

100106
addCommands(cmd, &opt, dockerCli)

go.mod

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
module github.com/docker/buildx
22

3-
go 1.25.9
3+
go 1.26.3
44

55
require (
66
github.com/Masterminds/semver/v3 v3.4.0
7-
github.com/Microsoft/go-winio v0.6.2
8-
github.com/ProtonMail/go-crypto v1.3.0
9-
github.com/aws/aws-sdk-go-v2/config v1.32.24
7+
github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29
8+
github.com/ProtonMail/go-crypto v1.4.1
9+
github.com/aws/aws-sdk-go-v2/config v1.32.31
1010
github.com/compose-spec/compose-go/v2 v2.13.0
1111
github.com/containerd/console v1.0.5
12-
github.com/containerd/containerd/v2 v2.2.5
12+
github.com/containerd/containerd/v2 v2.3.3
1313
github.com/containerd/continuity v0.5.0
1414
github.com/containerd/errdefs v1.0.0
1515
github.com/containerd/log v0.1.0
1616
github.com/containerd/platforms v1.0.0-rc.4
1717
github.com/creack/pty v1.1.24
1818
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1919
github.com/distribution/reference v0.6.0
20-
github.com/docker/cli v29.6.1+incompatible
20+
github.com/docker/cli v29.6.2+incompatible
2121
github.com/docker/cli-docs-tool v0.11.0
2222
github.com/docker/docker v28.5.2+incompatible
2323
github.com/docker/go-units v0.5.0
@@ -30,11 +30,11 @@ require (
3030
github.com/hashicorp/hcl/v2 v2.24.0
3131
github.com/in-toto/in-toto-golang v0.11.0
3232
github.com/mitchellh/hashstructure/v2 v2.0.2
33-
github.com/moby/buildkit v0.31.0
33+
github.com/moby/buildkit v0.32.0-rc1
3434
github.com/moby/go-archive v0.2.0
3535
github.com/moby/moby/api v1.55.0
3636
github.com/moby/moby/client v0.5.0
37-
github.com/moby/policy-helpers v0.0.0-20260612073044-d5411a945cfc
37+
github.com/moby/policy-helpers v0.0.0-20260722051018-856be88baec4
3838
github.com/moby/sys/atomicwriter v0.1.0
3939
github.com/moby/sys/mountinfo v0.7.2
4040
github.com/morikuni/aec v1.1.0
@@ -46,12 +46,12 @@ require (
4646
github.com/pkg/errors v0.9.1
4747
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10
4848
github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b
49-
github.com/sigstore/sigstore-go v1.2.1
49+
github.com/sigstore/sigstore-go v1.2.2
5050
github.com/sirupsen/logrus v1.9.4
5151
github.com/spf13/cobra v1.10.2
5252
github.com/spf13/pflag v1.0.10
5353
github.com/stretchr/testify v1.11.1
54-
github.com/tonistiigi/fsutil v0.0.0-20260609091201-0257b3308df4
54+
github.com/tonistiigi/fsutil v0.0.0-20260717003753-6d9dc2ebad62
5555
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0
5656
github.com/tonistiigi/jaeger-ui-rest v0.0.0-20250408171107-3dd17559e117
5757
github.com/zclconf/go-cty v1.17.0
@@ -62,19 +62,19 @@ require (
6262
go.opentelemetry.io/otel/sdk v1.44.0
6363
go.opentelemetry.io/otel/trace v1.44.0
6464
go.yaml.in/yaml/v3 v3.0.4
65-
golang.org/x/crypto v0.53.0
66-
golang.org/x/mod v0.37.0
67-
golang.org/x/sync v0.21.0
68-
golang.org/x/sys v0.46.0
69-
golang.org/x/term v0.44.0
70-
golang.org/x/text v0.38.0
65+
golang.org/x/crypto v0.54.0
66+
golang.org/x/mod v0.38.0
67+
golang.org/x/sync v0.22.0
68+
golang.org/x/sys v0.47.0
69+
golang.org/x/term v0.45.0
70+
golang.org/x/text v0.40.0
7171
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa
72-
google.golang.org/grpc v1.81.1
72+
google.golang.org/grpc v1.82.1
7373
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.1
74-
google.golang.org/protobuf v1.36.11
75-
k8s.io/api v0.35.4
76-
k8s.io/apimachinery v0.35.4
77-
k8s.io/client-go v0.35.4
74+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
75+
k8s.io/api v0.36.0
76+
k8s.io/apimachinery v0.36.0
77+
k8s.io/client-go v0.36.0
7878
)
7979

8080
require (
@@ -84,27 +84,27 @@ require (
8484
github.com/apparentlymart/go-cidr v1.0.1 // indirect
8585
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
8686
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
87-
github.com/aws/aws-sdk-go-v2 v1.42.0 // indirect
88-
github.com/aws/aws-sdk-go-v2/credentials v1.19.23 // indirect
89-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29 // indirect
90-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 // indirect
91-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 // indirect
92-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 // indirect
93-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 // indirect
94-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 // indirect
95-
github.com/aws/aws-sdk-go-v2/service/signin v1.1.5 // indirect
96-
github.com/aws/aws-sdk-go-v2/service/sso v1.31.3 // indirect
97-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6 // indirect
98-
github.com/aws/aws-sdk-go-v2/service/sts v1.43.3 // indirect
99-
github.com/aws/smithy-go v1.27.2 // indirect
87+
github.com/aws/aws-sdk-go-v2 v1.43.0 // indirect
88+
github.com/aws/aws-sdk-go-v2/credentials v1.19.30 // indirect
89+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.31 // indirect
90+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.31 // indirect
91+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.31 // indirect
92+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.32 // indirect
93+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13 // indirect
94+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.31 // indirect
95+
github.com/aws/aws-sdk-go-v2/service/signin v1.5.0 // indirect
96+
github.com/aws/aws-sdk-go-v2/service/sso v1.33.0 // indirect
97+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.38.0 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/sts v1.45.0 // indirect
99+
github.com/aws/smithy-go v1.27.4 // indirect
100100
github.com/blang/semver v3.5.1+incompatible // indirect
101101
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
102102
github.com/cespare/xxhash/v2 v2.3.0 // indirect
103103
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
104104
github.com/cloudflare/circl v1.6.3 // indirect
105-
github.com/containerd/containerd/api v1.10.0 // indirect
105+
github.com/containerd/containerd/api v1.11.1 // indirect
106106
github.com/containerd/errdefs/pkg v0.3.0 // indirect
107-
github.com/containerd/ttrpc v1.2.8 // indirect
107+
github.com/containerd/ttrpc v1.2.9 // indirect
108108
github.com/containerd/typeurl/v2 v2.3.0 // indirect
109109
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
110110
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
@@ -120,33 +120,33 @@ require (
120120
github.com/go-logr/logr v1.4.3 // indirect
121121
github.com/go-logr/stdr v1.2.2 // indirect
122122
github.com/go-openapi/analysis v0.25.2 // indirect
123-
github.com/go-openapi/errors v0.22.7 // indirect
123+
github.com/go-openapi/errors v0.22.8 // indirect
124124
github.com/go-openapi/jsonpointer v0.23.1 // indirect
125125
github.com/go-openapi/jsonreference v0.21.6 // indirect
126-
github.com/go-openapi/loads v0.23.3 // indirect
127-
github.com/go-openapi/runtime v0.32.3 // indirect
126+
github.com/go-openapi/loads v0.24.0 // indirect
127+
github.com/go-openapi/runtime v0.32.4 // indirect
128128
github.com/go-openapi/runtime/server-middleware v0.30.0 // indirect
129-
github.com/go-openapi/spec v0.22.5 // indirect
130-
github.com/go-openapi/strfmt v0.26.3 // indirect
131-
github.com/go-openapi/swag v0.26.0 // indirect
132-
github.com/go-openapi/swag/cmdutils v0.26.0 // indirect
133-
github.com/go-openapi/swag/conv v0.26.0 // indirect
134-
github.com/go-openapi/swag/fileutils v0.26.0 // indirect
135-
github.com/go-openapi/swag/jsonname v0.26.0 // indirect
136-
github.com/go-openapi/swag/jsonutils v0.26.0 // indirect
137-
github.com/go-openapi/swag/loading v0.26.0 // indirect
138-
github.com/go-openapi/swag/mangling v0.26.0 // indirect
139-
github.com/go-openapi/swag/netutils v0.26.0 // indirect
140-
github.com/go-openapi/swag/stringutils v0.26.0 // indirect
141-
github.com/go-openapi/swag/typeutils v0.26.0 // indirect
142-
github.com/go-openapi/swag/yamlutils v0.26.0 // indirect
143-
github.com/go-openapi/validate v0.25.3 // indirect
129+
github.com/go-openapi/spec v0.22.6 // indirect
130+
github.com/go-openapi/strfmt v0.26.4 // indirect
131+
github.com/go-openapi/swag v0.26.1 // indirect
132+
github.com/go-openapi/swag/cmdutils v0.26.1 // indirect
133+
github.com/go-openapi/swag/conv v0.27.0 // indirect
134+
github.com/go-openapi/swag/fileutils v0.26.1 // indirect
135+
github.com/go-openapi/swag/jsonname v0.26.1 // indirect
136+
github.com/go-openapi/swag/jsonutils v0.26.1 // indirect
137+
github.com/go-openapi/swag/loading v0.26.1 // indirect
138+
github.com/go-openapi/swag/mangling v0.26.1 // indirect
139+
github.com/go-openapi/swag/netutils v0.26.1 // indirect
140+
github.com/go-openapi/swag/stringutils v0.26.1 // indirect
141+
github.com/go-openapi/swag/typeutils v0.27.0 // indirect
142+
github.com/go-openapi/swag/yamlutils v0.26.1 // indirect
143+
github.com/go-openapi/validate v0.26.0 // indirect
144144
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
145145
github.com/gobwas/glob v0.2.3 // indirect
146146
github.com/goccy/go-json v0.10.5 // indirect
147147
github.com/google/certificate-transparency-go v1.3.3 // indirect
148148
github.com/google/go-cmp v0.7.0 // indirect
149-
github.com/google/go-containerregistry v0.21.6 // indirect
149+
github.com/google/go-containerregistry v0.21.7 // indirect
150150
github.com/gorilla/mux v1.8.1 // indirect
151151
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
152152
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
@@ -155,7 +155,7 @@ require (
155155
github.com/in-toto/attestation v1.2.0 // indirect
156156
github.com/inconshreveable/mousetrap v1.1.0 // indirect
157157
github.com/json-iterator/go v1.1.12 // indirect
158-
github.com/klauspost/compress v1.18.6 // indirect
158+
github.com/klauspost/compress v1.19.1 // indirect
159159
github.com/lestrrat-go/blackmagic v1.0.4 // indirect
160160
github.com/lestrrat-go/dsig v1.0.0 // indirect
161161
github.com/lestrrat-go/dsig-secp256k1 v1.0.0 // indirect
@@ -172,13 +172,12 @@ require (
172172
github.com/moby/spdystream v0.5.1 // indirect
173173
github.com/moby/sys/sequential v0.7.0 // indirect
174174
github.com/moby/sys/signal v0.7.1 // indirect
175-
github.com/moby/sys/user v0.4.0 // indirect
175+
github.com/moby/sys/user v0.4.1 // indirect
176176
github.com/moby/sys/userns v0.1.0 // indirect
177177
github.com/moby/term v0.5.2 // indirect
178178
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
179179
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
180180
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
181-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
182181
github.com/oklog/ulid/v2 v2.1.1 // indirect
183182
github.com/package-url/packageurl-go v0.1.1 // indirect
184183
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -189,8 +188,8 @@ require (
189188
github.com/segmentio/asm v1.2.1 // indirect
190189
github.com/shibumi/go-pathspec v1.3.0 // indirect
191190
github.com/sigstore/protobuf-specs v0.5.1 // indirect
192-
github.com/sigstore/rekor v1.5.2 // indirect
193-
github.com/sigstore/rekor-tiles/v2 v2.2.2-0.20260601073857-5d098a2b6443 // indirect
191+
github.com/sigstore/rekor v1.5.3 // indirect
192+
github.com/sigstore/rekor-tiles/v2 v2.3.0 // indirect
194193
github.com/sigstore/sigstore v1.10.8 // indirect
195194
github.com/sigstore/timestamp-authority/v2 v2.1.2 // indirect
196195
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
@@ -220,19 +219,20 @@ require (
220219
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
221220
go.yaml.in/yaml/v2 v2.4.4 // indirect
222221
go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect
223-
golang.org/x/net v0.56.0 // indirect
222+
golang.org/x/net v0.57.0 // indirect
224223
golang.org/x/oauth2 v0.36.0 // indirect
225224
golang.org/x/time v0.15.0 // indirect
226-
golang.org/x/tools v0.46.0 // indirect
225+
golang.org/x/tools v0.47.0 // indirect
227226
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
228227
gopkg.in/inf.v0 v0.9.1 // indirect
229228
gopkg.in/yaml.v3 v3.0.1 // indirect
230229
k8s.io/klog/v2 v2.140.0 // indirect
231-
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
232-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
230+
k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9 // indirect
231+
k8s.io/streaming v0.36.0 // indirect
232+
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 // indirect
233233
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
234234
sigs.k8s.io/randfill v1.0.0 // indirect
235-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
235+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
236236
sigs.k8s.io/yaml v1.6.0 // indirect
237237
)
238238

0 commit comments

Comments
 (0)