Merge pull request moby#50367 from dmcgowan/move-volume-daemon

Move volume under daemon

Author: austinvazquez

daemon/archive_unix.go

@@ -11,9 +11,9 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/daemon/container"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/ioutils"
-	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/moby/go-archive"
 	"github.com/pkg/errors"
 )

daemon/cluster/executor/backend.go

@@ -22,8 +22,8 @@ import (
 	networktypes "github.com/docker/docker/daemon/libnetwork/types"
 	networkSettings "github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/plugin"
+	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/image"
-	volumeopts "github.com/docker/docker/volume/service/opts"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

daemon/cluster/executor/container/adapter.go

@@ -23,7 +23,7 @@ import (
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"
 	"github.com/docker/docker/daemon/libnetwork"
 	networkSettings "github.com/docker/docker/daemon/network"
-	volumeopts "github.com/docker/docker/volume/service/opts"
+	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"

daemon/container.go

@@ -22,10 +22,10 @@ import (
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/opts"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/oci/caps"
-	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/sys/signal"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/container/container.go

@@ -29,11 +29,11 @@ import (
 	"github.com/docker/docker/daemon/logger/local"
 	"github.com/docker/docker/daemon/logger/loggerutils/cache"
 	"github.com/docker/docker/daemon/network"
+	"github.com/docker/docker/daemon/volume"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/oci"
-	"github.com/docker/docker/volume"
-	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/docker/go-units"
 	agentexec "github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/sys/atomicwriter"

daemon/container/container_unix.go

@@ -14,7 +14,7 @@ import (
 	"github.com/docker/docker/api/types/events"
 	mounttypes "github.com/docker/docker/api/types/mount"
 	swarmtypes "github.com/docker/docker/api/types/swarm"
-	volumemounts "github.com/docker/docker/volume/mounts"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/moby/sys/mount"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"

daemon/containerfs_linux.go

@@ -17,7 +17,7 @@ import (
 
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/internal/mounttree"
+	"github.com/docker/docker/daemon/internal/mounttree"
 	"github.com/docker/docker/internal/unshare"
 	"github.com/docker/docker/pkg/fileutils"
 )

daemon/create_unix.go

@@ -13,10 +13,10 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	mounttypes "github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/daemon/container"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
+	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/oci"
 	"github.com/docker/docker/pkg/idtools"
-	volumemounts "github.com/docker/docker/volume/mounts"
-	volumeopts "github.com/docker/docker/volume/service/opts"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
 )

daemon/create_windows.go

@@ -6,8 +6,8 @@ import (
 
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/container"
-	volumemounts "github.com/docker/docker/volume/mounts"
-	volumeopts "github.com/docker/docker/volume/service/opts"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
+	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 )
 
 // createContainerOSSpecificSettings performs host-OS specific container create functionality

daemon/daemon.go

@@ -59,6 +59,7 @@ import (
 	"github.com/docker/docker/daemon/pkg/plugin"
 	"github.com/docker/docker/daemon/snapshotter"
 	"github.com/docker/docker/daemon/stats"
+	volumesservice "github.com/docker/docker/daemon/volume/service"
 	"github.com/docker/docker/distribution"
 	dmetadata "github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/dockerversion"
@@ -71,7 +72,6 @@ import (
 	"github.com/docker/docker/pkg/sysinfo"
 	refstore "github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
-	volumesservice "github.com/docker/docker/volume/service"
 	"github.com/moby/buildkit/util/grpcerrors"
 	"github.com/moby/buildkit/util/tracing"
 	"github.com/moby/locker"