From d2b470142c1cf8bd7ffd1460231a8f1ede02faaa Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 9 Apr 2019 11:46:26 -0700 Subject: [PATCH] daemon/mountVolumes: no need to specify fstype For bind mounts, fstype argument to mount(2) is ignored. Usual convention is either empty string or "none". Signed-off-by: Kir Kolyshkin (cherry picked from commit 4e65b17ac4e2792ae80c9415c68f9263c3d18db4) Signed-off-by: Sebastiaan van Stijn --- daemon/bindmount_unix.go | 5 ----- daemon/volumes_unix.go | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 daemon/bindmount_unix.go diff --git a/daemon/bindmount_unix.go b/daemon/bindmount_unix.go deleted file mode 100644 index 028e300b06..0000000000 --- a/daemon/bindmount_unix.go +++ /dev/null @@ -1,5 +0,0 @@ -// +build linux freebsd - -package daemon // import "github.com/docker/docker/daemon" - -const bindMountType = "bind" diff --git a/daemon/volumes_unix.go b/daemon/volumes_unix.go index 5b47c46616..13e0a90194 100644 --- a/daemon/volumes_unix.go +++ b/daemon/volumes_unix.go @@ -142,7 +142,7 @@ func (daemon *Daemon) mountVolumes(container *container.Container) error { writeMode = "rw" } opts := strings.Join([]string{bindMode, writeMode}, ",") - if err := mount.Mount(m.Source, dest, bindMountType, opts); err != nil { + if err := mount.Mount(m.Source, dest, "", opts); err != nil { return err }