Merge pull request #367 from flavianmissi/bump-docker-distribution

[release-4.11] OCPBUGS-11366: bump docker-distribution
openshift · Apr 13, 2023 · 65244a5 · 65244a5
2 parents b8015a1 + 61507f7
commit 65244a5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -113,6 +113,6 @@ require (
 )
 
 replace (
-	github.com/docker/distribution => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220616203052-87c2f5c8ca98+incompatible
+	github.com/docker/distribution => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20230404144725-3d4b1c85eb81+incompatible
 	google.golang.org/api => google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff
 )
diff --git a/go.sum b/go.sum
@@ -569,8 +569,8 @@ github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mo
 github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3/go.mod h1:cwhyki5lqBmrT0m8Im+9I7PGFaraOzcYPtEz93RcsGY=
 github.com/openshift/client-go v0.0.0-20220504114320-6aec01bb0754 h1:E/SORtM8rYRq5vp7zlSyxUeH1v71QZAFXW7FkAggw0Q=
 github.com/openshift/client-go v0.0.0-20220504114320-6aec01bb0754/go.mod h1:0KyRH70L+vAGs8wkOkqbsE9qR4lgjW2ugJsCzl1nj5w=
-github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220616203052-87c2f5c8ca98+incompatible h1:SSf6KSxZwYzBS3tBspBqoI+T34E8R3wPEmaYtUfhQsE=
-github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220616203052-87c2f5c8ca98+incompatible/go.mod h1:XmfFzbwryblvZ29NebonirM7RBuNEO7+yVCOapaouAk=
+github.com/openshift/docker-distribution v2.5.0-rc.1.0.20230404144725-3d4b1c85eb81+incompatible h1:qTPVNP5b9D5LD+LTTlDQomQWxZfVJooTXON3g/MHK2s=
+github.com/openshift/docker-distribution v2.5.0-rc.1.0.20230404144725-3d4b1c85eb81+incompatible/go.mod h1:XmfFzbwryblvZ29NebonirM7RBuNEO7+yVCOapaouAk=
 github.com/openshift/library-go v0.0.0-20220505183534-f2c20ff2ad27 h1:z3F9ooSnXa8zEJB033pGuJDKeRKh27m1ZYcvW3xwnz8=
 github.com/openshift/library-go v0.0.0-20220505183534-f2c20ff2ad27/go.mod h1:QGr0pban45i4G7e1Z1yH1tcUrceok6QXrqqjSDb2q8M=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

diff --git a/vendor/github.com/docker/distribution/registry/storage/driver/s3-aws/s3.go b/vendor/github.com/docker/distribution/registry/storage/driver/s3-aws/s3.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -126,7 +126,7 @@ github.com/denverdino/aliyungo/oss
 github.com/denverdino/aliyungo/util
 # github.com/dnaeon/go-vcr v1.0.1
 ## explicit
-# github.com/docker/distribution v0.0.0-20180920194744-16128bbac47f => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220616203052-87c2f5c8ca98+incompatible
+# github.com/docker/distribution v0.0.0-20180920194744-16128bbac47f => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20230404144725-3d4b1c85eb81+incompatible
 ## explicit
 github.com/docker/distribution
 github.com/docker/distribution/configuration
@@ -847,5 +847,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# github.com/docker/distribution => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220616203052-87c2f5c8ca98+incompatible
+# github.com/docker/distribution => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20230404144725-3d4b1c85eb81+incompatible
 # google.golang.org/api => google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff