@@ -37,6 +37,7 @@ import (

 	"github.com/docker/docker/restartmanager"

 	"github.com/docker/docker/runconfig"

 	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 	"github.com/docker/go-connections/nat"

 	units "github.com/docker/go-units"

 	"github.com/docker/libnetwork"

@@ -94,7 +95,7 @@ type Container struct {

 	RestartCount           int

 	HasBeenStartedBefore   bool

 	HasBeenManuallyStopped bool // used for unless-stopped restart policy

-	MountPoints            map[string]*volume.MountPoint

+	MountPoints            map[string]*volumemounts.MountPoint

 	HostConfig             *containertypes.HostConfig `json:"-"` // do not serialize the host config in the json, otherwise we'll make the container unportable

 	ExecCommands           *exec.Store                `json:"-"`

 	DependencyStore        agentexec.DependencyGetter `json:"-"`

@@ -128,7 +129,7 @@ func NewBaseContainer(id, root string) *Container {

 		State:         NewState(),

 		ExecCommands:  exec.NewStore(),

 		Root:          root,

-		MountPoints:   make(map[string]*volume.MountPoint),

+		MountPoints:   make(map[string]*volumemounts.MountPoint),

 		StreamConfig:  stream.NewConfig(),

 		attachContext: &attachContext{},

 	}

@@ -450,8 +451,8 @@ func (container *Container) AddMountPointWithVolume(destination string, vol volu

 	if operatingSystem == "" {

 		operatingSystem = runtime.GOOS

 	}

-	volumeParser := volume.NewParser(operatingSystem)

-	container.MountPoints[destination] = &volume.MountPoint{

+	volumeParser := volumemounts.NewParser(operatingSystem)

+	container.MountPoints[destination] = &volumemounts.MountPoint{

 		Type:        mounttypes.TypeVolume,

 		Name:        vol.Name(),

 		Driver:      vol.DriverName(),

@@ -15,6 +15,7 @@ import (

 	"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/opencontainers/selinux/go-selinux/label"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

@@ -61,7 +62,7 @@ func (container *Container) BuildHostnameFile() error {

 func (container *Container) NetworkMounts() []Mount {

 	var mounts []Mount

 	shared := container.HostConfig.NetworkMode.IsContainer()

-	parser := volume.NewParser(container.OS)

+	parser := volumemounts.NewParser(container.OS)

 	if container.ResolvConfPath != "" {

 		if _, err := os.Stat(container.ResolvConfPath); err != nil {

 			logrus.Warnf("ResolvConfPath set to %q, but can't stat this filename (err = %v); skipping", container.ResolvConfPath, err)

@@ -198,7 +199,7 @@ func (container *Container) UnmountIpcMount(unmount func(pth string) error) erro

 // IpcMounts returns the list of IPC mounts

 func (container *Container) IpcMounts() []Mount {

 	var mounts []Mount

-	parser := volume.NewParser(container.OS)

+	parser := volumemounts.NewParser(container.OS)

 	if container.HasMountFor("/dev/shm") {

 		return mounts

@@ -402,7 +403,7 @@ func copyExistingContents(source, destination string) error {

 // TmpfsMounts returns the list of tmpfs mounts

 func (container *Container) TmpfsMounts() ([]Mount, error) {

-	parser := volume.NewParser(container.OS)

+	parser := volumemounts.NewParser(container.OS)

 	var mounts []Mount

 	for dest, data := range container.HostConfig.Tmpfs {

 		mounts = append(mounts, Mount{

@@ -4,7 +4,7 @@ package daemon // import "github.com/docker/docker/daemon"

 import (

 	"github.com/docker/docker/container"

-	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 )

 // checkIfPathIsInAVolume checks if the path is in a volume. If it is, it

@@ -12,7 +12,7 @@ import (

 // cannot be configured with a read-only rootfs.

 func checkIfPathIsInAVolume(container *container.Container, absPath string) (bool, error) {

 	var toVolume bool

-	parser := volume.NewParser(container.OS)

+	parser := volumemounts.NewParser(container.OS)

 	for _, mnt := range container.MountPoints {

 		if toVolume = parser.HasResource(mnt, absPath); toVolume {

 			if mnt.RW {

@@ -20,7 +20,7 @@ import (

 	"github.com/docker/docker/pkg/system"

 	"github.com/docker/docker/pkg/truncindex"

 	"github.com/docker/docker/runconfig"

-	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 	"github.com/docker/go-connections/nat"

 	"github.com/opencontainers/selinux/go-selinux/label"

 	"github.com/pkg/errors"

@@ -296,7 +296,7 @@ func (daemon *Daemon) verifyContainerSettings(platform string, hostConfig *conta

 	}

 	// Validate mounts; check if host directories still exist

-	parser := volume.NewParser(platform)

+	parser := volumemounts.NewParser(platform)

 	for _, cfg := range hostConfig.Mounts {

 		if err := parser.ValidateMountConfig(&cfg); err != nil {

 			return nil, err

@@ -7,7 +7,7 @@ import (

 	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/pkg/stringid"

-	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 )

 // createContainerOSSpecificSettings performs host-OS specific container create functionality

@@ -26,7 +26,7 @@ func (daemon *Daemon) createContainerOSSpecificSettings(container *container.Con

 		}

 		hostConfig.Isolation = "hyperv"

 	}

-	parser := volume.NewParser(container.OS)

+	parser := volumemounts.NewParser(container.OS)

 	for spec := range config.Volumes {

 		mp, err := parser.ParseMountRaw(spec, hostConfig.VolumeDriver)

@@ -33,7 +33,7 @@ import (

 	"github.com/docker/docker/pkg/parsers/kernel"

 	"github.com/docker/docker/pkg/sysinfo"

 	"github.com/docker/docker/runconfig"

-	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 	"github.com/docker/libnetwork"

 	nwconfig "github.com/docker/libnetwork/config"

 	"github.com/docker/libnetwork/drivers/bridge"

@@ -626,7 +626,7 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.

 		return warnings, fmt.Errorf("Unknown runtime specified %s", hostConfig.Runtime)

 	}

-	parser := volume.NewParser(runtime.GOOS)

+	parser := volumemounts.NewParser(runtime.GOOS)

 	for dest := range hostConfig.Tmpfs {

 		if err := parser.ValidateTmpfsMountDestination(dest); err != nil {

 			return warnings, err

@@ -18,7 +18,7 @@ import (

 	"github.com/docker/docker/oci"

 	"github.com/docker/docker/pkg/idtools"

 	"github.com/docker/docker/pkg/mount"

-	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 	"github.com/opencontainers/runc/libcontainer/apparmor"

 	"github.com/opencontainers/runc/libcontainer/cgroups"

 	"github.com/opencontainers/runc/libcontainer/devices"

@@ -580,7 +580,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c

 		if m.Source == "tmpfs" {

 			data := m.Data

-			parser := volume.NewParser("linux")

+			parser := volumemounts.NewParser("linux")

 			options := []string{"noexec", "nosuid", "nodev", string(parser.DefaultPropagationMode())}

 			if data != "" {

 				options = append(options, strings.Split(data, ",")...)

@@ -14,6 +14,7 @@ import (

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

 )

@@ -74,8 +75,9 @@ func (m mounts) parts(i int) int {

 // 4. Cleanup old volumes that are about to be reassigned.

 func (daemon *Daemon) registerMountPoints(container *container.Container, hostConfig *containertypes.HostConfig) (retErr error) {

 	binds := map[string]bool{}

-	mountPoints := map[string]*volume.MountPoint{}

-	parser := volume.NewParser(container.OS)

+	mountPoints := map[string]*volumemounts.MountPoint{}

+	parser := volumemounts.NewParser(container.OS)

+

 	defer func() {

 		// clean up the container mountpoints once return with error

 		if retErr != nil {

@@ -115,7 +117,7 @@ func (daemon *Daemon) registerMountPoints(container *container.Container, hostCo

 		}

 		for _, m := range c.MountPoints {

-			cp := &volume.MountPoint{

+			cp := &volumemounts.MountPoint{

 				Type:        m.Type,

 				Name:        m.Name,

 				Source:      m.Source,

@@ -250,7 +252,7 @@ func (daemon *Daemon) registerMountPoints(container *container.Container, hostCo

 // lazyInitializeVolume initializes a mountpoint's volume if needed.

 // This happens after a daemon restart.

-func (daemon *Daemon) lazyInitializeVolume(containerID string, m *volume.MountPoint) error {

+func (daemon *Daemon) lazyInitializeVolume(containerID string, m *volumemounts.MountPoint) error {

 	if len(m.Driver) > 0 && m.Volume == nil {

 		v, err := daemon.volumes.GetWithRef(m.Name, m.Driver, containerID)

 		if err != nil {

@@ -270,7 +272,7 @@ func (daemon *Daemon) backportMountSpec(container *container.Container) {

 	container.Lock()

 	defer container.Unlock()

-	parser := volume.NewParser(container.OS)

+	parser := volumemounts.NewParser(container.OS)

 	maybeUpdate := make(map[string]bool)

 	for _, mp := range container.MountPoints {

@@ -288,7 +290,7 @@ func (daemon *Daemon) backportMountSpec(container *container.Container) {

 		mountSpecs[m.Target] = true

 	}

-	binds := make(map[string]*volume.MountPoint, len(container.HostConfig.Binds))

+	binds := make(map[string]*volumemounts.MountPoint, len(container.HostConfig.Binds))

 	for _, rawSpec := range container.HostConfig.Binds {

 		mp, err := parser.ParseMountRaw(rawSpec, container.HostConfig.VolumeDriver)

 		if err != nil {

@@ -298,7 +300,7 @@ func (daemon *Daemon) backportMountSpec(container *container.Container) {

 		binds[mp.Destination] = mp

 	}

-	volumesFrom := make(map[string]volume.MountPoint)

+	volumesFrom := make(map[string]volumemounts.MountPoint)

 	for _, fromSpec := range container.HostConfig.VolumesFrom {

 		from, _, err := parser.ParseVolumesFrom(fromSpec)

 		if err != nil {

@@ -321,7 +323,7 @@ func (daemon *Daemon) backportMountSpec(container *container.Container) {

 		fromC.Unlock()

 	}

-	needsUpdate := func(containerMount, other *volume.MountPoint) bool {

+	needsUpdate := func(containerMount, other *volumemounts.MountPoint) bool {

 		if containerMount.Type != other.Type || !reflect.DeepEqual(containerMount.Spec, other.Spec) {

 			return true

 		}

@@ -4,7 +4,7 @@ import (

 	"runtime"

 	"testing"

-	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 )

 func TestParseVolumesFrom(t *testing.T) {

@@ -21,7 +21,7 @@ func TestParseVolumesFrom(t *testing.T) {

 		{"foobar:baz", "", "", true},

 	}

-	parser := volume.NewParser(runtime.GOOS)

+	parser := volumemounts.NewParser(runtime.GOOS)

 	for _, c := range cases {

 		id, mode, err := parser.ParseVolumesFrom(c.spec)

@@ -12,7 +12,7 @@ import (

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/pkg/fileutils"

 	"github.com/docker/docker/pkg/mount"

-	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 )

 // setupMounts iterates through each of the mount points for a container and

@@ -40,7 +40,7 @@ func (daemon *Daemon) setupMounts(c *container.Container) ([]container.Mount, er

 		// mount the socket the daemon is listening on. During daemon shutdown, the socket

 		// (/var/run/docker.sock by default) doesn't exist anymore causing the call to m.Setup to

 		// create at directory instead. This in turn will prevent the daemon to restart.

-		checkfunc := func(m *volume.MountPoint) error {

+		checkfunc := func(m *volumemounts.MountPoint) error {

 			if _, exist := daemon.hosts[m.Source]; exist && daemon.IsShuttingDown() {

 				return fmt.Errorf("Could not mount %q to container while the daemon is shutting down", m.Source)

 			}

@@ -102,7 +102,7 @@ func sortMounts(m []container.Mount) []container.Mount {

 // setBindModeIfNull is platform specific processing to ensure the

 // shared mode is set to 'z' if it is null. This is called in the case

 // of processing a named volume and not a typical bind.

-func setBindModeIfNull(bind *volume.MountPoint) {

+func setBindModeIfNull(bind *volumemounts.MountPoint) {

 	if bind.Mode == "" {

 		bind.Mode = "z"

 	}

@@ -11,7 +11,7 @@ import (

 	containertypes "github.com/docker/docker/api/types/container"

 	mounttypes "github.com/docker/docker/api/types/mount"

 	"github.com/docker/docker/container"

-	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 )

 func TestBackportMountSpec(t *testing.T) {

@@ -19,7 +19,7 @@ func TestBackportMountSpec(t *testing.T) {

 	c := &container.Container{

 		State: &container.State{},

-		MountPoints: map[string]*volume.MountPoint{

+		MountPoints: map[string]*volumemounts.MountPoint{

 			"/apple":      {Destination: "/apple", Source: "/var/lib/docker/volumes/12345678", Name: "12345678", RW: true, CopyData: true}, // anonymous volume

 			"/banana":     {Destination: "/banana", Source: "/var/lib/docker/volumes/data", Name: "data", RW: true, CopyData: true},        // named volume

 			"/cherry":     {Destination: "/cherry", Source: "/var/lib/docker/volumes/data", Name: "data", CopyData: true},                  // RO named volume

@@ -73,7 +73,7 @@ func TestBackportMountSpec(t *testing.T) {

 	d.containers.Add("1", &container.Container{

 		State: &container.State{},

 		ID:    "1",

-		MountPoints: map[string]*volume.MountPoint{

+		MountPoints: map[string]*volumemounts.MountPoint{

 			"/kumquat": {Destination: "/kumquat", Name: "data", RW: false, CopyData: true},

 		},

 		HostConfig: &containertypes.HostConfig{

@@ -84,11 +84,11 @@ func TestBackportMountSpec(t *testing.T) {

 	})

 	type expected struct {

-		mp      *volume.MountPoint

+		mp      *volumemounts.MountPoint

 		comment string

 	}

-	pretty := func(mp *volume.MountPoint) string {

+	pretty := func(mp *volumemounts.MountPoint) string {

 		b, err := json.MarshalIndent(mp, "\t", "    ")

 		if err != nil {

 			return fmt.Sprintf("%#v", mp)

@@ -98,7 +98,7 @@ func TestBackportMountSpec(t *testing.T) {

 	for _, x := range []expected{

 		{

-			mp: &volume.MountPoint{

+			mp: &volumemounts.MountPoint{

 				Type:        mounttypes.TypeVolume,

 				Destination: "/apple",

 				RW:          true,

@@ -114,7 +114,7 @@ func TestBackportMountSpec(t *testing.T) {

 			comment: "anonymous volume",

 		},

 		{

-			mp: &volume.MountPoint{

+			mp: &volumemounts.MountPoint{

 				Type:        mounttypes.TypeVolume,

 				Destination: "/banana",

 				RW:          true,

@@ -130,7 +130,7 @@ func TestBackportMountSpec(t *testing.T) {

 			comment: "named volume",

 		},

 		{

-			mp: &volume.MountPoint{

+			mp: &volumemounts.MountPoint{

 				Type:        mounttypes.TypeVolume,

 				Destination: "/cherry",

 				Name:        "data",

@@ -146,7 +146,7 @@ func TestBackportMountSpec(t *testing.T) {

 			comment: "read-only named volume",

 		},

 		{

-			mp: &volume.MountPoint{

+			mp: &volumemounts.MountPoint{

 				Type:        mounttypes.TypeVolume,

 				Destination: "/dates",

 				Name:        "data",

@@ -162,7 +162,7 @@ func TestBackportMountSpec(t *testing.T) {

 			comment: "named volume with nocopy",

 		},

 		{

-			mp: &volume.MountPoint{

+			mp: &volumemounts.MountPoint{

 				Type:        mounttypes.TypeVolume,

 				Destination: "/elderberry",

 				Name:        "data",

@@ -178,7 +178,7 @@ func TestBackportMountSpec(t *testing.T) {

 			comment: "masks an anonymous volume",

 		},

 		{

-			mp: &volume.MountPoint{

+			mp: &volumemounts.MountPoint{

 				Type:        mounttypes.TypeBind,

 				Destination: "/fig",

 				Source:      "/data",

@@ -192,7 +192,7 @@ func TestBackportMountSpec(t *testing.T) {

 			comment: "bind mount with read/write",

 		},

 		{

-			mp: &volume.MountPoint{

+			mp: &volumemounts.MountPoint{

 				Type:        mounttypes.TypeBind,

 				Destination: "/guava",

 				Source:      "/data",

@@ -209,7 +209,7 @@ func TestBackportMountSpec(t *testing.T) {

 			comment: "bind mount with read/write + shared propagation",

 		},

 		{

-			mp: &volume.MountPoint{

+			mp: &volumemounts.MountPoint{

 				Type:        mounttypes.TypeVolume,

 				Destination: "/honeydew",

 				Source:      "/var/lib/docker/volumes/data",

@@ -229,7 +229,7 @@ func TestBackportMountSpec(t *testing.T) {

 			comment: "volume defined in mounts API",

 		},

 		{

-			mp: &volume.MountPoint{

+			mp: &volumemounts.MountPoint{

 				Type:        mounttypes.TypeVolume,

 				Destination: "/kumquat",

 				Source:      "/var/lib/docker/volumes/data",

@@ -6,7 +6,7 @@ import (

 	"github.com/docker/docker/api/types/mount"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/pkg/idtools"

-	"github.com/docker/docker/volume"

+	volumemounts "github.com/docker/docker/volume/mounts"

 )

 // setupMounts configures the mount points for a container by appending each

@@ -20,7 +20,7 @@ import (

 func (daemon *Daemon) setupMounts(c *container.Container) ([]container.Mount, error) {

 	var mnts []container.Mount

-	for _, mount := range c.MountPoints { // type is volume.MountPoint

+	for _, mount := range c.MountPoints { // type is volumemounts.MountPoint

 		if err := daemon.lazyInitializeVolume(c.ID, mount); err != nil {

 			return nil, err

 		}

@@ -42,7 +42,7 @@ func (daemon *Daemon) setupMounts(c *container.Container) ([]container.Mount, er

 // setBindModeIfNull is platform specific processing which is a no-op on

 // Windows.

-func setBindModeIfNull(bind *volume.MountPoint) {

+func setBindModeIfNull(bind *volumemounts.MountPoint) {

 	return

 }

deleted file mode 100644

@@ -1,34 +0,0 @@

-package volume // import "github.com/docker/docker/volume"

-

-import (

-	"errors"

-	"path"

-

-	"github.com/docker/docker/api/types/mount"

-)

-

-var lcowSpecificValidators mountValidator = func(m *mount.Mount) error {

-	if path.Clean(m.Target) == "/" {

-		return ErrVolumeTargetIsRoot

-	}

-	if m.Type == mount.TypeNamedPipe {

-		return errors.New("Linux containers on Windows do not support named pipe mounts")

-	}

-	return nil

-}

-

-type lcowParser struct {

-	windowsParser

-}

-

-func (p *lcowParser) ValidateMountConfig(mnt *mount.Mount) error {

-	return p.validateMountConfigReg(mnt, rxLCOWDestination, lcowSpecificValidators)

-}

-

-func (p *lcowParser) ParseMountRaw(raw, volumeDriver string) (*MountPoint, error) {

-	return p.parseMountRaw(raw, volumeDriver, rxLCOWDestination, false, lcowSpecificValidators)

-}

-

-func (p *lcowParser) ParseMountSpec(cfg mount.Mount) (*MountPoint, error) {

-	return p.parseMountSpec(cfg, rxLCOWDestination, false, lcowSpecificValidators)

-}

deleted file mode 100644

@@ -1,416 +0,0 @@

-package volume // import "github.com/docker/docker/volume"

-

-import (

-	"errors"

-	"fmt"

-	"path"

-	"path/filepath"

-	"strings"

-

-	"github.com/docker/docker/api/types/mount"

-	"github.com/docker/docker/pkg/stringid"

-)

-

-type linuxParser struct {

-}

-

-func linuxSplitRawSpec(raw string) ([]string, error) {

-	if strings.Count(raw, ":") > 2 {

-		return nil, errInvalidSpec(raw)

-	}

-

-	arr := strings.SplitN(raw, ":", 3)

-	if arr[0] == "" {

-		return nil, errInvalidSpec(raw)

-	}

-	return arr, nil

-}

-

-func linuxValidateNotRoot(p string) error {

-	p = path.Clean(strings.Replace(p, `\`, `/`, -1))

-	if p == "/" {

-		return ErrVolumeTargetIsRoot

-	}

-	return nil

-}

-func linuxValidateAbsolute(p string) error {

-	p = strings.Replace(p, `\`, `/`, -1)

-	if path.IsAbs(p) {

-		return nil

-	}

-	return fmt.Errorf("invalid mount path: '%s' mount path must be absolute", p)

-}

-func (p *linuxParser) ValidateMountConfig(mnt *mount.Mount) error {

-	// there was something looking like a bug in existing codebase:

-	// - validateMountConfig on linux was called with options skipping bind source existence when calling ParseMountRaw

-	// - but not when calling ParseMountSpec directly... nor when the unit test called it directly

-	return p.validateMountConfigImpl(mnt, true)

-}

-func (p *linuxParser) validateMountConfigImpl(mnt *mount.Mount, validateBindSourceExists bool) error {

-	if len(mnt.Target) == 0 {

-		return &errMountConfig{mnt, errMissingField("Target")}

-	}

-

-	if err := linuxValidateNotRoot(mnt.Target); err != nil {

-		return &errMountConfig{mnt, err}

-	}

-

-	if err := linuxValidateAbsolute(mnt.Target); err != nil {

-		return &errMountConfig{mnt, err}

-	}

-

-	switch mnt.Type {

-	case mount.TypeBind:

-		if len(mnt.Source) == 0 {

-			return &errMountConfig{mnt, errMissingField("Source")}

-		}

-		// Don't error out just because the propagation mode is not supported on the platform

-		if opts := mnt.BindOptions; opts != nil {

-			if len(opts.Propagation) > 0 && len(linuxPropagationModes) > 0 {

-				if _, ok := linuxPropagationModes[opts.Propagation]; !ok {

-					return &errMountConfig{mnt, fmt.Errorf("invalid propagation mode: %s", opts.Propagation)}

-				}

-			}

-		}

-		if mnt.VolumeOptions != nil {

-			return &errMountConfig{mnt, errExtraField("VolumeOptions")}

-		}

-

-		if err := linuxValidateAbsolute(mnt.Source); err != nil {

-			return &errMountConfig{mnt, err}

-		}

-

-		if validateBindSourceExists {

-			exists, _, _ := currentFileInfoProvider.fileInfo(mnt.Source)

-			if !exists {

-				return &errMountConfig{mnt, errBindSourceDoesNotExist(mnt.Source)}

-			}

-		}

-

-	case mount.TypeVolume:

-		if mnt.BindOptions != nil {

-			return &errMountConfig{mnt, errExtraField("BindOptions")}

-		}

-

-		if len(mnt.Source) == 0 && mnt.ReadOnly {

-			return &errMountConfig{mnt, fmt.Errorf("must not set ReadOnly mode when using anonymous volumes")}

-		}

-	case mount.TypeTmpfs:

-		if len(mnt.Source) != 0 {

-			return &errMountConfig{mnt, errExtraField("Source")}

-		}

-		if _, err := p.ConvertTmpfsOptions(mnt.TmpfsOptions, mnt.ReadOnly); err != nil {

-			return &errMountConfig{mnt, err}

-		}

-	default:

-		return &errMountConfig{mnt, errors.New("mount type unknown")}

-	}

-	return nil

-}

-

-// read-write modes

-var rwModes = map[string]bool{

-	"rw": true,

-	"ro": true,

-}

-

-// label modes

-var linuxLabelModes = map[string]bool{

-	"Z": true,

-	"z": true,

-}

-

-// consistency modes

-var linuxConsistencyModes = map[mount.Consistency]bool{

-	mount.ConsistencyFull:      true,

-	mount.ConsistencyCached:    true,

-	mount.ConsistencyDelegated: true,

-}

-var linuxPropagationModes = map[mount.Propagation]bool{

-	mount.PropagationPrivate:  true,

-	mount.PropagationRPrivate: true,

-	mount.PropagationSlave:    true,

-	mount.PropagationRSlave:   true,

-	mount.PropagationShared:   true,

-	mount.PropagationRShared:  true,

-}

-

-const linuxDefaultPropagationMode = mount.PropagationRPrivate

-

-func linuxGetPropagation(mode string) mount.Propagation {

-	for _, o := range strings.Split(mode, ",") {

-		prop := mount.Propagation(o)

-		if linuxPropagationModes[prop] {

-			return prop

-		}

-	}

-	return linuxDefaultPropagationMode

-}

-

-func linuxHasPropagation(mode string) bool {

-	for _, o := range strings.Split(mode, ",") {

-		if linuxPropagationModes[mount.Propagation(o)] {

-			return true

-		}

-	}

-	return false

-}

-

-func linuxValidMountMode(mode string) bool {

-	if mode == "" {

-		return true

-	}

-

-	rwModeCount := 0

-	labelModeCount := 0

-	propagationModeCount := 0

-	copyModeCount := 0

-	consistencyModeCount := 0

-

-	for _, o := range strings.Split(mode, ",") {

-		switch {

-		case rwModes[o]:

-			rwModeCount++

-		case linuxLabelModes[o]:

-			labelModeCount++

-		case linuxPropagationModes[mount.Propagation(o)]:

-			propagationModeCount++

-		case copyModeExists(o):

-			copyModeCount++

-		case linuxConsistencyModes[mount.Consistency(o)]:

-			consistencyModeCount++

-		default:

-			return false

-		}

-	}

-

-	// Only one string for each mode is allowed.

-	if rwModeCount > 1 || labelModeCount > 1 || propagationModeCount > 1 || copyModeCount > 1 || consistencyModeCount > 1 {

-		return false

-	}

-	return true

-}

-

-func (p *linuxParser) ReadWrite(mode string) bool {

-	if !linuxValidMountMode(mode) {

-		return false

-	}

-

-	for _, o := range strings.Split(mode, ",") {

-		if o == "ro" {

-			return false

-		}

-	}

-	return true

-}

-

-func (p *linuxParser) ParseMountRaw(raw, volumeDriver string) (*MountPoint, error) {

-	arr, err := linuxSplitRawSpec(raw)

-	if err != nil {

-		return nil, err

-	}

-

-	var spec mount.Mount

-	var mode string

-	switch len(arr) {

-	case 1:

-		// Just a destination path in the container

-		spec.Target = arr[0]

-	case 2:

-		if linuxValidMountMode(arr[1]) {

-			// Destination + Mode is not a valid volume - volumes

-			// cannot include a mode. e.g. /foo:rw

-			return nil, errInvalidSpec(raw)

-		}

-		// Host Source Path or Name + Destination

-		spec.Source = arr[0]

-		spec.Target = arr[1]

-	case 3:

-		// HostSourcePath+DestinationPath+Mode

-		spec.Source = arr[0]

-		spec.Target = arr[1]

-		mode = arr[2]

-	default:

-		return nil, errInvalidSpec(raw)

-	}

-

-	if !linuxValidMountMode(mode) {

-		return nil, errInvalidMode(mode)

-	}

-

-	if path.IsAbs(spec.Source) {

-		spec.Type = mount.TypeBind

-	} else {

-		spec.Type = mount.TypeVolume

-	}

-

-	spec.ReadOnly = !p.ReadWrite(mode)

-

-	// cannot assume that if a volume driver is passed in that we should set it

-	if volumeDriver != "" && spec.Type == mount.TypeVolume {

-		spec.VolumeOptions = &mount.VolumeOptions{

-			DriverConfig: &mount.Driver{Name: volumeDriver},

-		}

-	}

-

-	if copyData, isSet := getCopyMode(mode, p.DefaultCopyMode()); isSet {

-		if spec.VolumeOptions == nil {

-			spec.VolumeOptions = &mount.VolumeOptions{}

-		}

-		spec.VolumeOptions.NoCopy = !copyData

-	}

-	if linuxHasPropagation(mode) {

-		spec.BindOptions = &mount.BindOptions{

-			Propagation: linuxGetPropagation(mode),

-		}

-	}

-

-	mp, err := p.parseMountSpec(spec, false)

-	if mp != nil {

-		mp.Mode = mode

-	}

-	if err != nil {

-		err = fmt.Errorf("%v: %v", errInvalidSpec(raw), err)

-	}

-	return mp, err

-}

-func (p *linuxParser) ParseMountSpec(cfg mount.Mount) (*MountPoint, error) {

-	return p.parseMountSpec(cfg, true)

-}

-func (p *linuxParser) parseMountSpec(cfg mount.Mount, validateBindSourceExists bool) (*MountPoint, error) {

-	if err := p.validateMountConfigImpl(&cfg, validateBindSourceExists); err != nil {

-		return nil, err

-	}

-	mp := &MountPoint{

-		RW:          !cfg.ReadOnly,

-		Destination: path.Clean(filepath.ToSlash(cfg.Target)),

-		Type:        cfg.Type,

-		Spec:        cfg,

-	}

-

-	switch cfg.Type {

-	case mount.TypeVolume:

-		if cfg.Source == "" {

-			mp.Name = stringid.GenerateNonCryptoID()

-		} else {

-			mp.Name = cfg.Source

-		}

-		mp.CopyData = p.DefaultCopyMode()

-

-		if cfg.VolumeOptions != nil {

-			if cfg.VolumeOptions.DriverConfig != nil {

-				mp.Driver = cfg.VolumeOptions.DriverConfig.Name

-			}

-			if cfg.VolumeOptions.NoCopy {

-				mp.CopyData = false

-			}

-		}

-	case mount.TypeBind:

-		mp.Source = path.Clean(filepath.ToSlash(cfg.Source))

-		if cfg.BindOptions != nil && len(cfg.BindOptions.Propagation) > 0 {

-			mp.Propagation = cfg.BindOptions.Propagation

-		} else {

-			// If user did not specify a propagation mode, get

-			// default propagation mode.

-			mp.Propagation = linuxDefaultPropagationMode

-		}

-	case mount.TypeTmpfs:

-		// NOP

-	}

-	return mp, nil

-}

-

-func (p *linuxParser) ParseVolumesFrom(spec string) (string, string, error) {

-	if len(spec) == 0 {

-		return "", "", fmt.Errorf("volumes-from specification cannot be an empty string")

-	}

-

-	specParts := strings.SplitN(spec, ":", 2)

-	id := specParts[0]

-	mode := "rw"

-

-	if len(specParts) == 2 {

-		mode = specParts[1]

-		if !linuxValidMountMode(mode) {

-			return "", "", errInvalidMode(mode)

-		}

-		// For now don't allow propagation properties while importing

-		// volumes from data container. These volumes will inherit

-		// the same propagation property as of the original volume

-		// in data container. This probably can be relaxed in future.

-		if linuxHasPropagation(mode) {

-			return "", "", errInvalidMode(mode)

-		}

-		// Do not allow copy modes on volumes-from

-		if _, isSet := getCopyMode(mode, p.DefaultCopyMode()); isSet {

-			return "", "", errInvalidMode(mode)

-		}

-	}

-	return id, mode, nil

-}

-

-func (p *linuxParser) DefaultPropagationMode() mount.Propagation {

-	return linuxDefaultPropagationMode

-}

-

-func (p *linuxParser) ConvertTmpfsOptions(opt *mount.TmpfsOptions, readOnly bool) (string, error) {

-	var rawOpts []string

-	if readOnly {

-		rawOpts = append(rawOpts, "ro")

-	}

-

-	if opt != nil && opt.Mode != 0 {

-		rawOpts = append(rawOpts, fmt.Sprintf("mode=%o", opt.Mode))

-	}

-

-	if opt != nil && opt.SizeBytes != 0 {

-		// calculate suffix here, making this linux specific, but that is

-		// okay, since API is that way anyways.

-

-		// we do this by finding the suffix that divides evenly into the

-		// value, returning the value itself, with no suffix, if it fails.

-		//

-		// For the most part, we don't enforce any semantic to this values.

-		// The operating system will usually align this and enforce minimum

-		// and maximums.

-		var (

-			size   = opt.SizeBytes

-			suffix string

-		)

-		for _, r := range []struct {

-			suffix  string

-			divisor int64

-		}{

-			{"g", 1 << 30},

-			{"m", 1 << 20},

-			{"k", 1 << 10},

-		} {

-			if size%r.divisor == 0 {

-				size = size / r.divisor

-				suffix = r.suffix

-				break

-			}

-		}

-

-		rawOpts = append(rawOpts, fmt.Sprintf("size=%d%s", size, suffix))

-	}

-	return strings.Join(rawOpts, ","), nil

-}

-