diff --git a/container/container_unix.go b/container/container_unix.go index 3fc6c91e72..82f5693b10 100644 --- a/container/container_unix.go +++ b/container/container_unix.go @@ -13,10 +13,10 @@ import ( containertypes "github.com/docker/docker/api/types/container" mounttypes "github.com/docker/docker/api/types/mount" swarmtypes "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/volume" volumemounts "github.com/docker/docker/volume/mounts" + "github.com/moby/sys/mount" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go index 3098cc00ad..07f5cdd158 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go @@ -15,10 +15,10 @@ import ( "github.com/docker/docker/daemon/links" "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/runconfig" "github.com/docker/libnetwork" + "github.com/moby/sys/mount" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/daemon_linux.go b/daemon/daemon_linux.go index 38349c8e59..e6b60f22dc 100644 --- a/daemon/daemon_linux.go +++ b/daemon/daemon_linux.go @@ -9,8 +9,9 @@ import ( "strings" "github.com/docker/docker/daemon/config" - "github.com/docker/docker/pkg/mount" "github.com/docker/libnetwork/resolvconf" + "github.com/moby/sys/mount" + "github.com/moby/sys/mountinfo" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -75,7 +76,7 @@ func (daemon *Daemon) cleanupMounts() error { return err } - info, err := mount.GetMounts(mount.SingleEntryFilter(daemon.root)) + info, err := mountinfo.GetMounts(mountinfo.SingleEntryFilter(daemon.root)) if err != nil { return errors.Wrap(err, "error reading mount table for cleanup") } @@ -122,7 +123,7 @@ func getCleanPatterns(id string) (regexps []*regexp.Regexp) { return } -func shouldUnmountRoot(root string, info *mount.Info) bool { +func shouldUnmountRoot(root string, info *mountinfo.Info) bool { if !strings.HasSuffix(root, info.Root) { return false } diff --git a/daemon/daemon_linux_test.go b/daemon/daemon_linux_test.go index da8ebf1b78..8e13523fda 100644 --- a/daemon/daemon_linux_test.go +++ b/daemon/daemon_linux_test.go @@ -11,7 +11,8 @@ import ( containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/daemon/config" - "github.com/docker/docker/pkg/mount" + "github.com/moby/sys/mount" + "github.com/moby/sys/mountinfo" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) @@ -123,25 +124,25 @@ func TestShouldUnmountRoot(t *testing.T) { for _, test := range []struct { desc string root string - info *mount.Info + info *mountinfo.Info expect bool }{ { desc: "root is at /", root: "/docker", - info: &mount.Info{Root: "/docker", Mountpoint: "/docker"}, + info: &mountinfo.Info{Root: "/docker", Mountpoint: "/docker"}, expect: true, }, { desc: "root is at in a submount from `/`", root: "/foo/docker", - info: &mount.Info{Root: "/docker", Mountpoint: "/foo/docker"}, + info: &mountinfo.Info{Root: "/docker", Mountpoint: "/foo/docker"}, expect: true, }, { desc: "root is mounted in from a parent mount namespace same root dir", // dind is an example of this root: "/docker", - info: &mount.Info{Root: "/docker/volumes/1234657/_data", Mountpoint: "/docker"}, + info: &mountinfo.Info{Root: "/docker/volumes/1234657/_data", Mountpoint: "/docker"}, expect: false, }, } { @@ -172,7 +173,7 @@ func TestShouldUnmountRoot(t *testing.T) { func checkMounted(t *testing.T, p string, expect bool) { t.Helper() - mounted, err := mount.Mounted(p) + mounted, err := mountinfo.Mounted(p) assert.Check(t, err) assert.Check(t, mounted == expect, "expected %v, actual %v", expect, mounted) } diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 0cd82b4ae9..cda1a3b616 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -29,7 +29,6 @@ import ( "github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/ioutils" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/sysinfo" @@ -42,6 +41,7 @@ import ( "github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/options" lntypes "github.com/docker/libnetwork/types" + "github.com/moby/sys/mount" "github.com/opencontainers/runc/libcontainer/cgroups" rsystem "github.com/opencontainers/runc/libcontainer/system" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index 21178d0743..8396580f18 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/daemon/graphdriver/aufs/aufs.go @@ -42,8 +42,8 @@ import ( "github.com/docker/docker/pkg/directory" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/locker" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/system" + "github.com/moby/sys/mount" rsystem "github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" diff --git a/daemon/graphdriver/aufs/mount.go b/daemon/graphdriver/aufs/mount.go index 3c5f70d644..d6a760d1c2 100644 --- a/daemon/graphdriver/aufs/mount.go +++ b/daemon/graphdriver/aufs/mount.go @@ -7,7 +7,7 @@ import ( "syscall" "time" - "github.com/docker/docker/pkg/mount" + "github.com/moby/sys/mount" "github.com/pkg/errors" "golang.org/x/sys/unix" ) diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go index dfb70a662c..1866b07b88 100644 --- a/daemon/graphdriver/btrfs/btrfs.go +++ b/daemon/graphdriver/btrfs/btrfs.go @@ -29,10 +29,10 @@ import ( "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/system" units "github.com/docker/go-units" + "github.com/moby/sys/mount" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 023fb9dcaa..590e062123 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -24,10 +24,10 @@ import ( "github.com/docker/docker/pkg/dmesg" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/loopback" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers/kernel" units "github.com/docker/go-units" + "github.com/moby/sys/mount" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/graphdriver/devmapper/driver.go b/daemon/graphdriver/devmapper/driver.go index 400cfe05fb..5bc280bccd 100644 --- a/daemon/graphdriver/devmapper/driver.go +++ b/daemon/graphdriver/devmapper/driver.go @@ -14,8 +14,8 @@ import ( "github.com/docker/docker/pkg/devicemapper" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/locker" - "github.com/docker/docker/pkg/mount" units "github.com/docker/go-units" + "github.com/moby/sys/mount" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/daemon/graphdriver/driver_linux.go b/daemon/graphdriver/driver_linux.go index 4846f7026e..49cce48aec 100644 --- a/daemon/graphdriver/driver_linux.go +++ b/daemon/graphdriver/driver_linux.go @@ -1,7 +1,7 @@ package graphdriver // import "github.com/docker/docker/daemon/graphdriver" import ( - "github.com/docker/docker/pkg/mount" + "github.com/moby/sys/mountinfo" "golang.org/x/sys/unix" ) @@ -113,7 +113,7 @@ type defaultChecker struct { } func (c *defaultChecker) IsMounted(path string) bool { - m, _ := mount.Mounted(path) + m, _ := mountinfo.Mounted(path) return m } diff --git a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go index b07b4c1d6b..5a93783802 100644 --- a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go +++ b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go @@ -22,9 +22,9 @@ import ( "github.com/docker/docker/pkg/directory" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/locker" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/system" + "github.com/moby/sys/mount" rsystem "github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" diff --git a/daemon/graphdriver/overlay/overlay.go b/daemon/graphdriver/overlay/overlay.go index e837a595e1..c018de1214 100644 --- a/daemon/graphdriver/overlay/overlay.go +++ b/daemon/graphdriver/overlay/overlay.go @@ -20,9 +20,9 @@ import ( "github.com/docker/docker/pkg/fsutils" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/locker" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/system" + "github.com/moby/sys/mount" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go index 9185e56bfa..66c3861ba2 100644 --- a/daemon/graphdriver/overlay2/overlay.go +++ b/daemon/graphdriver/overlay2/overlay.go @@ -25,10 +25,10 @@ import ( "github.com/docker/docker/pkg/fsutils" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/locker" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/system" units "github.com/docker/go-units" + "github.com/moby/sys/mount" rsystem "github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" diff --git a/daemon/graphdriver/zfs/zfs.go b/daemon/graphdriver/zfs/zfs.go index 3d8b302c11..0c0daaf2b0 100644 --- a/daemon/graphdriver/zfs/zfs.go +++ b/daemon/graphdriver/zfs/zfs.go @@ -15,9 +15,10 @@ import ( "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" zfs "github.com/mistifyio/go-zfs" + "github.com/moby/sys/mount" + "github.com/moby/sys/mountinfo" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -148,7 +149,7 @@ func lookupZfsDataset(rootdir string) (string, error) { } wantedDev := stat.Dev - mounts, err := mount.GetMounts(nil) + mounts, err := mountinfo.GetMounts(nil) if err != nil { return "", err } diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go index 60abafbae0..06c84ec52c 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -20,10 +20,11 @@ import ( "github.com/docker/docker/oci" "github.com/docker/docker/oci/caps" "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/rootless/specconv" volumemounts "github.com/docker/docker/volume/mounts" + "github.com/moby/sys/mount" + "github.com/moby/sys/mountinfo" "github.com/opencontainers/runc/libcontainer/apparmor" "github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/devices" @@ -368,7 +369,7 @@ func getSourceMount(source string) (string, string, error) { return "", "", err } - mi, err := mount.GetMounts(mount.ParentsFilter(sourcePath)) + mi, err := mountinfo.GetMounts(mountinfo.ParentsFilter(sourcePath)) if err != nil { return "", "", err } diff --git a/daemon/start.go b/daemon/start.go index 6f481157d4..a78eac4191 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -12,7 +12,7 @@ import ( containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/container" "github.com/docker/docker/errdefs" - "github.com/docker/docker/pkg/mount" + "github.com/moby/sys/mount" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/volumes_unix.go b/daemon/volumes_unix.go index 3f4c5ffda1..37a538d584 100644 --- a/daemon/volumes_unix.go +++ b/daemon/volumes_unix.go @@ -12,8 +12,8 @@ import ( mounttypes "github.com/docker/docker/api/types/mount" "github.com/docker/docker/container" "github.com/docker/docker/pkg/fileutils" - "github.com/docker/docker/pkg/mount" volumemounts "github.com/docker/docker/volume/mounts" + "github.com/moby/sys/mount" ) // setupMounts iterates through each of the mount points for a container and diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index af46897930..9192c4ba09 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -26,11 +26,11 @@ import ( "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/pkg/ioutils" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/testutil/request" "github.com/docker/docker/volume" "github.com/docker/go-connections/nat" + "github.com/moby/sys/mount" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index fd55f93b7b..e9cca31153 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -32,11 +32,11 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/integration-cli/daemon" "github.com/docker/docker/opts" - "github.com/docker/docker/pkg/mount" testdaemon "github.com/docker/docker/testutil/daemon" units "github.com/docker/go-units" "github.com/docker/libnetwork/iptables" "github.com/docker/libtrust" + "github.com/moby/sys/mount" "golang.org/x/sys/unix" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 9bc8d1ffc3..4adb32f154 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -27,7 +27,6 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/runconfig" "github.com/docker/docker/testutil" @@ -35,6 +34,8 @@ import ( "github.com/docker/go-connections/nat" "github.com/docker/libnetwork/resolvconf" "github.com/docker/libnetwork/types" + "github.com/moby/sys/mount" + "github.com/moby/sys/mountinfo" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" ) @@ -1438,7 +1439,7 @@ func (s *DockerSuite) TestRunResolvconfUpdate(c *testing.T) { // This test case is meant to test monitoring resolv.conf when it is // a regular file not a bind mounc. So we unmount resolv.conf and replace // it with a file containing the original settings. - mounted, err := mount.Mounted("/etc/resolv.conf") + mounted, err := mountinfo.Mounted("/etc/resolv.conf") if err != nil { c.Fatal(err) } @@ -3789,7 +3790,7 @@ func (s *DockerSuite) TestRunVolumesMountedAsShared(c *testing.T) { dockerCmd(c, "run", "--privileged", "-v", fmt.Sprintf("%s:/volume-dest:shared", tmpDir), "busybox", "mount", "--bind", "/volume-dest/mnt1", "/volume-dest/mnt1") // Make sure a bind mount under a shared volume propagated to host. - if mounted, _ := mount.Mounted(path.Join(tmpDir, "mnt1")); !mounted { + if mounted, _ := mountinfo.Mounted(path.Join(tmpDir, "mnt1")); !mounted { c.Fatalf("Bind mount under shared volume did not propagate to host") } diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index 11cca40ae2..8a95bc577f 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -23,9 +23,9 @@ import ( "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/pkg/homedir" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/sysinfo" + "github.com/moby/sys/mount" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" ) diff --git a/integration/container/mounts_linux_test.go b/integration/container/mounts_linux_test.go index 7a515e51ea..6e9fc8cfa9 100644 --- a/integration/container/mounts_linux_test.go +++ b/integration/container/mounts_linux_test.go @@ -14,8 +14,8 @@ import ( "github.com/docker/docker/api/types/versions" "github.com/docker/docker/client" "github.com/docker/docker/integration/internal/container" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/system" + "github.com/moby/sys/mount" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/fs" diff --git a/pkg/archive/archive_linux.go b/pkg/archive/archive_linux.go index fae42c00e6..29ddd4b199 100644 --- a/pkg/archive/archive_linux.go +++ b/pkg/archive/archive_linux.go @@ -10,8 +10,8 @@ import ( "syscall" "github.com/containerd/continuity/fs" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/system" + "github.com/moby/sys/mount" "github.com/pkg/errors" "golang.org/x/sys/unix" ) diff --git a/pkg/archive/archive_linux_test.go b/pkg/archive/archive_linux_test.go index ffec59bcde..8858d2652d 100644 --- a/pkg/archive/archive_linux_test.go +++ b/pkg/archive/archive_linux_test.go @@ -9,9 +9,9 @@ import ( "syscall" "testing" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/system" + "github.com/moby/sys/mount" rsystem "github.com/opencontainers/runc/libcontainer/system" "github.com/pkg/errors" "golang.org/x/sys/unix" diff --git a/pkg/chrootarchive/chroot_linux.go b/pkg/chrootarchive/chroot_linux.go index 9802fad514..e0f4ebbb05 100644 --- a/pkg/chrootarchive/chroot_linux.go +++ b/pkg/chrootarchive/chroot_linux.go @@ -6,7 +6,8 @@ import ( "os" "path/filepath" - "github.com/docker/docker/pkg/mount" + "github.com/moby/sys/mount" + "github.com/moby/sys/mountinfo" rsystem "github.com/opencontainers/runc/libcontainer/system" "golang.org/x/sys/unix" ) @@ -36,7 +37,7 @@ func chroot(path string) (err error) { return err } - if mounted, _ := mount.Mounted(path); !mounted { + if mounted, _ := mountinfo.Mounted(path); !mounted { if err := mount.Mount(path, path, "bind", "rbind,rw"); err != nil { return realChroot(path) } diff --git a/pkg/system/rm.go b/pkg/system/rm.go index ef7f505fdf..9e251dc153 100644 --- a/pkg/system/rm.go +++ b/pkg/system/rm.go @@ -5,7 +5,7 @@ import ( "syscall" "time" - "github.com/docker/docker/pkg/mount" + "github.com/moby/sys/mount" "github.com/pkg/errors" ) diff --git a/pkg/system/rm_test.go b/pkg/system/rm_test.go index a956d47bd4..aa0ea7ecfd 100644 --- a/pkg/system/rm_test.go +++ b/pkg/system/rm_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/docker/docker/pkg/mount" + "github.com/moby/sys/mount" "gotest.tools/v3/skip" ) diff --git a/plugin/backend_linux.go b/plugin/backend_linux.go index 3201527d44..f77d12650d 100644 --- a/plugin/backend_linux.go +++ b/plugin/backend_linux.go @@ -27,12 +27,12 @@ import ( "github.com/docker/docker/layer" "github.com/docker/docker/pkg/authorization" "github.com/docker/docker/pkg/chrootarchive" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/system" v2 "github.com/docker/docker/plugin/v2" refstore "github.com/docker/docker/reference" + "github.com/moby/sys/mount" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" diff --git a/plugin/manager.go b/plugin/manager.go index aac5a4666e..38b18f0e74 100644 --- a/plugin/manager.go +++ b/plugin/manager.go @@ -18,11 +18,11 @@ import ( "github.com/docker/docker/layer" "github.com/docker/docker/pkg/authorization" "github.com/docker/docker/pkg/ioutils" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/pubsub" "github.com/docker/docker/pkg/system" v2 "github.com/docker/docker/plugin/v2" "github.com/docker/docker/registry" + "github.com/moby/sys/mount" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go index bda272d71c..a3aca0d783 100644 --- a/plugin/manager_linux.go +++ b/plugin/manager_linux.go @@ -12,10 +12,10 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/plugins" "github.com/docker/docker/pkg/stringid" v2 "github.com/docker/docker/plugin/v2" + "github.com/moby/sys/mount" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/plugin/manager_linux_test.go b/plugin/manager_linux_test.go index a42d34727f..d874ef29dc 100644 --- a/plugin/manager_linux_test.go +++ b/plugin/manager_linux_test.go @@ -9,10 +9,11 @@ import ( "testing" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/system" v2 "github.com/docker/docker/plugin/v2" + "github.com/moby/sys/mount" + "github.com/moby/sys/mountinfo" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "gotest.tools/v3/skip" @@ -64,7 +65,7 @@ func TestManagerWithPluginMounts(t *testing.T) { if err := m.Remove(p1.GetID(), &types.PluginRmConfig{ForceRemove: true}); err != nil { t.Fatal(err) } - if mounted, err := mount.Mounted(p2Mount); !mounted || err != nil { + if mounted, err := mountinfo.Mounted(p2Mount); !mounted || err != nil { t.Fatalf("expected %s to be mounted, err: %v", p2Mount, err) } } diff --git a/testutil/daemon/daemon.go b/testutil/daemon/daemon.go index a6acb0ef1a..6c906084da 100644 --- a/testutil/daemon/daemon.go +++ b/testutil/daemon/daemon.go @@ -19,11 +19,11 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/opts" "github.com/docker/docker/pkg/ioutils" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/testutil/request" "github.com/docker/go-connections/sockets" "github.com/docker/go-connections/tlsconfig" + "github.com/moby/sys/mount" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/volume/local/local.go b/volume/local/local.go index e587814d19..17a96550c0 100644 --- a/volume/local/local.go +++ b/volume/local/local.go @@ -16,8 +16,9 @@ import ( "github.com/docker/docker/daemon/names" "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/mount" "github.com/docker/docker/volume" + "github.com/moby/sys/mount" + "github.com/moby/sys/mountinfo" "github.com/pkg/errors" ) @@ -335,7 +336,7 @@ func (v *localVolume) Unmount(id string) error { func (v *localVolume) unmount() error { if v.opts != nil { if err := mount.Unmount(v.path); err != nil { - if mounted, mErr := mount.Mounted(v.path); mounted || mErr != nil { + if mounted, mErr := mountinfo.Mounted(v.path); mounted || mErr != nil { return errdefs.System(err) } } diff --git a/volume/local/local_test.go b/volume/local/local_test.go index 381787ecb1..ec5cecb6f4 100644 --- a/volume/local/local_test.go +++ b/volume/local/local_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/mount" + "github.com/moby/sys/mountinfo" "gotest.tools/v3/skip" ) @@ -211,7 +211,7 @@ func TestCreateWithOpts(t *testing.T) { } }() - mountInfos, err := mount.GetMounts(mount.SingleEntryFilter(dir)) + mountInfos, err := mountinfo.GetMounts(mountinfo.SingleEntryFilter(dir)) if err != nil { t.Fatal(err) } @@ -253,7 +253,7 @@ func TestCreateWithOpts(t *testing.T) { t.Fatalf("Expected active mount count to be 1, got %d", v.active.count) } - mounted, err := mount.Mounted(v.path) + mounted, err := mountinfo.Mounted(v.path) if err != nil { t.Fatal(err) } diff --git a/volume/local/local_unix.go b/volume/local/local_unix.go index 4ac45baf25..5af8822191 100644 --- a/volume/local/local_unix.go +++ b/volume/local/local_unix.go @@ -15,7 +15,7 @@ import ( "time" "github.com/docker/docker/errdefs" - "github.com/docker/docker/pkg/mount" + "github.com/moby/sys/mount" "github.com/pkg/errors" )