diff --git a/daemon/create_unix.go b/daemon/create_unix.go index e5b284729a..32d2df3754 100644 --- a/daemon/create_unix.go +++ b/daemon/create_unix.go @@ -11,10 +11,10 @@ import ( cerrdefs "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/docker/docker/daemon/container" + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/pkg/oci" volumemounts "github.com/docker/docker/daemon/volume/mounts" volumeopts "github.com/docker/docker/daemon/volume/service/opts" - "github.com/docker/docker/pkg/idtools" containertypes "github.com/moby/moby/api/types/container" mounttypes "github.com/moby/moby/api/types/mount" "github.com/opencontainers/selinux/go-selinux/label" diff --git a/daemon/daemon.go b/daemon/daemon.go index cc9257b87e..d53b7ed825 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -41,6 +41,7 @@ import ( "github.com/docker/docker/daemon/images" "github.com/docker/docker/daemon/internal/distribution" dmetadata "github.com/docker/docker/daemon/internal/distribution/metadata" + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/internal/image" "github.com/docker/docker/daemon/internal/layer" libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types" @@ -62,7 +63,6 @@ import ( "github.com/docker/docker/dockerversion" "github.com/docker/docker/pkg/authorization" "github.com/docker/docker/pkg/fileutils" - "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/sysinfo" "github.com/moby/buildkit/util/grpcerrors" diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go index 2f12d43aec..199c338d85 100644 --- a/daemon/daemon_test.go +++ b/daemon/daemon_test.go @@ -9,9 +9,9 @@ import ( cerrdefs "github.com/containerd/errdefs" "github.com/docker/docker/daemon/container" + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/libnetwork" volumesservice "github.com/docker/docker/daemon/volume/service" - "github.com/docker/docker/pkg/idtools" "github.com/docker/go-connections/nat" containertypes "github.com/moby/moby/api/types/container" "github.com/pkg/errors" diff --git a/pkg/idtools/idtools.go b/daemon/internal/idtools/idtools.go similarity index 100% rename from pkg/idtools/idtools.go rename to daemon/internal/idtools/idtools.go diff --git a/daemon/volume/local/local.go b/daemon/volume/local/local.go index 39f263b541..0b24c2a1ad 100644 --- a/daemon/volume/local/local.go +++ b/daemon/volume/local/local.go @@ -14,11 +14,11 @@ import ( "sync" "github.com/containerd/log" + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/internal/quota" "github.com/docker/docker/daemon/names" "github.com/docker/docker/daemon/volume" "github.com/docker/docker/errdefs" - "github.com/docker/docker/pkg/idtools" "github.com/moby/sys/atomicwriter" "github.com/moby/sys/user" "github.com/pkg/errors" diff --git a/daemon/volume/local/local_linux_test.go b/daemon/volume/local/local_linux_test.go index d6962b7f25..11e524b7db 100644 --- a/daemon/volume/local/local_linux_test.go +++ b/daemon/volume/local/local_linux_test.go @@ -10,8 +10,8 @@ import ( "testing" cerrdefs "github.com/containerd/errdefs" + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/internal/quota" - "github.com/docker/docker/pkg/idtools" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/daemon/volume/local/local_test.go b/daemon/volume/local/local_test.go index fa6e1b219c..ab3f971c86 100644 --- a/daemon/volume/local/local_test.go +++ b/daemon/volume/local/local_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/docker/docker/pkg/idtools" + "github.com/docker/docker/daemon/internal/idtools" "github.com/moby/sys/mountinfo" "gotest.tools/v3/skip" ) diff --git a/daemon/volume/mounts/mounts.go b/daemon/volume/mounts/mounts.go index 599f448c07..3b4a881700 100644 --- a/daemon/volume/mounts/mounts.go +++ b/daemon/volume/mounts/mounts.go @@ -7,9 +7,9 @@ import ( "syscall" "github.com/containerd/log" + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/volume" "github.com/docker/docker/daemon/volume/safepath" - "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/stringid" mounttypes "github.com/moby/moby/api/types/mount" "github.com/moby/sys/user" diff --git a/daemon/volume/service/default_driver.go b/daemon/volume/service/default_driver.go index a91d88d4cb..70c5621989 100644 --- a/daemon/volume/service/default_driver.go +++ b/daemon/volume/service/default_driver.go @@ -3,10 +3,10 @@ package service import ( + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/volume" "github.com/docker/docker/daemon/volume/drivers" "github.com/docker/docker/daemon/volume/local" - "github.com/docker/docker/pkg/idtools" "github.com/pkg/errors" ) diff --git a/daemon/volume/service/default_driver_stubs.go b/daemon/volume/service/default_driver_stubs.go index b824b64cd8..df7f5c0f07 100644 --- a/daemon/volume/service/default_driver_stubs.go +++ b/daemon/volume/service/default_driver_stubs.go @@ -3,8 +3,8 @@ package service import ( + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/volume/drivers" - "github.com/docker/docker/pkg/idtools" ) func setupDefaultDriver(_ *drivers.Store, _ string, _ idtools.Identity) error { return nil } diff --git a/daemon/volume/service/service.go b/daemon/volume/service/service.go index 7d119df042..cc252fdbd5 100644 --- a/daemon/volume/service/service.go +++ b/daemon/volume/service/service.go @@ -7,11 +7,11 @@ import ( "github.com/containerd/log" "github.com/docker/docker/daemon/internal/directory" + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/volume" "github.com/docker/docker/daemon/volume/drivers" "github.com/docker/docker/daemon/volume/service/opts" "github.com/docker/docker/errdefs" - "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/stringid" "github.com/moby/moby/api/types/events" diff --git a/daemon/volume/service/service_linux_test.go b/daemon/volume/service/service_linux_test.go index 4ace74171a..3eaed0282f 100644 --- a/daemon/volume/service/service_linux_test.go +++ b/daemon/volume/service/service_linux_test.go @@ -6,12 +6,12 @@ import ( "path/filepath" "testing" + "github.com/docker/docker/daemon/internal/idtools" "github.com/docker/docker/daemon/volume" volumedrivers "github.com/docker/docker/daemon/volume/drivers" "github.com/docker/docker/daemon/volume/local" "github.com/docker/docker/daemon/volume/service/opts" "github.com/docker/docker/daemon/volume/testutils" - "github.com/docker/docker/pkg/idtools" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/daemon/volumes_unix.go b/daemon/volumes_unix.go index 82ff2a059a..1f293c58c4 100644 --- a/daemon/volumes_unix.go +++ b/daemon/volumes_unix.go @@ -11,9 +11,9 @@ import ( "github.com/containerd/log" "github.com/docker/docker/daemon/container" + "github.com/docker/docker/daemon/internal/idtools" volumemounts "github.com/docker/docker/daemon/volume/mounts" "github.com/docker/docker/internal/cleanups" - "github.com/docker/docker/pkg/idtools" "github.com/moby/moby/api/types/events" mounttypes "github.com/moby/moby/api/types/mount" "github.com/pkg/errors" diff --git a/daemon/volumes_windows.go b/daemon/volumes_windows.go index 2df79f03c1..b47c520f3c 100644 --- a/daemon/volumes_windows.go +++ b/daemon/volumes_windows.go @@ -5,9 +5,9 @@ import ( "github.com/containerd/log" "github.com/docker/docker/daemon/container" + "github.com/docker/docker/daemon/internal/idtools" volumemounts "github.com/docker/docker/daemon/volume/mounts" "github.com/docker/docker/internal/cleanups" - "github.com/docker/docker/pkg/idtools" "github.com/moby/moby/api/types/mount" )