pkg,test: import distribution/distribution/v3

instead of the deprecated docker/distribution

pkg/cmd/dockerregistry/dockerregistry.go

@@ -18,24 +18,24 @@ import (
 	logrus_logstash "github.com/bshuster-repo/logrus-logstash-hook"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/docker/distribution/configuration"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/health"
-	"github.com/docker/distribution/uuid"
-	distversion "github.com/docker/distribution/version"
+	"github.com/distribution/distribution/v3/configuration"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/health"
+	"github.com/distribution/distribution/v3/uuid"
+	distversion "github.com/distribution/distribution/v3/version"
 
-	_ "github.com/docker/distribution/registry/auth/htpasswd"
-	_ "github.com/docker/distribution/registry/auth/token"
+	_ "github.com/distribution/distribution/v3/registry/auth/htpasswd"
+	_ "github.com/distribution/distribution/v3/registry/auth/token"
 
-	_ "github.com/docker/distribution/registry/proxy"
-	_ "github.com/docker/distribution/registry/storage/driver/azure"
-	_ "github.com/docker/distribution/registry/storage/driver/filesystem"
-	_ "github.com/docker/distribution/registry/storage/driver/gcs"
-	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
-	_ "github.com/docker/distribution/registry/storage/driver/middleware/cloudfront"
-	_ "github.com/docker/distribution/registry/storage/driver/oss"
-	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
-	_ "github.com/docker/distribution/registry/storage/driver/swift"
+	_ "github.com/distribution/distribution/v3/registry/proxy"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/azure"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/filesystem"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/gcs"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/middleware/cloudfront"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/oss"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/swift"
 
 	"github.com/openshift/library-go/pkg/crypto"
 

pkg/cmd/dockerregistry/listfs.go

@@ -7,10 +7,10 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/docker/distribution/configuration"
-	"github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/storage"
-	"github.com/docker/distribution/registry/storage/driver/factory"
+	"github.com/distribution/distribution/v3/configuration"
+	"github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/storage"
+	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
 	"github.com/opencontainers/go-digest"
 
 	registryconfig "github.com/openshift/image-registry/pkg/dockerregistry/server/configuration"

pkg/cmd/dockerregistry/prune.go

@@ -9,10 +9,10 @@ import (
 	"github.com/docker/go-units"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/docker/distribution/configuration"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/storage"
-	"github.com/docker/distribution/registry/storage/driver/factory"
+	"github.com/distribution/distribution/v3/configuration"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/storage"
+	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/client"
 	registryconfig "github.com/openshift/image-registry/pkg/dockerregistry/server/configuration"

pkg/cmd/dockerregistry/restore.go

@@ -7,10 +7,10 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/docker/distribution/configuration"
-	"github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/storage"
-	"github.com/docker/distribution/registry/storage/driver/factory"
+	"github.com/distribution/distribution/v3/configuration"
+	"github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/storage"
+	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/client"
 	registryconfig "github.com/openshift/image-registry/pkg/dockerregistry/server/configuration"

pkg/dockerregistry/server/admin.go

@@ -4,14 +4,14 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/api/errcode"
-	"github.com/docker/distribution/registry/api/v2"
-	"github.com/docker/distribution/registry/auth"
-	"github.com/docker/distribution/registry/handlers"
-	"github.com/docker/distribution/registry/storage"
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/api/errcode"
+	"github.com/distribution/distribution/v3/registry/api/v2"
+	"github.com/distribution/distribution/v3/registry/auth"
+	"github.com/distribution/distribution/v3/registry/handlers"
+	"github.com/distribution/distribution/v3/registry/storage"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 	gorillahandlers "github.com/gorilla/handlers"
 	"github.com/opencontainers/go-digest"
 

pkg/dockerregistry/server/api/routes.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/distribution/v3/reference"
 )
 
 var (

pkg/dockerregistry/server/app.go

@@ -7,11 +7,11 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/configuration"
-	dcontext "github.com/docker/distribution/context"
-	registrycache "github.com/docker/distribution/registry/storage/cache"
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/configuration"
+	dcontext "github.com/distribution/distribution/v3/context"
+	registrycache "github.com/distribution/distribution/v3/registry/storage/cache"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 	kubecache "k8s.io/apimachinery/pkg/util/cache"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/cache"
@@ -45,13 +45,13 @@ type App struct {
 	writeLimiter   maxconnections.Limiter
 
 	// driver gives access to the blob store.
-	// This variable holds the object created by docker/distribution. We
+	// This variable holds the object created by distribution/distribution. We
 	// import it into our namespace because there are no other ways to access
 	// it. In other cases it is hidden from us.
 	driver storagedriver.StorageDriver
 
 	// registry represents a collection of repositories, addressable by name.
-	// This variable holds the object created by docker/distribution. We
+	// This variable holds the object created by distribution/distribution. We
 	// import it into our namespace because there are no other ways to access
 	// it. In other cases it is hidden from us.
 	registry distribution.Namespace

pkg/dockerregistry/server/audit/audit.go

@@ -3,7 +3,7 @@ package audit
 import (
 	"context"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/wrapped"
 )

pkg/dockerregistry/server/audit/log.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	dcontext "github.com/docker/distribution/context"
+	dcontext "github.com/distribution/distribution/v3/context"
 	"github.com/sirupsen/logrus"
 )
 

pkg/dockerregistry/server/auth.go

@@ -8,8 +8,8 @@ import (
 	"net/url"
 	"strings"
 
-	dcontext "github.com/docker/distribution/context"
-	registryauth "github.com/docker/distribution/registry/auth"
+	dcontext "github.com/distribution/distribution/v3/context"
+	registryauth "github.com/distribution/distribution/v3/registry/auth"
 
 	authorizationapi "k8s.io/api/authorization/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -179,7 +179,7 @@ func (ac *AccessController) wrapErr(ctx context.Context, err error) error {
 // Sources of access records:
 //
 //	origin/pkg/cmd/dockerregistry/dockerregistry.go#Execute
-//	docker/distribution/registry/handlers/app.go#appendAccessRecords
+//	distribution/distribution/registry/handlers/app.go#appendAccessRecords
 func (ac *AccessController) Authorized(ctx context.Context, accessRecords ...registryauth.Access) (context.Context, error) {
 	req, err := dcontext.GetRequest(ctx)
 	if err != nil {

pkg/dockerregistry/server/auth/token.go

@@ -5,8 +5,8 @@ import (
 	"regexp"
 	"strings"
 
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/auth"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/auth"
 )
 
 // ResolveScopeSpecifiers converts a list of scope specifiers from a token

pkg/dockerregistry/server/auth/token_test.go

@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/auth"
+	"github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/auth"
 )
 
 func checkResolveScopeSpecifiers(t *testing.T, scopes []string, expectedAuth []auth.Access) {

pkg/dockerregistry/server/auth_test.go

@@ -11,10 +11,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/distribution"
-	dockercfg "github.com/docker/distribution/configuration"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/auth"
+	"github.com/distribution/distribution/v3"
+	dockercfg "github.com/distribution/distribution/v3/configuration"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/auth"
 
 	authorizationapi "k8s.io/api/authorization/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/dockerregistry/server/blobdescriptorservice.go

@@ -3,8 +3,8 @@ package server
 import (
 	"context"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/blobdescriptorservice_test.go

@@ -11,11 +11,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/configuration"
-	"github.com/docker/distribution/registry/api/errcode"
-	"github.com/docker/distribution/registry/api/v2"
-	registryauth "github.com/docker/distribution/registry/auth"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/configuration"
+	"github.com/distribution/distribution/v3/registry/api/errcode"
+	"github.com/distribution/distribution/v3/registry/api/v2"
+	registryauth "github.com/distribution/distribution/v3/registry/auth"
 	"github.com/opencontainers/go-digest"
 
 	registryclient "github.com/openshift/image-registry/pkg/dockerregistry/server/client"

pkg/dockerregistry/server/cache/blobdescriptor.go

@@ -3,7 +3,7 @@ package cache
 import (
 	"context"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/cache/blobdescriptor_test.go

@@ -6,8 +6,8 @@ import (
 
 	clock "k8s.io/utils/clock/testing"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/context"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/context"
 	"github.com/opencontainers/go-digest"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/metrics"

pkg/dockerregistry/server/cache/blobstater.go

@@ -3,7 +3,7 @@ package cache
 import (
 	"context"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/cache/blobstater_test.go

@@ -6,8 +6,8 @@ import (
 
 	clock "k8s.io/utils/clock/testing"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/context"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/context"
 	"github.com/opencontainers/go-digest"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/metrics"

pkg/dockerregistry/server/cache/cache.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/golang-lru/simplelru"
 	"k8s.io/utils/clock"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/opencontainers/go-digest"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/metrics"

pkg/dockerregistry/server/cache/cache_test.go

@@ -8,7 +8,7 @@ import (
 
 	clock "k8s.io/utils/clock/testing"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/opencontainers/go-digest"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/metrics"

pkg/dockerregistry/server/cache/cacheprovider.go

@@ -3,9 +3,9 @@ package cache
 import (
 	"context"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/storage/cache"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/reference"
+	"github.com/distribution/distribution/v3/registry/storage/cache"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/cache/cacheprovider_test.go

@@ -6,8 +6,8 @@ import (
 
 	clock "k8s.io/utils/clock/testing"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/context"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/context"
 	"github.com/opencontainers/go-digest"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/metrics"

pkg/dockerregistry/server/cache/helpers_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/catalog.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"time"
 
-	dcontext "github.com/docker/distribution/context"
+	dcontext "github.com/distribution/distribution/v3/context"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/dockerregistry/server/configuration/configuration.go

@@ -15,8 +15,8 @@ import (
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 
-	//"github.com/docker/distribution/registry/auth"
-	"github.com/docker/distribution/configuration"
+	//"github.com/distribution/distribution/registry/auth"
+	"github.com/distribution/distribution/v3/configuration"
 )
 
 // Environment variables.

pkg/dockerregistry/server/configuration/configuration_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/distribution/configuration"
+	"github.com/distribution/distribution/v3/configuration"
 )
 
 var configYamlV0_1 = `

pkg/dockerregistry/server/credentialsfactory.go

@@ -3,7 +3,7 @@ package server
 import (
 	"strings"
 
-	"github.com/docker/distribution/registry/client/auth"
+	"github.com/distribution/distribution/v3/registry/client/auth"
 	dockerregistry "github.com/docker/docker/registry"
 	"github.com/openshift/library-go/pkg/image/registryclient"
 

pkg/dockerregistry/server/manifest/manifestschema1handler.go

@@ -3,8 +3,8 @@ package server
 import (
 	"encoding/json"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/schema1"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest/schema1"
 	"github.com/docker/libtrust"
 )
 

pkg/dockerregistry/server/manifest/manifestschema1handler_test.go

@@ -7,8 +7,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/diff"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/schema1"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest/schema1"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/manifest/manifestschema2handler.go

@@ -3,8 +3,8 @@ package server
 import (
 	"encoding/json"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/schema2"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest/schema2"
 )
 
 func unmarshalManifestSchema2(content []byte) (distribution.Manifest, error) {

pkg/dockerregistry/server/manifest/manifestschema2handler_test.go

@@ -7,8 +7,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/diff"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/schema2"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest/schema2"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/manifesthandler/error.go

@@ -7,7 +7,7 @@ import (
 )
 
 // ErrManifestBlobBadSize is returned when the blob size in a manifest does
-// not match the actual size. The docker/distribution does not check this and
+// not match the actual size. The distribution/distribution does not check this and
 // therefore does not provide an error for this.
 type ErrManifestBlobBadSize struct {
 	Digest         digest.Digest

pkg/dockerregistry/server/manifesthandler/manifesthandler.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/manifestlist"
-	"github.com/docker/distribution/manifest/ocischema"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/manifest/schema2"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest/manifestlist"
+	"github.com/distribution/distribution/v3/manifest/ocischema"
+	"github.com/distribution/distribution/v3/manifest/schema1"
+	"github.com/distribution/distribution/v3/manifest/schema2"
 	"github.com/opencontainers/go-digest"
 
 	imageapiv1 "github.com/openshift/api/image/v1"

pkg/dockerregistry/server/manifesthandler/manifestlisthandler.go

@@ -3,8 +3,8 @@ package manifesthandler
 import (
 	"context"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/manifestlist"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest/manifestlist"
 	"github.com/opencontainers/go-digest"
 	imageapiv1 "github.com/openshift/api/image/v1"
 )

pkg/dockerregistry/server/manifesthandler/manifestocihandler.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest/ocischema"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/manifest/ocischema"
 	"github.com/opencontainers/go-digest"
 	"k8s.io/apimachinery/pkg/util/wait"
 

pkg/dockerregistry/server/manifesthandler/manifestschema1handler.go

@@ -6,9 +6,9 @@ import (
 	"path"
 	"time"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest/schema1"
+	"github.com/distribution/distribution/v3/reference"
 	"github.com/docker/libtrust"
 	"github.com/opencontainers/go-digest"
 	"k8s.io/apimachinery/pkg/util/wait"

pkg/dockerregistry/server/manifesthandler/manifestschema2handler.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"time"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest/schema2"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/manifest/schema2"
 	"github.com/opencontainers/go-digest"
 	"k8s.io/apimachinery/pkg/util/wait"
 

pkg/dockerregistry/server/manifestservice.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/distribution/registry/api/errcode"
-	regapi "github.com/docker/distribution/registry/api/v2"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/manifest/schema2"
+	"github.com/distribution/distribution/v3/registry/api/errcode"
+	regapi "github.com/distribution/distribution/v3/registry/api/v2"
 	"github.com/opencontainers/go-digest"
 	imageapiv1 "github.com/openshift/api/image/v1"
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"

pkg/dockerregistry/server/manifestservice_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/manifestlist"
-	"github.com/docker/distribution/manifest/schema2"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest/manifestlist"
+	"github.com/distribution/distribution/v3/manifest/schema2"
 	"github.com/opencontainers/go-digest"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 

pkg/dockerregistry/server/metrichandler.go

@@ -3,8 +3,8 @@ package server
 import (
 	"net/http"
 
-	"github.com/docker/distribution/registry/auth"
-	"github.com/docker/distribution/registry/handlers"
+	"github.com/distribution/distribution/v3/registry/auth"
+	"github.com/distribution/distribution/v3/registry/handlers"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/api"
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/metrics"

pkg/dockerregistry/server/metrics/dispatcher.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/docker/distribution/registry/handlers"
+	"github.com/distribution/distribution/v3/registry/handlers"
 
 	gorillahandlers "github.com/gorilla/handlers"
 )

pkg/dockerregistry/server/metrics/metrics.go

@@ -6,9 +6,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/registry/api/errcode"
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/registry/api/errcode"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 
 	"github.com/openshift/library-go/pkg/image/registryclient"
 

pkg/dockerregistry/server/pendingerrors.go

@@ -3,7 +3,7 @@ package server
 import (
 	"context"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/wrapped"
 )

pkg/dockerregistry/server/prune/prune.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/storage"
-	"github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/manifest/schema2"
+	"github.com/distribution/distribution/v3/reference"
+	"github.com/distribution/distribution/v3/registry/storage"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
 	"github.com/opencontainers/go-digest"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 
@@ -173,7 +173,7 @@ type Summary struct {
 // On error, the Summary will contain what was deleted so far.
 //
 // TODO(dmage): remove layer links to a blob if the blob is removed or it doesn't belong to the ImageStream.
-// TODO(dmage): keep young blobs (docker/distribution#2297).
+// TODO(dmage): keep young blobs (distribution/distribution#2297).
 func Prune(ctx context.Context, registry distribution.Namespace, registryClient client.RegistryClient, pruner Pruner) (Summary, error) {
 	logger := dcontext.GetLogger(ctx)
 

pkg/dockerregistry/server/prune/prune_test.go

@@ -8,11 +8,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/storage"
-	"github.com/docker/distribution/registry/storage/driver/inmemory"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest/schema1"
+	"github.com/distribution/distribution/v3/reference"
+	"github.com/distribution/distribution/v3/registry/storage"
+	"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 	"github.com/opencontainers/go-digest"
 	imageapiv1 "github.com/openshift/api/image/v1"
 	registryclient "github.com/openshift/image-registry/pkg/dockerregistry/server/client"

pkg/dockerregistry/server/prune/restore.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/manifest/schema2"
+	"github.com/distribution/distribution/v3/reference"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
 	"github.com/opencontainers/go-digest"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 

pkg/dockerregistry/server/pullthroughblobstore.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
 	"github.com/opencontainers/go-digest"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/maxconnections"

pkg/dockerregistry/server/pullthroughblobstore_test.go

@@ -13,10 +13,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest/schema1"
-	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/manifest/schema1"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 	"github.com/opencontainers/go-digest"
 
 	imageapiv1 "github.com/openshift/api/image/v1"
@@ -263,8 +263,8 @@ func TestPullthroughServeNotSeekableBlob(t *testing.T) {
 				// In this case the docker client library will make a not
 				// truly seekable response [2].
 				//
-				// [1]: https://github.com/docker/distribution/blob/7484e51bf6af0d3b1a849644cdaced3cfcf13617/registry/client/transport/http_reader.go#L239
-				// [2]: https://github.com/docker/distribution/blob/7484e51bf6af0d3b1a849644cdaced3cfcf13617/registry/client/transport/http_reader.go#L119-L121
+				// [1]: https://github.com/distribution/distribution/blob/7484e51bf6af0d3b1a849644cdaced3cfcf13617/registry/client/transport/http_reader.go#L239
+				// [2]: https://github.com/distribution/distribution/blob/7484e51bf6af0d3b1a849644cdaced3cfcf13617/registry/client/transport/http_reader.go#L119-L121
 				w.WriteHeader(http.StatusNonAuthoritativeInfo)
 				w.Write(blob)
 			}

pkg/dockerregistry/server/pullthroughmanifestservice.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/api/errcode"
-	"github.com/docker/distribution/registry/client"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/api/errcode"
+	"github.com/distribution/distribution/v3/registry/client"
 	"github.com/opencontainers/go-digest"
 
 	operatorv1alpha1 "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1alpha1"

pkg/dockerregistry/server/pullthroughmanifestservice_test.go

@@ -10,11 +10,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/configuration"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/handlers"
-	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/configuration"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/handlers"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 	"github.com/opencontainers/go-digest"
 
 	imageapiv1 "github.com/openshift/api/image/v1"

pkg/dockerregistry/server/quotarestrictedblobstore.go

@@ -1,4 +1,4 @@
-// Package server wraps repository and blob store objects of docker/distribution upstream. Most significantly,
+// Package server wraps repository and blob store objects of distribution/distribution upstream. Most significantly,
 // the wrappers cause manifests to be stored in OpenShift's etcd store instead of registry's storage.
 // Registry's middleware API is utilized to register the object factories.
 //
@@ -16,8 +16,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

pkg/dockerregistry/server/registry.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/reference"
 )
 
 // registry wraps upstream registry object and overrides some of its methods

pkg/dockerregistry/server/remoteblobgetter.go

@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/api/errcode"
-	"github.com/docker/distribution/registry/client"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/api/errcode"
+	"github.com/distribution/distribution/v3/registry/client"
 	"github.com/opencontainers/go-digest"
 
 	corev1 "k8s.io/api/core/v1"

pkg/dockerregistry/server/repository.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	registrystorage "github.com/docker/distribution/registry/storage"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	registrystorage "github.com/distribution/distribution/v3/registry/storage"
 
 	restclient "k8s.io/client-go/rest"
 

pkg/dockerregistry/server/repository_test.go

@@ -11,15 +11,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution"
-	dockercfg "github.com/docker/distribution/configuration"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/storage"
-	"github.com/docker/distribution/registry/storage/driver"
-	"github.com/docker/distribution/registry/storage/driver/inmemory"
+	"github.com/distribution/distribution/v3"
+	dockercfg "github.com/distribution/distribution/v3/configuration"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/manifest"
+	"github.com/distribution/distribution/v3/manifest/schema1"
+	"github.com/distribution/distribution/v3/reference"
+	"github.com/distribution/distribution/v3/registry/storage"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 	"github.com/docker/libtrust"
 	"github.com/opencontainers/go-digest"
 

pkg/dockerregistry/server/signaturedispatcher.go

@@ -11,10 +11,10 @@ import (
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/api/errcode"
-	v2 "github.com/docker/distribution/registry/api/v2"
-	"github.com/docker/distribution/registry/handlers"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/api/errcode"
+	v2 "github.com/distribution/distribution/v3/registry/api/v2"
+	"github.com/distribution/distribution/v3/registry/handlers"
 
 	imageapiv1 "github.com/openshift/api/image/v1"
 

pkg/dockerregistry/server/signaturedispatcher_test.go

@@ -12,8 +12,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/distribution/configuration"
-	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
+	"github.com/distribution/distribution/v3/configuration"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

pkg/dockerregistry/server/signaturehandler.go

@@ -3,9 +3,9 @@ package server
 import (
 	"net/http"
 
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/auth"
-	"github.com/docker/distribution/registry/handlers"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/auth"
+	"github.com/distribution/distribution/v3/registry/handlers"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/api"
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/client"

pkg/dockerregistry/server/storage/storage.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/reference"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/supermiddleware/app.go

@@ -6,16 +6,16 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/configuration"
-	"github.com/docker/distribution/registry/auth"
-	"github.com/docker/distribution/registry/handlers"
-	registrymw "github.com/docker/distribution/registry/middleware/registry"
-	repositorymw "github.com/docker/distribution/registry/middleware/repository"
-	"github.com/docker/distribution/registry/storage/cache"
-	cacheprovider "github.com/docker/distribution/registry/storage/cache/provider"
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
-	storagemw "github.com/docker/distribution/registry/storage/driver/middleware"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/configuration"
+	"github.com/distribution/distribution/v3/registry/auth"
+	"github.com/distribution/distribution/v3/registry/handlers"
+	registrymw "github.com/distribution/distribution/v3/registry/middleware/registry"
+	repositorymw "github.com/distribution/distribution/v3/registry/middleware/repository"
+	"github.com/distribution/distribution/v3/registry/storage/cache"
+	cacheprovider "github.com/distribution/distribution/v3/registry/storage/cache/provider"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
+	storagemw "github.com/distribution/distribution/v3/registry/storage/driver/middleware"
 )
 
 // Name is the name which is used to register middlewares.

pkg/dockerregistry/server/supermiddleware/app_test.go

@@ -11,13 +11,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/configuration"
-	"github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/auth"
-	"github.com/docker/distribution/registry/storage/cache"
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
-	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/configuration"
+	"github.com/distribution/distribution/v3/reference"
+	"github.com/distribution/distribution/v3/registry/auth"
+	"github.com/distribution/distribution/v3/registry/storage/cache"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/wrapped"
 )

pkg/dockerregistry/server/supermiddleware/blobdescriptorservice.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/reference"
-	registrymw "github.com/docker/distribution/registry/middleware/registry"
-	"github.com/docker/distribution/registry/storage"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/reference"
+	registrymw "github.com/distribution/distribution/v3/registry/middleware/registry"
+	"github.com/distribution/distribution/v3/registry/storage"
 	"github.com/opencontainers/go-digest"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/wrapped"

pkg/dockerregistry/server/supermiddleware/registry.go

@@ -3,10 +3,10 @@ package supermiddleware
 import (
 	"context"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/storage"
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/reference"
+	"github.com/distribution/distribution/v3/registry/storage"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 )
 
 type registry struct {

pkg/dockerregistry/server/tagservice.go

@@ -3,8 +3,8 @@ package server
 import (
 	"context"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/registry/api/v2"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/registry/api/v2"
 
 	"github.com/openshift/image-registry/pkg/imagestream"
 )

pkg/dockerregistry/server/tagservice_test.go

@@ -5,9 +5,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/registry/api/errcode"
-	"github.com/docker/distribution/registry/api/v2"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/registry/api/errcode"
+	"github.com/distribution/distribution/v3/registry/api/v2"
 	"github.com/opencontainers/go-digest"
 
 	"github.com/openshift/image-registry/pkg/imagestream"

pkg/dockerregistry/server/test.go

@@ -6,13 +6,13 @@ import (
 
 	kubecache "k8s.io/apimachinery/pkg/util/cache"
 
-	"github.com/docker/distribution"
-	dockercfg "github.com/docker/distribution/configuration"
-	"github.com/docker/distribution/registry/storage"
-	dockercache "github.com/docker/distribution/registry/storage/cache"
-	"github.com/docker/distribution/registry/storage/cache/memory"
-	"github.com/docker/distribution/registry/storage/driver"
-	"github.com/docker/distribution/registry/storage/driver/inmemory"
+	"github.com/distribution/distribution/v3"
+	dockercfg "github.com/distribution/distribution/v3/configuration"
+	"github.com/distribution/distribution/v3/registry/storage"
+	dockercache "github.com/distribution/distribution/v3/registry/storage/cache"
+	"github.com/distribution/distribution/v3/registry/storage/cache/memory"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/cache"
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/client"

pkg/dockerregistry/server/token.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	dcontext "github.com/docker/distribution/context"
+	dcontext "github.com/distribution/distribution/v3/context"
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/auth"
 	"github.com/openshift/image-registry/pkg/dockerregistry/server/client"
 

pkg/dockerregistry/server/util.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest/schema2"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/manifest/schema2"
 	"github.com/opencontainers/go-digest"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 

pkg/dockerregistry/server/wrapped/blobdescriptorservice.go

@@ -3,7 +3,7 @@ package wrapped
 import (
 	"context"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/wrapped/blobstore.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/wrapped/blobwriter.go

@@ -3,7 +3,7 @@ package wrapped
 import (
 	"context"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 )
 
 // blobWriter wraps a distribution.BlobWriter.

pkg/dockerregistry/server/wrapped/filewriter.go

@@ -1,7 +1,7 @@
 package wrapped
 
 import (
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 )
 
 // fileWriter wraps a distribution/registry/storage/driver.FileWriter.

pkg/dockerregistry/server/wrapped/manifestservice.go

@@ -3,7 +3,7 @@ package wrapped
 import (
 	"context"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/opencontainers/go-digest"
 )
 

pkg/dockerregistry/server/wrapped/repository.go

@@ -3,8 +3,8 @@ package wrapped
 import (
 	"context"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/reference"
 )
 
 type repository struct {

pkg/dockerregistry/server/wrapped/storagedriver.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 )
 
 // storageDriver wraps a distribution/registry/storage/driver.StorageDriver.

pkg/dockerregistry/server/wrapped/tagservice.go

@@ -3,7 +3,7 @@ package wrapped
 import (
 	"context"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 )
 
 type tagService struct {

pkg/errors/errors.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	errcode "github.com/docker/distribution/registry/api/errcode"
+	errcode "github.com/distribution/distribution/v3/registry/api/errcode"
 )
 
 const errGroup = "openshift"

pkg/errors/handle.go

@@ -3,8 +3,8 @@ package errors
 import (
 	"context"
 
-	dcontext "github.com/docker/distribution/context"
-	errcode "github.com/docker/distribution/registry/api/errcode"
+	dcontext "github.com/distribution/distribution/v3/context"
+	errcode "github.com/distribution/distribution/v3/registry/api/errcode"
 )
 
 type errMessageKey struct{}

pkg/imagestream/identifycandidaterepositories_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/diff"

pkg/imagestream/image.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	dcontext "github.com/docker/distribution/context"
+	dcontext "github.com/distribution/distribution/v3/context"
 	"github.com/opencontainers/go-digest"
 
 	kerrors "k8s.io/apimachinery/pkg/api/errors"

pkg/imagestream/image_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/docker/distribution/context"
+	"github.com/distribution/distribution/v3/context"
 	"github.com/opencontainers/go-digest"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

pkg/imagestream/imagestream.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	dcontext "github.com/docker/distribution/context"
+	dcontext "github.com/distribution/distribution/v3/context"
 	"github.com/opencontainers/go-digest"
 
 	corev1 "k8s.io/api/core/v1"

pkg/imagestream/imagestreamhasblob.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	dcontext "github.com/docker/distribution/context"
+	dcontext "github.com/distribution/distribution/v3/context"
 	"github.com/opencontainers/go-digest"
 
 	imageapiv1 "github.com/openshift/api/image/v1"

pkg/origin-common/image/apis/image/dockertypes.go

@@ -92,7 +92,7 @@ type DockerImageManifest struct {
 // DockerFSLayer is a container struct for BlobSums defined in an image manifest
 type DockerFSLayer struct {
 	// DockerBlobSum is the tarsum of the referenced filesystem image layer
-	// TODO make this digest.Digest once docker/distribution is in Godeps
+	// TODO make this digest.Digest once distribution/distribution is in Godeps
 	DockerBlobSum string `json:"blobSum"`
 }
 

pkg/origin-common/image/apis/image/reference.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/distribution/v3/reference"
 )
 
 // NamedDockerImageReference points to a Docker image.

pkg/origin-common/util/util.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/manifest/schema2"
+	"github.com/distribution/distribution/v3/manifest/schema1"
+	"github.com/distribution/distribution/v3/manifest/schema2"
 	"k8s.io/klog/v2"
 
 	kerrors "k8s.io/apimachinery/pkg/api/errors"

pkg/requesttrace/requesttrace.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/textproto"
 
-	dcontext "github.com/docker/distribution/context"
+	dcontext "github.com/distribution/distribution/v3/context"
 )
 
 const (

pkg/testframework/manifest.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/opencontainers/go-digest"
 	"github.com/pborman/uuid"
 

pkg/testframework/master.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 	"github.com/pborman/uuid"
 
 	corev1 "k8s.io/api/core/v1"

pkg/testframework/registry.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/configuration"
+	"github.com/distribution/distribution/v3/configuration"
 	"golang.org/x/crypto/bcrypt"
 
 	corev1 "k8s.io/api/core/v1"

pkg/testutil/fakeopenshift.go

@@ -6,9 +6,9 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/docker/distribution"
-	dcontext "github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest/manifestlist"
+	"github.com/distribution/distribution/v3"
+	dcontext "github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/manifest/manifestlist"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 
 	"k8s.io/apimachinery/pkg/api/errors"

pkg/testutil/logrus.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	dcontext "github.com/docker/distribution/context"
+	dcontext "github.com/distribution/distribution/v3/context"
 	"github.com/sirupsen/logrus"
 )
 

pkg/testutil/manifests.go

@@ -8,13 +8,13 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest"
-	"github.com/docker/distribution/manifest/manifestlist"
-	"github.com/docker/distribution/manifest/ocischema"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/distribution/registry/client/auth"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/manifest"
+	"github.com/distribution/distribution/v3/manifest/manifestlist"
+	"github.com/distribution/distribution/v3/manifest/ocischema"
+	"github.com/distribution/distribution/v3/manifest/schema1"
+	"github.com/distribution/distribution/v3/manifest/schema2"
+	"github.com/distribution/distribution/v3/registry/client/auth"
 	"github.com/docker/libtrust"
 	"github.com/opencontainers/go-digest"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"

pkg/testutil/util.go

@@ -15,12 +15,12 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/reference"
-	distclient "github.com/docker/distribution/registry/client"
-	"github.com/docker/distribution/registry/client/auth"
-	"github.com/docker/distribution/registry/client/auth/challenge"
-	"github.com/docker/distribution/registry/client/transport"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/reference"
+	distclient "github.com/distribution/distribution/v3/registry/client"
+	"github.com/distribution/distribution/v3/registry/client/auth"
+	"github.com/distribution/distribution/v3/registry/client/auth/challenge"
+	"github.com/distribution/distribution/v3/registry/client/transport"
 	"github.com/opencontainers/go-digest"
 
 	"k8s.io/apimachinery/pkg/util/errors"
@@ -190,7 +190,7 @@ func UploadRandomTestBlob(ctx context.Context, baseURL string, creds auth.Creden
 
 // CreateRandomTarFile creates a random tarfile and returns its content.
 // An error is returned if there is a problem generating valid content.
-// Inspired by github.com/docker/distribution/testutil/tarfile.go.
+// Inspired by github.com/distribution/distribution/testutil/tarfile.go.
 func CreateRandomTarFile() ([]byte, error) {
 	nFiles := 2 // random enough
 

test/integration/crossmount/crossmount_test.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/client"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/reference"
+	"github.com/distribution/distribution/v3/registry/client"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

test/integration/imagelayers/imagelayers_test.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/context"
+	"github.com/distribution/distribution/v3"
+	"github.com/distribution/distribution/v3/context"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 

test/integration/metricspullthrough/metricspullthrough_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/distribution"
+	"github.com/distribution/distribution/v3"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

test/integration/oci/oci_test.go

@@ -12,7 +12,7 @@ import (
 	dockerapiv10 "github.com/openshift/api/image/docker10"
 	imageclientv1 "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 
-	"github.com/docker/distribution/manifest/ocischema"
+	"github.com/distribution/distribution/v3/manifest/ocischema"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 
 	"github.com/openshift/image-registry/pkg/testframework"

test/integration/offline/offline_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/registry/storage/driver/inmemory"
+	"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"