Skip to content

Commit 40ad998

Browse files
eriknordmarkclaude
eriknordmark
and
claude
authored
src/cmd/linuxkit: update buildkit to v0.31.1 (#4222)
* pkglib: use SolveOpt.LocalMounts instead of LocalDirs Package builds hand buildkit the package directory as the Dockerfile and build-context local mounts. They were passed as plain paths through the deprecated SolveOpt.LocalDirs field, which buildkit removed in v0.30.0 in favour of SolveOpt.LocalMounts. Wrap each path in an fsutil filesystem and pass it as a local mount instead, which is what buildkit did internally for LocalDirs entries before dropping the field. No behaviour change against the currently pinned buildkit v0.29.0, where both fields exist; this only removes the barrier to moving past v0.29.0. Signed-off-by: eriknordmark <erik@zededa.com> Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * src/cmd/linuxkit: update buildkit to v0.31.1 Moves the vendored buildkit client from v0.29.0 to v0.31.1, which carries the two low-severity fixes in that patch release (GHSA-7236-3392-c5c6, a custom frontend bypassing Seccomp/AppArmor restrictions, and GHSA-72x6-4j93-7w86, a runtime DoS via unbounded group parsing). Anything past v0.29.0 needs SolveOpt.LocalMounts, which the preceding commit switched to. go mod tidy pulls a matching round of transitive updates -- docker/cli, go-containerregistry, containerd, sigstore and the OpenTelemetry set are the visible ones -- and raises the go directive to 1.25.9. It also retires the vendored golang.org/x/net/context copy, unused since gcp moved to the standard library context. Signed-off-by: eriknordmark <erik@zededa.com> Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Signed-off-by: eriknordmark <erik@zededa.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
1 parent 7ff9172 commit 40ad998

647 files changed

Lines changed: 33717 additions & 66038 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.

‎src/cmd/linuxkit/go.mod‎

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/linuxkit/linuxkit/src/cmd/linuxkit
22

3-
go 1.25.5
3+
go 1.25.9
44

55
require (
66
github.com/Azure/azure-sdk-for-go v56.3.0+incompatible
@@ -11,15 +11,15 @@ require (
1111
github.com/Microsoft/go-winio v0.6.2
1212
github.com/ScaleFT/sshkeys v0.0.0-20181112160850-82451a803681
1313
github.com/aws/aws-sdk-go v1.44.82
14-
github.com/docker/cli v29.3.1+incompatible
14+
github.com/docker/cli v29.5.3+incompatible
1515
github.com/docker/docker v28.5.2+incompatible
1616
github.com/docker/go-units v0.5.0
17-
github.com/google/go-containerregistry v0.20.7
17+
github.com/google/go-containerregistry v0.21.6
1818
github.com/google/uuid v1.6.0
1919
github.com/gophercloud/gophercloud v0.1.0
2020
github.com/gophercloud/utils v0.0.0-20181029231510-34f5991525d1
2121
github.com/klauspost/pgzip v1.2.5
22-
github.com/moby/buildkit v0.29.0
22+
github.com/moby/buildkit v0.31.1
2323
github.com/moby/hyperkit v0.0.0-20180416161519-d65b09c1c28a
2424
//github.com/moby/moby v20.10.3-0.20220728162118-71cb54cec41e+incompatible // indirect
2525
github.com/moby/term v0.5.2
@@ -37,27 +37,28 @@ require (
3737
github.com/surma/gocpio v1.0.2-0.20160926205914-fcb68777e7dc
3838
github.com/vmware/govmomi v0.20.3
3939
github.com/xeipuuv/gojsonschema v1.2.0
40-
golang.org/x/crypto v0.48.0
41-
golang.org/x/net v0.51.0
42-
golang.org/x/oauth2 v0.34.0
43-
golang.org/x/sync v0.19.0
44-
golang.org/x/sys v0.42.0
45-
golang.org/x/term v0.41.0
40+
golang.org/x/crypto v0.52.0
41+
golang.org/x/net v0.55.0 // indirect
42+
golang.org/x/oauth2 v0.36.0
43+
golang.org/x/sync v0.20.0
44+
golang.org/x/sys v0.45.0
45+
golang.org/x/term v0.43.0
4646
google.golang.org/api v0.149.0
4747
gopkg.in/yaml.v2 v2.4.0
4848
)
4949

5050
require (
5151
github.com/Code-Hex/vz/v3 v3.0.0
52-
github.com/containerd/containerd/v2 v2.2.2
53-
github.com/containerd/platforms v1.0.0-rc.2
52+
github.com/containerd/containerd/v2 v2.2.4
53+
github.com/containerd/platforms v1.0.0-rc.4
5454
github.com/docker/buildx v0.21.1
5555
github.com/equinix/equinix-sdk-go v0.42.0
5656
github.com/hashicorp/go-version v1.7.0
57-
github.com/in-toto/in-toto-golang v0.10.0
57+
github.com/in-toto/in-toto-golang v0.11.0
5858
github.com/moby/sys/capability v0.4.0
5959
github.com/spdx/tools-golang v0.5.7
6060
github.com/spf13/cobra v1.10.2
61+
github.com/tonistiigi/fsutil v0.0.0-20260609091201-0257b3308df4
6162
gopkg.in/yaml.v3 v3.0.1
6263
)
6364

@@ -74,26 +75,23 @@ require (
7475
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7576
github.com/containerd/console v1.0.5 // indirect
7677
github.com/containerd/containerd/api v1.10.0 // indirect
77-
github.com/containerd/continuity v0.4.5 // indirect
78+
github.com/containerd/continuity v0.5.0 // indirect
7879
github.com/containerd/errdefs v1.0.0 // indirect
7980
github.com/containerd/errdefs/pkg v0.3.0 // indirect
8081
github.com/containerd/log v0.1.0 // indirect
81-
github.com/containerd/stargz-snapshotter/estargz v0.18.2 // indirect
8282
github.com/containerd/ttrpc v1.2.8 // indirect
83-
github.com/containerd/typeurl/v2 v2.2.3 // indirect
83+
github.com/containerd/typeurl/v2 v2.3.0 // indirect
8484
github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d // indirect
8585
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8686
github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect
8787
github.com/distribution/reference v0.6.0 // indirect
88-
github.com/docker/distribution v2.8.3+incompatible // indirect
89-
github.com/docker/docker-credential-helpers v0.9.5 // indirect
90-
github.com/docker/go-connections v0.6.0 // indirect
88+
github.com/docker/docker-credential-helpers v0.9.8 // indirect
89+
github.com/docker/go-connections v0.7.0 // indirect
9190
github.com/felixge/httpsnoop v1.0.4 // indirect
9291
github.com/fvbommel/sortorder v1.0.1 // indirect
9392
github.com/go-logr/logr v1.4.3 // indirect
9493
github.com/go-logr/stdr v1.2.2 // indirect
9594
github.com/gofrs/flock v0.13.0 // indirect
96-
github.com/gogo/protobuf v1.3.2 // indirect
9795
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
9896
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
9997
github.com/golang/protobuf v1.5.4 // indirect
@@ -103,66 +101,65 @@ require (
103101
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
104102
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
105103
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
106-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
104+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
107105
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
108-
github.com/in-toto/attestation v1.1.2 // indirect
106+
github.com/in-toto/attestation v1.2.0 // indirect
109107
github.com/inconshreveable/mousetrap v1.1.0 // indirect
110108
github.com/jmespath/go-jmespath v0.4.0 // indirect
111-
github.com/klauspost/compress v1.18.5 // indirect
109+
github.com/klauspost/compress v1.18.6 // indirect
112110
github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3 // indirect
113111
github.com/mattn/go-runewidth v0.0.15 // indirect
114-
github.com/mitchellh/go-homedir v1.1.0 // indirect
115112
github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b // indirect
116113
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
117114
github.com/moby/docker-image-spec v1.3.1 // indirect
115+
github.com/moby/go-archive v0.2.0 // indirect
118116
github.com/moby/locker v1.0.1 // indirect
119-
github.com/moby/moby/api v1.54.1 // indirect
120-
github.com/moby/moby/client v0.4.0 // indirect
117+
github.com/moby/moby/api v1.54.2 // indirect
118+
github.com/moby/moby/client v0.4.1 // indirect
121119
github.com/moby/patternmatcher v0.6.1 // indirect
122120
github.com/moby/sys/atomicwriter v0.1.0 // indirect
123-
github.com/moby/sys/sequential v0.6.0 // indirect
121+
github.com/moby/sys/sequential v0.7.0 // indirect
124122
github.com/moby/sys/signal v0.7.1 // indirect
125123
github.com/morikuni/aec v1.1.0 // indirect
126124
github.com/opencontainers/go-digest v1.0.0 // indirect
127125
github.com/pelletier/go-toml v1.9.5 // indirect
128-
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
126+
github.com/pelletier/go-toml/v2 v2.3.1 // indirect
129127
github.com/pkg/errors v0.9.1 // indirect
130128
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
131129
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
132130
github.com/rivo/uniseg v0.2.0 // indirect
133-
github.com/secure-systems-lab/go-securesystemslib v0.10.0 // indirect
131+
github.com/secure-systems-lab/go-securesystemslib v0.11.0 // indirect
134132
github.com/shibumi/go-pathspec v1.3.0 // indirect
135-
github.com/sigstore/sigstore v1.10.4 // indirect
136-
github.com/sigstore/sigstore-go v1.1.4 // indirect
133+
github.com/sigstore/sigstore v1.10.8 // indirect
134+
github.com/sigstore/sigstore-go v1.2.1 // indirect
137135
github.com/smartystreets/goconvey v1.8.1 // indirect
138136
github.com/spf13/pflag v1.0.10 // indirect
139137
github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323 // indirect
140-
github.com/tonistiigi/fsutil v0.0.0-20251211185533-a2aa163d723f // indirect
141138
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 // indirect
142139
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
143140
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab // indirect
144-
github.com/vbatts/tar-split v0.12.2 // indirect
145141
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
146142
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
143+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
147144
go.opencensus.io v0.24.0 // indirect
148145
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
149-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
150-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect
151-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
152-
go.opentelemetry.io/otel v1.40.0 // indirect
153-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.40.0 // indirect
154-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
155-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
156-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
157-
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
158-
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
159-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
160-
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
161-
golang.org/x/mod v0.33.0 // indirect
162-
golang.org/x/text v0.34.0 // indirect
163-
golang.org/x/time v0.14.0 // indirect
164-
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
165-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
166-
google.golang.org/grpc v1.79.3 // indirect
146+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.69.0 // indirect
147+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.69.0 // indirect
148+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect
149+
go.opentelemetry.io/otel v1.44.0 // indirect
150+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.44.0 // indirect
151+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect
152+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0 // indirect
153+
go.opentelemetry.io/otel/metric v1.44.0 // indirect
154+
go.opentelemetry.io/otel/sdk v1.44.0 // indirect
155+
go.opentelemetry.io/otel/sdk/metric v1.44.0 // indirect
156+
go.opentelemetry.io/otel/trace v1.44.0 // indirect
157+
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
158+
golang.org/x/mod v0.36.0 // indirect
159+
golang.org/x/text v0.37.0 // indirect
160+
golang.org/x/time v0.15.0 // indirect
161+
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
162+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
163+
google.golang.org/grpc v1.81.1 // indirect
167164
google.golang.org/protobuf v1.36.11 // indirect
168165
)

0 commit comments

Comments
 (0)