Skip to content

Commit 34a90af

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2300 from Luap99/vendor
vendor latest c/{image,storage}
2 parents 06628cb + a61cb2f commit 34a90af

File tree

204 files changed

+15335
-11584
lines changed

Some content is hidden

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

204 files changed

+15335
-11584
lines changed

‎Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
export GOPROXY=https://proxy.golang.org
2+
13
GO ?= go
24
GO_BUILD=$(GO) build
35
BUILDTAGS := containers_image_openpgp,systemd,exclude_graphdriver_devicemapper

‎go.mod

+20-20
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/containers/common
22

33
// Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates
44

5-
go 1.22.6
5+
go 1.22.8
66

77
require (
88
github.com/BurntSushi/toml v1.4.0
@@ -11,9 +11,9 @@ require (
1111
github.com/containerd/platforms v0.2.1
1212
github.com/containernetworking/cni v1.2.3
1313
github.com/containernetworking/plugins v1.5.1
14-
github.com/containers/image/v5 v5.33.0
14+
github.com/containers/image/v5 v5.33.1-0.20250116221711-317a9885aed9
1515
github.com/containers/ocicrypt v1.2.1
16-
github.com/containers/storage v1.56.0
16+
github.com/containers/storage v1.56.2-0.20250121150636-c2cdd500e4ef
1717
github.com/coreos/go-systemd/v22 v22.5.0
1818
github.com/cyphar/filepath-securejoin v0.3.6
1919
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
@@ -66,8 +66,8 @@ require (
6666
github.com/containerd/errdefs v0.3.0 // indirect
6767
github.com/containerd/errdefs/pkg v0.3.0 // indirect
6868
github.com/containerd/log v0.1.0 // indirect
69-
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
70-
github.com/containerd/typeurl/v2 v2.2.0 // indirect
69+
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
70+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
7171
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
7272
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
7373
github.com/distribution/reference v0.6.0 // indirect
@@ -120,34 +120,34 @@ require (
120120
github.com/oklog/ulid v1.3.1 // indirect
121121
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
122122
github.com/pkg/errors v0.9.1 // indirect
123-
github.com/proglottis/gpgme v0.1.3 // indirect
123+
github.com/proglottis/gpgme v0.1.4 // indirect
124124
github.com/rivo/uniseg v0.4.7 // indirect
125-
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
125+
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
126126
github.com/sigstore/fulcio v1.6.4 // indirect
127-
github.com/sigstore/rekor v1.3.6 // indirect
128-
github.com/sigstore/sigstore v1.8.9 // indirect
127+
github.com/sigstore/rekor v1.3.8 // indirect
128+
github.com/sigstore/sigstore v1.8.12 // indirect
129129
github.com/smallstep/pkcs7 v0.1.1 // indirect
130130
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
131-
github.com/sylabs/sif/v2 v2.19.1 // indirect
131+
github.com/sylabs/sif/v2 v2.20.2 // indirect
132132
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
133-
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
133+
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
134134
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
135135
github.com/ulikunitz/xz v0.5.12 // indirect
136136
github.com/vbatts/tar-split v0.11.6 // indirect
137-
github.com/vbauerster/mpb/v8 v8.8.3 // indirect
137+
github.com/vbauerster/mpb/v8 v8.9.1 // indirect
138138
github.com/vishvananda/netns v0.0.4 // indirect
139139
go.mongodb.org/mongo-driver v1.14.0 // indirect
140140
go.opencensus.io v0.24.0 // indirect
141-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
142-
go.opentelemetry.io/otel v1.28.0 // indirect
143-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
144-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
145-
golang.org/x/net v0.33.0 // indirect
141+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
142+
go.opentelemetry.io/otel v1.31.0 // indirect
143+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
144+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
145+
golang.org/x/net v0.34.0 // indirect
146146
golang.org/x/text v0.21.0 // indirect
147147
golang.org/x/tools v0.28.0 // indirect
148-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
149-
google.golang.org/grpc v1.68.1 // indirect
150-
google.golang.org/protobuf v1.36.1 // indirect
148+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
149+
google.golang.org/grpc v1.69.4 // indirect
150+
google.golang.org/protobuf v1.36.2 // indirect
151151
gopkg.in/yaml.v3 v3.0.1 // indirect
152152
)
153153

‎go.sum

+53-51
Large diffs are not rendered by default.

‎vendor/github.com/containerd/stargz-snapshotter/estargz/testutil.go

+9-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/typeurl/v2/README.md

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/typeurl/v2/types.go

+50-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/typeurl/v2/types_gogo.go

+68
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)