pkg/archive: use mount pkg

kolyshkin · kolyshkin · commit b890c2055559 · 2020-03-10T18:23:53.000-07:00
It makes sense to use mount package here because
 - it no longer requires /proc to be mounted
 - it provides verbose errors so the caller doesn't have to

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/pkg/archive/archive_linux.go b/pkg/archive/archive_linux.go
@@ -10,6 +10,7 @@ import (
 	"syscall"
 
 	"github.com/containerd/continuity/fs"
+	"github.com/docker/docker/pkg/mount"
 	"github.com/docker/docker/pkg/system"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
@@ -152,9 +153,8 @@ func mknodChar0Overlay(cleansedOriginalPath string) error {
 		return errors.Wrapf(err, "failed to create a dummy lower file %s", lowerDummy)
 	}
 	mOpts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lower, upper, work)
-	// docker/pkg/mount.Mount() requires procfs to be mounted. So we use syscall.Mount() directly instead.
-	if err := syscall.Mount("overlay", merged, "overlay", uintptr(0), mOpts); err != nil {
-		return errors.Wrapf(err, "failed to mount overlay (%s) on %s", mOpts, merged)
+	if err := mount.Mount("overlay", merged, "overlay", mOpts); err != nil {
+		return err
 	}
 	mergedDummy := filepath.Join(merged, dummyBase)
 	if err := os.Remove(mergedDummy); err != nil {
@@ -237,9 +237,8 @@ func createDirWithOverlayOpaque(tmp string) (string, error) {
 		return "", errors.Wrapf(err, "failed to create a dummy lower directory %s", lowerDummy)
 	}
 	mOpts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lower, upper, work)
-	// docker/pkg/mount.Mount() requires procfs to be mounted. So we use syscall.Mount() directly instead.
-	if err := syscall.Mount("overlay", merged, "overlay", uintptr(0), mOpts); err != nil {
-		return "", errors.Wrapf(err, "failed to mount overlay (%s) on %s", mOpts, merged)
+	if err := mount.Mount("overlay", merged, "overlay", mOpts); err != nil {
+		return "", err
 	}
 	mergedDummy := filepath.Join(merged, dummyBase)
 	if err := os.Remove(mergedDummy); err != nil {
diff --git a/pkg/archive/archive_linux_test.go b/pkg/archive/archive_linux_test.go
@@ -9,6 +9,7 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/docker/docker/pkg/mount"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/docker/pkg/system"
 	rsystem "github.com/opencontainers/runc/libcontainer/system"
@@ -204,11 +205,11 @@ func supportsOverlay(dir string) error {
 		}
 	}
 	mOpts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lower, upper, work)
-	if err := syscall.Mount("overlay", merged, "overlay", uintptr(0), mOpts); err != nil {
-		return errors.Wrapf(err, "failed to mount overlay (%s) on %s", mOpts, merged)
+	if err := mount.Mount("overlay", merged, "overlay", mOpts); err != nil {
+		return err
 	}
-	if err := syscall.Unmount(merged, 0); err != nil {
-		return errors.Wrapf(err, "failed to unmount %s", merged)
+	if err := mount.Unmount(merged); err != nil {
+		return err
 	}
 	return nil
 }
diff --git a/pkg/mount/mount.go b/pkg/mount/mount.go
@@ -105,7 +105,7 @@ func Mount(device, target, mType, options string) error {
 	return mount(device, target, mType, uintptr(flag), data)
 }
 
-// Mount will mount filesystem according to the specified configuration.
+// ForceMount will mount filesystem according to the specified configuration.
 // Options must be specified like the mount or fstab unix commands:
 // "opt1=val1,opt2=val2". See flags.go for supported option flags.
 //

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"syscall"`
`10`	`10`	`"testing"`
`11`	`11`
	`12`	`+ "github.com/docker/docker/pkg/mount"`
`12`	`13`	`"github.com/docker/docker/pkg/reexec"`
`13`	`14`	`"github.com/docker/docker/pkg/system"`
`14`	`15`	`rsystem "github.com/opencontainers/runc/libcontainer/system"`
`@@ -204,11 +205,11 @@ func supportsOverlay(dir string) error {`
`204`	`205`	`}`
`205`	`206`	`}`
`206`	`207`	`mOpts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lower, upper, work)`
`207`		`- if err := syscall.Mount("overlay", merged, "overlay", uintptr(0), mOpts); err != nil {`
`208`		`- return errors.Wrapf(err, "failed to mount overlay (%s) on %s", mOpts, merged)`
	`208`	`+ if err := mount.Mount("overlay", merged, "overlay", mOpts); err != nil {`
	`209`	`+ return err`
`209`	`210`	`}`
`210`		`- if err := syscall.Unmount(merged, 0); err != nil {`
`211`		`- return errors.Wrapf(err, "failed to unmount %s", merged)`
	`211`	`+ if err := mount.Unmount(merged); err != nil {`
	`212`	`+ return err`
`212`	`213`	`}`
`213`	`214`	`return nil`
`214`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ func Mount(device, target, mType, options string) error {`
`105`	`105`	`return mount(device, target, mType, uintptr(flag), data)`
`106`	`106`	`}`
`107`	`107`
`108`		`-// Mount will mount filesystem according to the specified configuration.`
	`108`	`+// ForceMount will mount filesystem according to the specified configuration.`
`109`	`109`	`// Options must be specified like the mount or fstab unix commands:`
`110`	`110`	`// "opt1=val1,opt2=val2". See flags.go for supported option flags.`
`111`	`111`	`//`