Move registry to daemon/pkg/registry

Signed-off-by: Derek McGowan <derek@mcg.dev>

daemon/command/config.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/pkg/opts"
+	"github.com/docker/docker/daemon/pkg/registry"
 	dopts "github.com/docker/docker/internal/opts"
-	"github.com/docker/docker/registry"
 	"github.com/spf13/pflag"
 )
 

daemon/config/config.go

@@ -14,8 +14,8 @@ import (
 	"dario.cat/mergo"
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/pkg/opts"
+	"github.com/docker/docker/daemon/pkg/registry"
 	dopts "github.com/docker/docker/internal/opts"
-	"github.com/docker/docker/registry"
 	"github.com/moby/moby/api"
 	"github.com/moby/moby/api/types/versions"
 	"github.com/pkg/errors"

daemon/config/config_test.go

@@ -13,7 +13,7 @@ import (
 	"dario.cat/mergo"
 	"github.com/docker/docker/daemon/libnetwork/ipamutils"
 	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/spf13/pflag"

daemon/containerd/resolver.go

@@ -10,9 +10,9 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/pkg/useragent"
-	"github.com/docker/docker/registry"
 	registrytypes "github.com/moby/moby/api/types/registry"
 )
 

daemon/daemon.go

@@ -55,6 +55,7 @@ import (
 	dlogger "github.com/docker/docker/daemon/logger"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/plugin"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/daemon/snapshotter"
 	"github.com/docker/docker/daemon/stats"
 	volumesservice "github.com/docker/docker/daemon/volume/service"
@@ -64,7 +65,6 @@ import (
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/registry"
 	"github.com/moby/buildkit/util/grpcerrors"
 	"github.com/moby/buildkit/util/tracing"
 	"github.com/moby/locker"

daemon/hosts.go

@@ -16,7 +16,7 @@ import (
 	"github.com/containerd/containerd/v2/core/remotes/docker"
 	hostconfig "github.com/containerd/containerd/v2/core/remotes/docker/config"
 	cerrdefs "github.com/containerd/errdefs"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/pkg/errors"
 )
 

daemon/info.go

@@ -19,13 +19,13 @@ import (
 	"github.com/docker/docker/daemon/internal/filedescriptors"
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/daemon/logger"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/internal/platform"
 	"github.com/docker/docker/pkg/meminfo"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/parsers/operatingsystem"
 	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/registry"
 	"github.com/moby/moby/api/types"
 	"github.com/moby/moby/api/types/system"
 	"github.com/opencontainers/selinux/go-selinux"

daemon/internal/distribution/config.go

@@ -14,8 +14,8 @@ import (
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/layer"
 	refstore "github.com/docker/docker/daemon/internal/refstore"
+	registrypkg "github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/pkg/progress"
-	registrypkg "github.com/docker/docker/registry"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/opencontainers/go-digest"

daemon/internal/distribution/manifest.go

@@ -15,7 +15,7 @@ import (
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/manifest/manifestlist"
 	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"

daemon/internal/distribution/pull.go

@@ -7,7 +7,7 @@ import (
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
 	refstore "github.com/docker/docker/daemon/internal/refstore"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/moby/moby/api/types/events"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"

daemon/internal/distribution/pull_v2.go

@@ -22,10 +22,10 @@ import (
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/layer"
 	refstore "github.com/docker/docker/daemon/internal/refstore"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/registry"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"

daemon/internal/distribution/pull_v2_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/internal/image"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	registrytypes "github.com/moby/moby/api/types/registry"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/internal/distribution/push_v2.go

@@ -17,10 +17,10 @@ import (
 	"github.com/docker/docker/daemon/internal/distribution/metadata"
 	"github.com/docker/docker/daemon/internal/distribution/xfer"
 	"github.com/docker/docker/daemon/internal/layer"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/registry"
 	apitypes "github.com/moby/moby/api/types"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"

daemon/internal/distribution/push_v2_test.go

@@ -13,8 +13,8 @@ import (
 	"github.com/docker/docker/daemon/internal/distribution/metadata"
 	"github.com/docker/docker/daemon/internal/layer"
 	refstore "github.com/docker/docker/daemon/internal/refstore"
+	registrypkg "github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/pkg/progress"
-	registrypkg "github.com/docker/docker/registry"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/opencontainers/go-digest"
 	"gotest.tools/v3/assert"

daemon/internal/distribution/registry.go

@@ -12,8 +12,8 @@ import (
 	"github.com/docker/distribution/manifest/schema2"
 	"github.com/docker/distribution/registry/client"
 	"github.com/docker/distribution/registry/client/auth"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/registry"
 	registrytypes "github.com/moby/moby/api/types/registry"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

daemon/internal/distribution/registry_unit_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/distribution/reference"
-	registrypkg "github.com/docker/docker/registry"
+	registrypkg "github.com/docker/docker/daemon/pkg/registry"
 	"github.com/moby/moby/api/types/registry"
 	"gotest.tools/v3/assert"
 )

daemon/pkg/plugin/manager.go

@@ -16,10 +16,10 @@ import (
 	"github.com/containerd/containerd/v2/plugins/content/local"
 	"github.com/containerd/log"
 	v2 "github.com/docker/docker/daemon/pkg/plugin/v2"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/internal/containerfs"
 	"github.com/docker/docker/internal/lazyregexp"
 	"github.com/docker/docker/pkg/authorization"
-	"github.com/docker/docker/registry"
 	"github.com/moby/moby/api/types"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/pubsub"

daemon/reload_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/images"
 	"github.com/docker/docker/daemon/libnetwork"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"gotest.tools/v3/assert"
 )
 

integration/system/login_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
+	registrypkg "github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/integration/internal/requirement"
-	registrypkg "github.com/docker/docker/registry"
 	"github.com/moby/moby/api/types/registry"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

testutil/fixtures/plugin/plugin.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/docker/docker/daemon/pkg/plugin"
-	registrypkg "github.com/docker/docker/registry"
+	registrypkg "github.com/docker/docker/daemon/pkg/registry"
 	"github.com/moby/go-archive"
 	"github.com/moby/moby/api/types"
 	"github.com/moby/moby/api/types/events"