Skip to content

Commit 6df5b01

Browse files
authored
Merge pull request #2476 from TomSweeneyRedHat/dev/tsweeney/0.64.0
Bump c/storage to v1.59.0, c/image to v5.36.0, c/common to v0.64.0, then v0.65.0-dev
2 parents 4f0f579 + 6119e7a commit 6df5b01

File tree

712 files changed

+15311
-84961
lines changed

Some content is hidden

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

712 files changed

+15311
-84961
lines changed

go.mod

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ require (
1111
github.com/containerd/platforms v0.2.1
1212
github.com/containernetworking/cni v1.3.0
1313
github.com/containernetworking/plugins v1.7.1
14-
github.com/containers/image/v5 v5.35.0
14+
github.com/containers/image/v5 v5.36.0
1515
github.com/containers/ocicrypt v1.2.1
16-
github.com/containers/storage v1.58.0
16+
github.com/containers/storage v1.59.0
1717
github.com/coreos/go-systemd/v22 v22.5.0
1818
github.com/cyphar/filepath-securejoin v0.4.1
1919
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
@@ -54,12 +54,12 @@ require (
5454
)
5555

5656
require (
57-
dario.cat/mergo v1.0.1 // indirect
57+
dario.cat/mergo v1.0.2 // indirect
58+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
5859
github.com/Microsoft/go-winio v0.6.2 // indirect
59-
github.com/Microsoft/hcsshim v0.12.9 // indirect
60+
github.com/Microsoft/hcsshim v0.13.0 // indirect
6061
github.com/VividCortex/ewma v1.2.0 // indirect
6162
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
62-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6363
github.com/chzyer/readline v1.5.1 // indirect
6464
github.com/containerd/cgroups/v3 v3.0.5 // indirect
6565
github.com/containerd/errdefs v1.0.0 // indirect
@@ -70,23 +70,13 @@ require (
7070
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
7171
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
7272
github.com/distribution/reference v0.6.0 // indirect
73-
github.com/docker/docker v28.0.4+incompatible // indirect
73+
github.com/docker/docker v28.3.2+incompatible // indirect
7474
github.com/docker/docker-credential-helpers v0.9.3 // indirect
7575
github.com/docker/go-connections v0.5.0 // indirect
7676
github.com/felixge/httpsnoop v1.0.4 // indirect
7777
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
78-
github.com/go-logr/logr v1.4.2 // indirect
78+
github.com/go-logr/logr v1.4.3 // indirect
7979
github.com/go-logr/stdr v1.2.2 // indirect
80-
github.com/go-openapi/analysis v0.23.0 // indirect
81-
github.com/go-openapi/errors v0.22.1 // indirect
82-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
83-
github.com/go-openapi/jsonreference v0.21.0 // indirect
84-
github.com/go-openapi/loads v0.22.0 // indirect
85-
github.com/go-openapi/runtime v0.28.0 // indirect
86-
github.com/go-openapi/spec v0.21.0 // indirect
87-
github.com/go-openapi/strfmt v0.23.0 // indirect
88-
github.com/go-openapi/swag v0.23.1 // indirect
89-
github.com/go-openapi/validate v0.24.0 // indirect
9080
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
9181
github.com/gogo/protobuf v1.3.2 // indirect
9282
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
@@ -99,58 +89,51 @@ require (
9989
github.com/gorilla/mux v1.8.1 // indirect
10090
github.com/hashicorp/errwrap v1.1.0 // indirect
10191
github.com/inconshreveable/mousetrap v1.1.0 // indirect
102-
github.com/josharian/intern v1.0.0 // indirect
10392
github.com/klauspost/compress v1.18.0 // indirect
10493
github.com/klauspost/pgzip v1.2.6 // indirect
10594
github.com/kr/fs v0.1.0 // indirect
10695
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
107-
github.com/mailru/easyjson v0.9.0 // indirect
10896
github.com/manifoldco/promptui v0.9.0 // indirect
10997
github.com/mattn/go-runewidth v0.0.16 // indirect
110-
github.com/mattn/go-sqlite3 v1.14.27 // indirect
98+
github.com/mattn/go-sqlite3 v1.14.28 // indirect
11199
github.com/miekg/pkcs11 v1.1.1 // indirect
112100
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
113-
github.com/mitchellh/mapstructure v1.5.0 // indirect
114101
github.com/moby/docker-image-spec v1.3.1 // indirect
115102
github.com/moby/sys/mountinfo v0.7.2 // indirect
116103
github.com/moby/sys/user v0.4.0 // indirect
117104
github.com/moby/sys/userns v0.1.0 // indirect
118105
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
119106
github.com/modern-go/reflect2 v1.0.2 // indirect
120-
github.com/oklog/ulid v1.3.1 // indirect
121-
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
122107
github.com/pkg/errors v0.9.1 // indirect
123108
github.com/proglottis/gpgme v0.1.4 // indirect
124109
github.com/rivo/uniseg v0.4.7 // indirect
125110
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
126111
github.com/sigstore/fulcio v1.6.6 // indirect
127112
github.com/sigstore/protobuf-specs v0.4.1 // indirect
128-
github.com/sigstore/rekor v1.3.10 // indirect
129-
github.com/sigstore/sigstore v1.9.3 // indirect
113+
github.com/sigstore/sigstore v1.9.5 // indirect
130114
github.com/smallstep/pkcs7 v0.1.1 // indirect
131115
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
132116
github.com/sylabs/sif/v2 v2.21.1 // indirect
133-
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
117+
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
134118
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
135119
github.com/ulikunitz/xz v0.5.12 // indirect
136120
github.com/vbatts/tar-split v0.12.1 // indirect
137-
github.com/vbauerster/mpb/v8 v8.9.3 // indirect
121+
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
138122
github.com/vishvananda/netns v0.0.5 // indirect
139-
go.mongodb.org/mongo-driver v1.14.0 // indirect
140123
go.opencensus.io v0.24.0 // indirect
141124
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
142-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
143-
go.opentelemetry.io/otel v1.34.0 // indirect
144-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
145-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
125+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
126+
go.opentelemetry.io/otel v1.35.0 // indirect
127+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
128+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
146129
go.uber.org/automaxprocs v1.6.0 // indirect
147130
go.yaml.in/yaml/v2 v2.4.2 // indirect
148131
golang.org/x/net v0.41.0 // indirect
149132
golang.org/x/text v0.27.0 // indirect
150133
golang.org/x/tools v0.34.0 // indirect
151134
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
152135
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
153-
google.golang.org/grpc v1.71.0 // indirect
136+
google.golang.org/grpc v1.72.2 // indirect
154137
google.golang.org/protobuf v1.36.6 // indirect
155138
gopkg.in/yaml.v3 v3.0.1 // indirect
156139
)

0 commit comments

Comments
 (0)