Skip to content

Commit fc00729

Browse files
authored
Merge pull request #1347 from fluxcd/backport-1346-to-release/v1.2.x
[release/v1.2.x] Update OCI distribution to v3.0.0-alpha.1
2 parents 272a1aa + 071f820 commit fc00729

File tree

3 files changed

+75
-37
lines changed

3 files changed

+75
-37
lines changed

go.mod

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0
1717
github.com/Masterminds/semver/v3 v3.2.1
1818
github.com/cyphar/filepath-securejoin v0.2.4
19-
github.com/distribution/distribution/v3 v3.0.0-20230821124843-59dd684cc897
19+
github.com/distribution/distribution/v3 v3.0.0-alpha.1
2020
github.com/docker/cli v24.0.7+incompatible
2121
github.com/docker/go-units v0.5.0
2222
github.com/fluxcd/cli-utils v0.36.0-flux.2
@@ -97,7 +97,6 @@ require (
9797
github.com/Microsoft/hcsshim v0.11.4 // indirect
9898
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
9999
github.com/ProtonMail/go-crypto v0.0.0-20231012073058-a7379d079e0e // indirect
100-
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
101100
github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
102101
github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 // indirect
103102
github.com/alibabacloud-go/cr-20160607 v1.0.1 // indirect
@@ -131,9 +130,6 @@ require (
131130
github.com/beorn7/perks v1.0.1 // indirect
132131
github.com/blang/semver v3.5.1+incompatible // indirect
133132
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
134-
github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd // indirect
135-
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b // indirect
136-
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 // indirect
137133
github.com/buildkite/agent/v3 v3.59.0 // indirect
138134
github.com/buildkite/go-pipeline v0.2.0 // indirect
139135
github.com/buildkite/interpolate v0.0.0-20200526001904-07f35b4ae251 // indirect
@@ -149,8 +145,10 @@ require (
149145
github.com/containerd/log v0.1.0 // indirect
150146
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
151147
github.com/coreos/go-oidc/v3 v3.7.0 // indirect
148+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
152149
github.com/cyberphone/json-canonicalization v0.0.0-20231011164504-785e29786b46 // indirect
153150
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
151+
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
154152
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
155153
github.com/digitorus/timestamp v0.0.0-20230902153158-687734543647 // indirect
156154
github.com/dimchansky/utfbom v1.1.1 // indirect
@@ -161,15 +159,14 @@ require (
161159
github.com/docker/go-connections v0.4.0 // indirect
162160
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
163161
github.com/docker/go-metrics v0.0.1 // indirect
164-
github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 // indirect
165162
github.com/dustin/go-humanize v1.0.1 // indirect
166163
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
167164
github.com/emirpasic/gods v1.18.1 // indirect
168165
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
169166
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
170167
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
171168
github.com/fatih/color v1.15.0 // indirect
172-
github.com/felixge/httpsnoop v1.0.3 // indirect
169+
github.com/felixge/httpsnoop v1.0.4 // indirect
173170
github.com/fluxcd/gitkit v0.6.0 // indirect
174171
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
175172
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -199,7 +196,6 @@ require (
199196
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
200197
github.com/golang/protobuf v1.5.3 // indirect
201198
github.com/golang/snappy v0.0.4 // indirect
202-
github.com/gomodule/redigo v1.8.9 // indirect
203199
github.com/google/btree v1.1.2 // indirect
204200
github.com/google/certificate-transparency-go v1.1.7 // indirect
205201
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
@@ -216,6 +212,7 @@ require (
216212
github.com/gorilla/mux v1.8.1 // indirect
217213
github.com/gosuri/uitable v0.0.4 // indirect
218214
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
215+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
219216
github.com/hashicorp/errwrap v1.1.0 // indirect
220217
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
221218
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -281,6 +278,9 @@ require (
281278
github.com/prometheus/client_model v0.5.0 // indirect
282279
github.com/prometheus/common v0.45.0 // indirect
283280
github.com/prometheus/procfs v0.12.0 // indirect
281+
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
282+
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
283+
github.com/redis/go-redis/v9 v9.3.0 // indirect
284284
github.com/rivo/uniseg v0.4.4 // indirect
285285
github.com/rs/xid v1.5.0 // indirect
286286
github.com/rubenv/sql-migrate v1.5.2 // indirect
@@ -323,10 +323,22 @@ require (
323323
github.com/zeebo/errs v1.3.0 // indirect
324324
go.mongodb.org/mongo-driver v1.12.1 // indirect
325325
go.opencensus.io v0.24.0 // indirect
326-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
326+
go.opentelemetry.io/contrib/exporters/autoexport v0.46.1 // indirect
327+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
327328
go.opentelemetry.io/otel v1.21.0 // indirect
329+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
330+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 // indirect
331+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
332+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
333+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
334+
go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
335+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect
336+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
328337
go.opentelemetry.io/otel/metric v1.21.0 // indirect
338+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
339+
go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
329340
go.opentelemetry.io/otel/trace v1.21.0 // indirect
341+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
330342
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
331343
go.step.sm/crypto v0.38.0 // indirect
332344
go.uber.org/multierr v1.11.0 // indirect

0 commit comments

Comments
 (0)