Skip to content

Commit 7d509b2

Browse files
author
github-actions
committedJan 29, 2025
Merge branch 'main' into cras
2 parents 428b23b + 071e07c commit 7d509b2

File tree

6 files changed

+280
-294
lines changed

6 files changed

+280
-294
lines changed
 

‎LICENSE_DEPENDENCIES.md

+202-213
Large diffs are not rendered by default.

‎go.mod

+18-19
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ require (
1111
github.com/blang/semver/v4 v4.0.0
1212
github.com/buger/goterm v1.0.4
1313
github.com/buger/jsonparser v1.1.1
14-
github.com/containerd/containerd v1.7.25
14+
github.com/containerd/containerd/v2 v2.0.2
1515
github.com/containerd/continuity v0.4.5
1616
github.com/containerd/go-runc v1.1.0
17-
github.com/containerd/platforms v0.2.1
17+
github.com/containerd/platforms v1.0.0-rc.1
1818
github.com/containernetworking/cni v1.2.3
1919
github.com/containernetworking/plugins v1.6.2
2020
github.com/containers/image/v5 v5.33.1
2121
github.com/coreos/go-systemd/v22 v22.5.0
2222
github.com/cyphar/filepath-securejoin v0.3.6
23-
github.com/docker/cli v27.5.0+incompatible
23+
github.com/docker/cli v27.5.1+incompatible
2424
github.com/docker/distribution v2.8.3+incompatible
25-
github.com/docker/docker v27.5.0+incompatible
25+
github.com/docker/docker v27.5.1+incompatible
2626
github.com/docker/go-units v0.5.0
2727
github.com/fatih/color v1.18.0
2828
github.com/go-log/log v0.2.0
2929
github.com/gofrs/flock v0.12.1
3030
github.com/google/go-containerregistry v0.20.3
3131
github.com/google/uuid v1.6.0
3232
github.com/gosimple/slug v1.15.0
33-
github.com/moby/buildkit v0.18.2
33+
github.com/moby/buildkit v0.19.0
3434
github.com/moby/sys/sequential v0.6.0
3535
github.com/moby/sys/userns v0.1.0
3636
github.com/moby/term v0.5.2
@@ -74,7 +74,7 @@ require (
7474
)
7575

7676
require (
77-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
77+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
7878
github.com/AdamKorcz/go-fuzz-headers v0.0.0-20210319161527-f761c2329661 // indirect
7979
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
8080
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -93,14 +93,14 @@ require (
9393
github.com/containerd/cgroups/v3 v3.0.3 // indirect
9494
github.com/containerd/console v1.0.4 // indirect
9595
github.com/containerd/containerd/api v1.8.0 // indirect
96-
github.com/containerd/errdefs v0.3.0 // indirect
96+
github.com/containerd/errdefs v1.0.0 // indirect
9797
github.com/containerd/errdefs/pkg v0.3.0 // indirect
9898
github.com/containerd/fifo v1.1.0 // indirect
99-
github.com/containerd/go-cni v1.1.10 // indirect
99+
github.com/containerd/go-cni v1.1.11 // indirect
100100
github.com/containerd/log v0.1.0 // indirect
101-
github.com/containerd/nydus-snapshotter v0.14.0 // indirect
101+
github.com/containerd/nydus-snapshotter v0.15.0 // indirect
102102
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
103-
github.com/containerd/ttrpc v1.2.5 // indirect
103+
github.com/containerd/ttrpc v1.2.7 // indirect
104104
github.com/containerd/typeurl/v2 v2.2.3 // indirect
105105
github.com/containers/storage v1.56.1 // indirect
106106
github.com/coreos/go-iptables v0.8.0 // indirect
@@ -166,7 +166,7 @@ require (
166166
github.com/pierrec/lz4/v4 v4.1.21 // indirect
167167
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
168168
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
169-
github.com/prometheus/client_golang v1.20.2 // indirect
169+
github.com/prometheus/client_golang v1.20.5 // indirect
170170
github.com/prometheus/client_model v0.6.1 // indirect
171171
github.com/prometheus/common v0.57.0 // indirect
172172
github.com/prometheus/procfs v0.15.1 // indirect
@@ -183,7 +183,7 @@ require (
183183
github.com/therootcompany/xz v1.0.1 // indirect
184184
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
185185
github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205 // indirect
186-
github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 // indirect
186+
github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a // indirect
187187
github.com/tonistiigi/go-archvariant v1.0.0 // indirect
188188
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
189189
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
@@ -192,21 +192,21 @@ require (
192192
github.com/ulikunitz/xz v0.5.12 // indirect
193193
github.com/vbatts/go-mtree v0.5.0 // indirect
194194
github.com/vbatts/tar-split v0.11.6 // indirect
195-
github.com/vishvananda/netlink v1.3.0 // indirect
195+
github.com/vishvananda/netlink v1.3.1-0.20240922070040-084abd93d350 // indirect
196196
github.com/vishvananda/netns v0.0.4 // indirect
197197
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
198198
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
199199
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
200200
go.opencensus.io v0.24.0 // indirect
201201
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
202-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
203-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // indirect
202+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
203+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 // indirect
204204
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
205205
go.opentelemetry.io/otel v1.33.0 // indirect
206-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
207-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 // indirect
206+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 // indirect
207+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.31.0 // indirect
208208
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
209-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
209+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
210210
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
211211
go.opentelemetry.io/otel/metric v1.33.0 // indirect
212212
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
@@ -217,7 +217,6 @@ require (
217217
golang.org/x/mod v0.22.0 // indirect
218218
golang.org/x/net v0.33.0 // indirect
219219
golang.org/x/time v0.6.0 // indirect
220-
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
221220
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
222221
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
223222
google.golang.org/protobuf v1.36.3 // indirect

0 commit comments

Comments
 (0)
Please sign in to comment.