Skip to content

Commit 8ebb4d0

Browse files
authored
Merge pull request #2619 from simonbaird/update-go-cr-after-fork-refresh
Update go-containerregistry dependency after fork refresh
2 parents da3ad6c + 9d09d40 commit 8ebb4d0

5 files changed

Lines changed: 196 additions & 165 deletions

File tree

acceptance/go.mod

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ require (
1313
github.com/go-git/go-billy/v5 v5.6.0
1414
github.com/go-git/go-git/v5 v5.13.0
1515
github.com/go-openapi/strfmt v0.23.0
16-
github.com/google/go-containerregistry v0.20.2
16+
github.com/google/go-containerregistry v0.20.7
1717
github.com/in-toto/in-toto-golang v0.9.1-0.20240317085821-8e2966059a09
1818
github.com/konflux-ci/application-api v0.0.0-20240812090716-e7eb2ecfb409
19-
github.com/opencontainers/image-spec v1.1.0
19+
github.com/opencontainers/image-spec v1.1.1
2020
github.com/otiai10/copy v1.14.0
2121
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
2222
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
@@ -44,11 +44,13 @@ require (
4444
sigs.k8s.io/yaml v1.4.0
4545
)
4646

47+
// Maybe less important in acceptance, but it seems sensible to use the fork here too
48+
replace github.com/google/go-containerregistry => github.com/conforma/go-containerregistry v0.20.7-0.20250703195040-6f40a3734728
49+
4750
require (
4851
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
4952
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
5053
dario.cat/mergo v1.0.1 // indirect
51-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5254
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
5355
github.com/BurntSushi/toml v1.4.0 // indirect
5456
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -65,9 +67,11 @@ require (
6567
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6668
github.com/cloudflare/circl v1.4.0 // indirect
6769
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
70+
github.com/containerd/errdefs v1.0.0 // indirect
71+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
6872
github.com/containerd/log v0.1.0 // indirect
6973
github.com/containerd/platforms v0.2.1 // indirect
70-
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
74+
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
7175
github.com/cpuguy83/dockercfg v0.3.2 // indirect
7276
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
7377
github.com/cucumber/messages/go/v21 v21.0.1 // indirect
@@ -76,10 +80,10 @@ require (
7680
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
7781
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
7882
github.com/distribution/reference v0.6.0 // indirect
79-
github.com/docker/cli v27.2.0+incompatible // indirect
83+
github.com/docker/cli v28.2.2+incompatible // indirect
8084
github.com/docker/distribution v2.8.3+incompatible // indirect
81-
github.com/docker/docker v27.2.0+incompatible // indirect
82-
github.com/docker/docker-credential-helpers v0.8.2 // indirect
85+
github.com/docker/docker v28.2.2+incompatible // indirect
86+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
8387
github.com/docker/go-connections v0.5.0 // indirect
8488
github.com/docker/go-units v0.5.0 // indirect
8589
github.com/dustin/go-humanize v1.0.1 // indirect
@@ -97,7 +101,7 @@ require (
97101
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
98102
github.com/go-kit/log v0.2.1 // indirect
99103
github.com/go-logfmt/logfmt v0.6.0 // indirect
100-
github.com/go-logr/logr v1.4.2 // indirect
104+
github.com/go-logr/logr v1.4.3 // indirect
101105
github.com/go-logr/stdr v1.2.2 // indirect
102106
github.com/go-ole/go-ole v1.3.0 // indirect
103107
github.com/go-openapi/analysis v0.23.0 // indirect
@@ -118,7 +122,7 @@ require (
118122
github.com/google/cel-go v0.21.0 // indirect
119123
github.com/google/certificate-transparency-go v1.2.1 // indirect
120124
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
121-
github.com/google/go-cmp v0.6.0 // indirect
125+
github.com/google/go-cmp v0.7.0 // indirect
122126
github.com/google/gofuzz v1.2.0 // indirect
123127
github.com/google/safetext v0.0.0-20240722112252-5a72de7e7962 // indirect
124128
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -140,7 +144,7 @@ require (
140144
github.com/josharian/intern v1.0.0 // indirect
141145
github.com/json-iterator/go v1.1.12 // indirect
142146
github.com/kevinburke/ssh_config v1.2.0 // indirect
143-
github.com/klauspost/compress v1.17.9 // indirect
147+
github.com/klauspost/compress v1.18.0 // indirect
144148
github.com/kr/pretty v0.3.1 // indirect
145149
github.com/kr/text v0.2.0 // indirect
146150
github.com/letsencrypt/boulder v0.0.0-20240830194243-1fcf0ee08180 // indirect
@@ -153,9 +157,10 @@ require (
153157
github.com/mitchellh/go-homedir v1.1.0 // indirect
154158
github.com/mitchellh/mapstructure v1.5.0 // indirect
155159
github.com/moby/docker-image-spec v1.3.1 // indirect
160+
github.com/moby/go-archive v0.1.0 // indirect
156161
github.com/moby/patternmatcher v0.6.0 // indirect
157162
github.com/moby/sys/sequential v0.6.0 // indirect
158-
github.com/moby/sys/user v0.3.0 // indirect
163+
github.com/moby/sys/user v0.4.0 // indirect
159164
github.com/moby/sys/userns v0.1.0 // indirect
160165
github.com/moby/term v0.5.0 // indirect
161166
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -193,8 +198,8 @@ require (
193198
github.com/sourcegraph/conc v0.3.0 // indirect
194199
github.com/spf13/afero v1.11.0 // indirect
195200
github.com/spf13/cast v1.7.0 // indirect
196-
github.com/spf13/cobra v1.8.1 // indirect
197-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
201+
github.com/spf13/cobra v1.9.1 // indirect
202+
github.com/spf13/pflag v1.0.6 // indirect
198203
github.com/spf13/viper v1.19.0 // indirect
199204
github.com/stoewer/go-strcase v1.3.0 // indirect
200205
github.com/stretchr/objx v0.5.2 // indirect
@@ -208,7 +213,7 @@ require (
208213
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
209214
github.com/tklauser/go-sysconf v0.3.14 // indirect
210215
github.com/tklauser/numcpus v0.8.0 // indirect
211-
github.com/vbatts/tar-split v0.11.5 // indirect
216+
github.com/vbatts/tar-split v0.12.1 // indirect
212217
github.com/x448/float16 v0.8.4 // indirect
213218
github.com/xanzy/ssh-agent v0.3.3 // indirect
214219
github.com/xlab/treeprint v1.2.0 // indirect
@@ -217,17 +222,18 @@ require (
217222
github.com/yusufpapurcu/wmi v1.2.4 // indirect
218223
go.mongodb.org/mongo-driver v1.16.1 // indirect
219224
go.opencensus.io v0.24.0 // indirect
220-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
221-
go.opentelemetry.io/otel v1.29.0 // indirect
222-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
223-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
225+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
226+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
227+
go.opentelemetry.io/otel v1.36.0 // indirect
228+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
229+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
224230
go.uber.org/multierr v1.11.0 // indirect
225231
go.uber.org/zap v1.27.0 // indirect
226232
golang.org/x/crypto v0.38.0 // indirect
227-
golang.org/x/mod v0.21.0 // indirect
233+
golang.org/x/mod v0.25.0 // indirect
228234
golang.org/x/net v0.36.0 // indirect
229-
golang.org/x/oauth2 v0.23.0 // indirect
230-
golang.org/x/sync v0.14.0 // indirect
235+
golang.org/x/oauth2 v0.30.0 // indirect
236+
golang.org/x/sync v0.15.0 // indirect
231237
golang.org/x/sys v0.33.0 // indirect
232238
golang.org/x/term v0.32.0 // indirect
233239
golang.org/x/text v0.25.0 // indirect
@@ -237,7 +243,7 @@ require (
237243
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
238244
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
239245
google.golang.org/grpc v1.67.0 // indirect
240-
google.golang.org/protobuf v1.34.2 // indirect
246+
google.golang.org/protobuf v1.36.3 // indirect
241247
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
242248
gopkg.in/inf.v0 v0.9.1 // indirect
243249
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)