diff --git a/daemon/command/config.go b/daemon/command/config.go index c3cfa97b42..496c0997ff 100644 --- a/daemon/command/config.go +++ b/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" ) diff --git a/daemon/config/config.go b/daemon/config/config.go index 353e2e3987..0048cc670c 100644 --- a/daemon/config/config.go +++ b/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" diff --git a/daemon/config/config_test.go b/daemon/config/config_test.go index c1d62f8973..5a24969226 100644 --- a/daemon/config/config_test.go +++ b/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" diff --git a/daemon/containerd/resolver.go b/daemon/containerd/resolver.go index 9705fe39e6..21031c7ba5 100644 --- a/daemon/containerd/resolver.go +++ b/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" ) diff --git a/daemon/daemon.go b/daemon/daemon.go index 6cc3790dd9..cc9257b87e 100644 --- a/daemon/daemon.go +++ b/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" diff --git a/daemon/hosts.go b/daemon/hosts.go index 52348fc22f..64990ac419 100644 --- a/daemon/hosts.go +++ b/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" ) diff --git a/daemon/info.go b/daemon/info.go index 3e01ee5ed0..717dcc01f3 100644 --- a/daemon/info.go +++ b/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" diff --git a/daemon/internal/distribution/config.go b/daemon/internal/distribution/config.go index d3bb6fab04..bb501d9874 100644 --- a/daemon/internal/distribution/config.go +++ b/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" diff --git a/daemon/internal/distribution/manifest.go b/daemon/internal/distribution/manifest.go index c9bf813063..8e17186e7a 100644 --- a/daemon/internal/distribution/manifest.go +++ b/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" diff --git a/daemon/internal/distribution/pull.go b/daemon/internal/distribution/pull.go index fab38c3ba0..593695952f 100644 --- a/daemon/internal/distribution/pull.go +++ b/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" diff --git a/daemon/internal/distribution/pull_v2.go b/daemon/internal/distribution/pull_v2.go index 19d88a51a3..9b0283a43f 100644 --- a/daemon/internal/distribution/pull_v2.go +++ b/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" diff --git a/daemon/internal/distribution/pull_v2_test.go b/daemon/internal/distribution/pull_v2_test.go index 6b1795238d..66748f57aa 100644 --- a/daemon/internal/distribution/pull_v2_test.go +++ b/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" diff --git a/daemon/internal/distribution/push_v2.go b/daemon/internal/distribution/push_v2.go index 17f59e2fed..65103b34b4 100644 --- a/daemon/internal/distribution/push_v2.go +++ b/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" diff --git a/daemon/internal/distribution/push_v2_test.go b/daemon/internal/distribution/push_v2_test.go index d7f007c23d..548fda6d8a 100644 --- a/daemon/internal/distribution/push_v2_test.go +++ b/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" diff --git a/daemon/internal/distribution/registry.go b/daemon/internal/distribution/registry.go index 9a81627539..0de9c1cdc5 100644 --- a/daemon/internal/distribution/registry.go +++ b/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" ) diff --git a/daemon/internal/distribution/registry_unit_test.go b/daemon/internal/distribution/registry_unit_test.go index 5191cfec4c..42e6cee91e 100644 --- a/daemon/internal/distribution/registry_unit_test.go +++ b/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" ) diff --git a/daemon/pkg/plugin/manager.go b/daemon/pkg/plugin/manager.go index 5b04fc8acc..b765d59b97 100644 --- a/daemon/pkg/plugin/manager.go +++ b/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" diff --git a/registry/auth.go b/daemon/pkg/registry/auth.go similarity index 100% rename from registry/auth.go rename to daemon/pkg/registry/auth.go diff --git a/registry/auth_test.go b/daemon/pkg/registry/auth_test.go similarity index 100% rename from registry/auth_test.go rename to daemon/pkg/registry/auth_test.go diff --git a/registry/config.go b/daemon/pkg/registry/config.go similarity index 100% rename from registry/config.go rename to daemon/pkg/registry/config.go diff --git a/registry/config_test.go b/daemon/pkg/registry/config_test.go similarity index 100% rename from registry/config_test.go rename to daemon/pkg/registry/config_test.go diff --git a/registry/errors.go b/daemon/pkg/registry/errors.go similarity index 100% rename from registry/errors.go rename to daemon/pkg/registry/errors.go diff --git a/registry/registry.go b/daemon/pkg/registry/registry.go similarity index 100% rename from registry/registry.go rename to daemon/pkg/registry/registry.go diff --git a/registry/registry_mock_test.go b/daemon/pkg/registry/registry_mock_test.go similarity index 100% rename from registry/registry_mock_test.go rename to daemon/pkg/registry/registry_mock_test.go diff --git a/registry/registry_test.go b/daemon/pkg/registry/registry_test.go similarity index 100% rename from registry/registry_test.go rename to daemon/pkg/registry/registry_test.go diff --git a/registry/resumable/resumablerequestreader.go b/daemon/pkg/registry/resumable/resumablerequestreader.go similarity index 100% rename from registry/resumable/resumablerequestreader.go rename to daemon/pkg/registry/resumable/resumablerequestreader.go diff --git a/registry/resumable/resumablerequestreader_test.go b/daemon/pkg/registry/resumable/resumablerequestreader_test.go similarity index 100% rename from registry/resumable/resumablerequestreader_test.go rename to daemon/pkg/registry/resumable/resumablerequestreader_test.go diff --git a/registry/search.go b/daemon/pkg/registry/search.go similarity index 100% rename from registry/search.go rename to daemon/pkg/registry/search.go diff --git a/registry/search_endpoint_v1.go b/daemon/pkg/registry/search_endpoint_v1.go similarity index 100% rename from registry/search_endpoint_v1.go rename to daemon/pkg/registry/search_endpoint_v1.go diff --git a/registry/search_endpoint_v1_test.go b/daemon/pkg/registry/search_endpoint_v1_test.go similarity index 100% rename from registry/search_endpoint_v1_test.go rename to daemon/pkg/registry/search_endpoint_v1_test.go diff --git a/registry/search_session.go b/daemon/pkg/registry/search_session.go similarity index 100% rename from registry/search_session.go rename to daemon/pkg/registry/search_session.go diff --git a/registry/search_test.go b/daemon/pkg/registry/search_test.go similarity index 100% rename from registry/search_test.go rename to daemon/pkg/registry/search_test.go diff --git a/registry/service.go b/daemon/pkg/registry/service.go similarity index 100% rename from registry/service.go rename to daemon/pkg/registry/service.go diff --git a/registry/service_v2.go b/daemon/pkg/registry/service_v2.go similarity index 100% rename from registry/service_v2.go rename to daemon/pkg/registry/service_v2.go diff --git a/registry/types.go b/daemon/pkg/registry/types.go similarity index 100% rename from registry/types.go rename to daemon/pkg/registry/types.go diff --git a/daemon/reload_test.go b/daemon/reload_test.go index c6729650e7..c651b6da2e 100644 --- a/daemon/reload_test.go +++ b/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" ) diff --git a/integration/system/login_test.go b/integration/system/login_test.go index 95878d5733..3c8ae400b2 100644 --- a/integration/system/login_test.go +++ b/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" diff --git a/testutil/fixtures/plugin/plugin.go b/testutil/fixtures/plugin/plugin.go index ba1779bce5..81f3f38e38 100644 --- a/testutil/fixtures/plugin/plugin.go +++ b/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"