diff --git a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go index 21c5842eec..808198de0b 100644 --- a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go +++ b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go @@ -15,10 +15,10 @@ import ( "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver/overlayutils" + "github.com/docker/docker/daemon/internal/directory" "github.com/docker/docker/daemon/internal/fstype" "github.com/docker/docker/daemon/internal/mountref" "github.com/docker/docker/internal/containerfs" - "github.com/docker/docker/internal/directory" "github.com/docker/docker/pkg/parsers/kernel" "github.com/moby/go-archive" "github.com/moby/go-archive/chrootarchive" diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go index 9cd74b9f96..13c6d75cae 100644 --- a/daemon/graphdriver/overlay2/overlay.go +++ b/daemon/graphdriver/overlay2/overlay.go @@ -18,11 +18,11 @@ import ( "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver/overlayutils" + "github.com/docker/docker/daemon/internal/directory" "github.com/docker/docker/daemon/internal/fstype" "github.com/docker/docker/daemon/internal/mountref" "github.com/docker/docker/daemon/internal/quota" "github.com/docker/docker/internal/containerfs" - "github.com/docker/docker/internal/directory" "github.com/docker/go-units" "github.com/moby/go-archive" "github.com/moby/go-archive/chrootarchive" diff --git a/internal/directory/directory.go b/daemon/internal/directory/directory.go similarity index 100% rename from internal/directory/directory.go rename to daemon/internal/directory/directory.go diff --git a/internal/directory/directory_test.go b/daemon/internal/directory/directory_test.go similarity index 100% rename from internal/directory/directory_test.go rename to daemon/internal/directory/directory_test.go diff --git a/internal/directory/directory_unix.go b/daemon/internal/directory/directory_unix.go similarity index 100% rename from internal/directory/directory_unix.go rename to daemon/internal/directory/directory_unix.go diff --git a/internal/directory/directory_windows.go b/daemon/internal/directory/directory_windows.go similarity index 100% rename from internal/directory/directory_windows.go rename to daemon/internal/directory/directory_windows.go diff --git a/daemon/volume/service/convert.go b/daemon/volume/service/convert.go index 59fef44279..9452b1a08b 100644 --- a/daemon/volume/service/convert.go +++ b/daemon/volume/service/convert.go @@ -9,9 +9,9 @@ import ( "github.com/containerd/log" "github.com/docker/docker/api/types/filters" volumetypes "github.com/docker/docker/api/types/volume" + "github.com/docker/docker/daemon/internal/directory" "github.com/docker/docker/daemon/volume" "github.com/docker/docker/errdefs" - "github.com/docker/docker/internal/directory" ) // convertOpts are used to pass options to `volumeToAPI` diff --git a/daemon/volume/service/service.go b/daemon/volume/service/service.go index b14948c6f2..37467fb31f 100644 --- a/daemon/volume/service/service.go +++ b/daemon/volume/service/service.go @@ -9,11 +9,11 @@ import ( "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" volumetypes "github.com/docker/docker/api/types/volume" + "github.com/docker/docker/daemon/internal/directory" "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/internal/directory" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/stringid"