Merge pull request #5710 from baude/v2create

v2podman container create

15 files changed, 1375 insertions, 17 deletions

diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go
index ebca41151..38a341a89 100644
--- a/pkg/api/handlers/libpod/containers_create.go
+++ b/pkg/api/handlers/libpod/containers_create.go
@@ -7,6 +7,7 @@ import (
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/containers/libpod/pkg/specgen"
+	"github.com/containers/libpod/pkg/specgen/generate"
 	"github.com/pkg/errors"
 )
 
@@ -19,7 +20,11 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) {
 		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "Decode()"))
 		return
 	}
-	ctr, err := sg.MakeContainer(runtime)
+	if err := generate.CompleteSpec(r.Context(), runtime, &sg); err != nil {
+		utils.InternalServerError(w, err)
+		return
+	}
+	ctr, err := generate.MakeContainer(runtime, &sg)
 	if err != nil {
 		utils.InternalServerError(w, err)
 		return
diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go
index 45dea98bf..74b23cd71 100644
--- a/pkg/domain/entities/containers.go
+++ b/pkg/domain/entities/containers.go
@@ -153,3 +153,7 @@ type RestoreReport struct {
 	Err error
 	Id  string
 }
+
+type ContainerCreateReport struct {
+	Id string
+}
diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go
index 3aaa7136f..025da50f3 100644
--- a/pkg/domain/entities/engine_container.go
+++ b/pkg/domain/entities/engine_container.go
@@ -4,12 +4,14 @@ import (
 	"context"
 
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/specgen"
 )
 
 type ContainerEngine interface {
 	ContainerCommit(ctx context.Context, nameOrId string, options CommitOptions) (*CommitReport, error)
 	ContainerCheckpoint(ctx context.Context, namesOrIds []string, options CheckpointOptions) ([]*CheckpointReport, error)
 	ContainerRestore(ctx context.Context, namesOrIds []string, options RestoreOptions) ([]*RestoreReport, error)
+	ContainerCreate(ctx context.Context, s *specgen.SpecGenerator) (*ContainerCreateReport, error)
 	ContainerExists(ctx context.Context, nameOrId string) (*BoolReport, error)
 	ContainerInspect(ctx context.Context, namesOrIds []string, options InspectOptions) ([]*ContainerInspectReport, error)
 	ContainerExport(ctx context.Context, nameOrId string, options ContainerExportOptions) error
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 3c38b2093..d3d51db82 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -16,6 +16,8 @@ import (
 	"github.com/containers/libpod/pkg/checkpoint"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/signal"
+	"github.com/containers/libpod/pkg/specgen"
+	"github.com/containers/libpod/pkg/specgen/generate"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
@@ -442,3 +444,14 @@ func (ic *ContainerEngine) ContainerRestore(ctx context.Context, namesOrIds []st
 	}
 	return reports, nil
 }
+
+func (ic *ContainerEngine) ContainerCreate(ctx context.Context, s *specgen.SpecGenerator) (*entities.ContainerCreateReport, error) {
+	if err := generate.CompleteSpec(ctx, ic.Libpod, s); err != nil {
+		return nil, err
+	}
+	ctr, err := generate.MakeContainer(ic.Libpod, s)
+	if err != nil {
+		return nil, err
+	}
+	return &entities.ContainerCreateReport{Id: ctr.ID()}, nil
+}
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 5832d41be..ae8994cba 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -10,6 +10,7 @@ import (
 	"github.com/containers/libpod/pkg/api/handlers/libpod"
 	"github.com/containers/libpod/pkg/bindings/containers"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/pkg/specgen"
 	"github.com/pkg/errors"
 )
 
@@ -296,3 +297,11 @@ func (ic *ContainerEngine) ContainerRestore(ctx context.Context, namesOrIds []st
 	}
 	return reports, nil
 }
+
+func (ic *ContainerEngine) ContainerCreate(ctx context.Context, s *specgen.SpecGenerator) (*entities.ContainerCreateReport, error) {
+	response, err := containers.CreateWithSpec(ic.ClientCxt, s)
+	if err != nil {
+		return nil, err
+	}
+	return &entities.ContainerCreateReport{Id: response.ID}, nil
+}
diff --git a/pkg/specgen/config_linux.go b/pkg/specgen/config_linux.go
new file mode 100644
index 000000000..82a371492
--- /dev/null
+++ b/pkg/specgen/config_linux.go
@@ -0,0 +1,93 @@
+package specgen
+
+//func createBlockIO() (*spec.LinuxBlockIO, error) {
+//	var ret *spec.LinuxBlockIO
+//	bio := &spec.LinuxBlockIO{}
+//	if c.Resources.BlkioWeight > 0 {
+//		ret = bio
+//		bio.Weight = &c.Resources.BlkioWeight
+//	}
+//	if len(c.Resources.BlkioWeightDevice) > 0 {
+//		var lwds []spec.LinuxWeightDevice
+//		ret = bio
+//		for _, i := range c.Resources.BlkioWeightDevice {
+//			wd, err := ValidateweightDevice(i)
+//			if err != nil {
+//				return ret, errors.Wrapf(err, "invalid values for blkio-weight-device")
+//			}
+//			wdStat, err := GetStatFromPath(wd.Path)
+//			if err != nil {
+//				return ret, errors.Wrapf(err, "error getting stat from path %q", wd.Path)
+//			}
+//			lwd := spec.LinuxWeightDevice{
+//				Weight: &wd.Weight,
+//			}
+//			lwd.Major = int64(unix.Major(wdStat.Rdev))
+//			lwd.Minor = int64(unix.Minor(wdStat.Rdev))
+//			lwds = append(lwds, lwd)
+//		}
+//		bio.WeightDevice = lwds
+//	}
+//	if len(c.Resources.DeviceReadBps) > 0 {
+//		ret = bio
+//		readBps, err := makeThrottleArray(c.Resources.DeviceReadBps, bps)
+//		if err != nil {
+//			return ret, err
+//		}
+//		bio.ThrottleReadBpsDevice = readBps
+//	}
+//	if len(c.Resources.DeviceWriteBps) > 0 {
+//		ret = bio
+//		writeBpds, err := makeThrottleArray(c.Resources.DeviceWriteBps, bps)
+//		if err != nil {
+//			return ret, err
+//		}
+//		bio.ThrottleWriteBpsDevice = writeBpds
+//	}
+//	if len(c.Resources.DeviceReadIOps) > 0 {
+//		ret = bio
+//		readIOps, err := makeThrottleArray(c.Resources.DeviceReadIOps, iops)
+//		if err != nil {
+//			return ret, err
+//		}
+//		bio.ThrottleReadIOPSDevice = readIOps
+//	}
+//	if len(c.Resources.DeviceWriteIOps) > 0 {
+//		ret = bio
+//		writeIOps, err := makeThrottleArray(c.Resources.DeviceWriteIOps, iops)
+//		if err != nil {
+//			return ret, err
+//		}
+//		bio.ThrottleWriteIOPSDevice = writeIOps
+//	}
+//	return ret, nil
+//}
+
+//func makeThrottleArray(throttleInput []string, rateType int) ([]spec.LinuxThrottleDevice, error) {
+//	var (
+//		ltds []spec.LinuxThrottleDevice
+//		t    *throttleDevice
+//		err  error
+//	)
+//	for _, i := range throttleInput {
+//		if rateType == bps {
+//			t, err = validateBpsDevice(i)
+//		} else {
+//			t, err = validateIOpsDevice(i)
+//		}
+//		if err != nil {
+//			return []spec.LinuxThrottleDevice{}, err
+//		}
+//		ltdStat, err := GetStatFromPath(t.path)
+//		if err != nil {
+//			return ltds, errors.Wrapf(err, "error getting stat from path %q", t.path)
+//		}
+//		ltd := spec.LinuxThrottleDevice{
+//			Rate: t.rate,
+//		}
+//		ltd.Major = int64(unix.Major(ltdStat.Rdev))
+//		ltd.Minor = int64(unix.Minor(ltdStat.Rdev))
+//		ltds = append(ltds, ltd)
+//	}
+//	return ltds, nil
+//}
diff --git a/pkg/specgen/config_linux_cgo.go b/pkg/specgen/config_linux_cgo.go
index 6f547a40d..ef6c6e951 100644
--- a/pkg/specgen/config_linux_cgo.go
+++ b/pkg/specgen/config_linux_cgo.go
@@ -17,7 +17,6 @@ import (
 func (s *SpecGenerator) getSeccompConfig(configSpec *spec.Spec, img *image.Image) (*spec.LinuxSeccomp, error) {
 	var seccompConfig *spec.LinuxSeccomp
 	var err error
-
 	scp, err := seccomp.LookupPolicy(s.SeccompPolicy)
 	if err != nil {
 		return nil, err
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go
index b27659f5f..aad14ddcb 100644
--- a/pkg/specgen/container_validate.go
+++ b/pkg/specgen/container_validate.go
@@ -14,7 +14,7 @@ var (
 	// SystemDValues describes the only values that SystemD can be
 	SystemDValues = []string{"true", "false", "always"}
 	// ImageVolumeModeValues describes the only values that ImageVolumeMode can be
-	ImageVolumeModeValues = []string{"ignore", "tmpfs", "anonymous"}
+	ImageVolumeModeValues = []string{"ignore", "tmpfs", "bind"}
 )
 
 func exclusiveOptions(opt1, opt2 string) error {
@@ -23,7 +23,7 @@ func exclusiveOptions(opt1, opt2 string) error {
 
 // Validate verifies that the given SpecGenerator is valid and satisfies required
 // input for creating a container.
-func (s *SpecGenerator) validate() error {
+func (s *SpecGenerator) Validate() error {
 
 	//
 	// ContainerBasicConfig
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
new file mode 100644
index 000000000..78c77fec1
--- /dev/null
+++ b/pkg/specgen/generate/container.go
@@ -0,0 +1,168 @@
+package generate
+
+import (
+	"context"
+
+	"github.com/containers/libpod/libpod"
+	ann "github.com/containers/libpod/pkg/annotations"
+	envLib "github.com/containers/libpod/pkg/env"
+	"github.com/containers/libpod/pkg/signal"
+	"github.com/containers/libpod/pkg/specgen"
+	"github.com/pkg/errors"
+	"golang.org/x/sys/unix"
+)
+
+func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerator) error {
+
+	newImage, err := r.ImageRuntime().NewFromLocal(s.Image)
+	if err != nil {
+		return err
+	}
+
+	// Image stop signal
+	if s.StopSignal == nil && newImage.Config != nil {
+		sig, err := signal.ParseSignalNameOrNumber(newImage.Config.StopSignal)
+		if err != nil {
+			return err
+		}
+		s.StopSignal = &sig
+	}
+	// Image envs from the image if they don't exist
+	// already
+	if newImage.Config != nil && len(newImage.Config.Env) > 0 {
+		envs, err := envLib.ParseSlice(newImage.Config.Env)
+		if err != nil {
+			return err
+		}
+		for k, v := range envs {
+			if _, exists := s.Env[k]; !exists {
+				s.Env[v] = k
+			}
+		}
+	}
+
+	// labels from the image that dont exist already
+	if config := newImage.Config; config != nil {
+		for k, v := range config.Labels {
+			if _, exists := s.Labels[k]; !exists {
+				s.Labels[k] = v
+			}
+		}
+	}
+
+	// annotations
+	// in the event this container is in a pod, and the pod has an infra container
+	// we will want to configure it as a type "container" instead defaulting to
+	// the behavior of a "sandbox" container
+	// In Kata containers:
+	// - "sandbox" is the annotation that denotes the container should use its own
+	//   VM, which is the default behavior
+	// - "container" denotes the container should join the VM of the SandboxID
+	//   (the infra container)
+	s.Annotations = make(map[string]string)
+	if len(s.Pod) > 0 {
+		s.Annotations[ann.SandboxID] = s.Pod
+		s.Annotations[ann.ContainerType] = ann.ContainerTypeContainer
+	}
+	//
+	// Next, add annotations from the image
+	annotations, err := newImage.Annotations(ctx)
+	if err != nil {
+		return err
+	}
+	for k, v := range annotations {
+		annotations[k] = v
+	}
+
+	// entrypoint
+	if config := newImage.Config; config != nil {
+		if len(s.Entrypoint) < 1 && len(config.Entrypoint) > 0 {
+			s.Entrypoint = config.Entrypoint
+		}
+		if len(s.Command) < 1 && len(config.Cmd) > 0 {
+			s.Command = config.Cmd
+		}
+		if len(s.Command) < 1 && len(s.Entrypoint) < 1 {
+			return errors.Errorf("No command provided or as CMD or ENTRYPOINT in this image")
+		}
+		// workdir
+		if len(s.WorkDir) < 1 && len(config.WorkingDir) > 1 {
+			s.WorkDir = config.WorkingDir
+		}
+	}
+
+	if len(s.SeccompProfilePath) < 1 {
+		p, err := libpod.DefaultSeccompPath()
+		if err != nil {
+			return err
+		}
+		s.SeccompProfilePath = p
+	}
+
+	if user := s.User; len(user) == 0 {
+		switch {
+		// TODO This should be enabled when namespaces actually work
+		//case usernsMode.IsKeepID():
+		//	user = fmt.Sprintf("%d:%d", rootless.GetRootlessUID(), rootless.GetRootlessGID())
+		case newImage.Config == nil || (newImage.Config != nil && len(newImage.Config.User) == 0):
+			s.User = "0"
+		default:
+			s.User = newImage.Config.User
+		}
+	}
+	if err := finishThrottleDevices(s); err != nil {
+		return err
+	}
+	return nil
+}
+
+// finishThrottleDevices takes the temporary representation of the throttle
+// devices in the specgen and looks up the major and major minors. it then
+// sets the throttle devices proper in the specgen
+func finishThrottleDevices(s *specgen.SpecGenerator) error {
+	if bps := s.ThrottleReadBpsDevice; len(bps) > 0 {
+		for k, v := range bps {
+			statT := unix.Stat_t{}
+			if err := unix.Stat(k, &statT); err != nil {
+				return err
+			}
+			v.Major = (int64(unix.Major(statT.Rdev)))
+			v.Minor = (int64(unix.Minor(statT.Rdev)))
+			s.ResourceLimits.BlockIO.ThrottleReadBpsDevice = append(s.ResourceLimits.BlockIO.ThrottleReadBpsDevice, v)
+		}
+	}
+	if bps := s.ThrottleWriteBpsDevice; len(bps) > 0 {
+		for k, v := range bps {
+			statT := unix.Stat_t{}
+			if err := unix.Stat(k, &statT); err != nil {
+				return err
+			}
+			v.Major = (int64(unix.Major(statT.Rdev)))
+			v.Minor = (int64(unix.Minor(statT.Rdev)))
+			s.ResourceLimits.BlockIO.ThrottleWriteBpsDevice = append(s.ResourceLimits.BlockIO.ThrottleWriteBpsDevice, v)
+		}
+	}
+	if iops := s.ThrottleReadIOPSDevice; len(iops) > 0 {
+		for k, v := range iops {
+			statT := unix.Stat_t{}
+			if err := unix.Stat(k, &statT); err != nil {
+				return err
+			}
+			v.Major = (int64(unix.Major(statT.Rdev)))
+			v.Minor = (int64(unix.Minor(statT.Rdev)))
+			s.ResourceLimits.BlockIO.ThrottleReadIOPSDevice = append(s.ResourceLimits.BlockIO.ThrottleReadIOPSDevice, v)
+		}
+	}
+	if iops := s.ThrottleWriteBpsDevice; len(iops) > 0 {
+		for k, v := range iops {
+			statT := unix.Stat_t{}
+			if err := unix.Stat(k, &statT); err != nil {
+				return err
+			}
+			v.Major = (int64(unix.Major(statT.Rdev)))
+			v.Minor = (int64(unix.Minor(statT.Rdev)))
+			s.ResourceLimits.BlockIO.ThrottleWriteIOPSDevice = append(s.ResourceLimits.BlockIO.ThrottleWriteIOPSDevice, v)
+		}
+	}
+	return nil
+}
diff --git a/pkg/specgen/container_create.go b/pkg/specgen/generate/container_create.go
index b4039bb91..aad59a861 100644
--- a/pkg/specgen/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -1,4 +1,4 @@
-package specgen
+package generate
 
 import (
 	"context"
@@ -7,14 +7,15 @@ import (
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/specgen"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
 // MakeContainer creates a container based on the SpecGenerator
-func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, error) {
-	if err := s.validate(); err != nil {
+func MakeContainer(rt *libpod.Runtime, s *specgen.SpecGenerator) (*libpod.Container, error) {
+	if err := s.Validate(); err != nil {
 		return nil, errors.Wrap(err, "invalid config provided")
 	}
 	rtc, err := rt.GetConfig()
@@ -22,7 +23,7 @@ func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, er
 		return nil, err
 	}
 
-	options, err := s.createContainerOptions(rt)
+	options, err := createContainerOptions(rt, s)
 	if err != nil {
 		return nil, err
 	}
@@ -31,7 +32,7 @@ func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, er
 	if err != nil {
 		return nil, err
 	}
-	options = append(options, s.createExitCommandOption(rt.StorageConfig(), rtc, podmanPath))
+	options = append(options, createExitCommandOption(s, rt.StorageConfig(), rtc, podmanPath))
 	newImage, err := rt.ImageRuntime().NewFromLocal(s.Image)
 	if err != nil {
 		return nil, err
@@ -39,14 +40,14 @@ func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, er
 
 	options = append(options, libpod.WithRootFSFromImage(newImage.ID(), s.Image, s.RawImageName))
 
-	runtimeSpec, err := s.toOCISpec(rt, newImage)
+	runtimeSpec, err := s.ToOCISpec(rt, newImage)
 	if err != nil {
 		return nil, err
 	}
 	return rt.NewContainer(context.Background(), runtimeSpec, options...)
 }
 
-func (s *SpecGenerator) createContainerOptions(rt *libpod.Runtime) ([]libpod.CtrCreateOption, error) {
+func createContainerOptions(rt *libpod.Runtime, s *specgen.SpecGenerator) ([]libpod.CtrCreateOption, error) {
 	var options []libpod.CtrCreateOption
 	var err error
 
@@ -114,7 +115,7 @@ func (s *SpecGenerator) createContainerOptions(rt *libpod.Runtime) ([]libpod.Ctr
 	options = append(options, libpod.WithPrivileged(s.Privileged))
 
 	// Get namespace related options
-	namespaceOptions, err := s.generateNamespaceContainerOpts(rt)
+	namespaceOptions, err := s.GenerateNamespaceContainerOpts(rt)
 	if err != nil {
 		return nil, err
 	}
@@ -149,7 +150,7 @@ func (s *SpecGenerator) createContainerOptions(rt *libpod.Runtime) ([]libpod.Ctr
 	return options, nil
 }
 
-func (s *SpecGenerator) createExitCommandOption(storageConfig storage.StoreOptions, config *config.Config, podmanPath string) libpod.CtrCreateOption {
+func createExitCommandOption(s *specgen.SpecGenerator, storageConfig storage.StoreOptions, config *config.Config, podmanPath string) libpod.CtrCreateOption {
 	// We need a cleanup process for containers in the current model.
 	// But we can't assume that the caller is Podman - it could be another
 	// user of the API.
diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go
index fa2dee77d..2a7bb3495 100644
--- a/pkg/specgen/namespaces.go
+++ b/pkg/specgen/namespaces.go
@@ -16,6 +16,9 @@ import (
 type NamespaceMode string
 
 const (
+	// Default indicates the spec generator should determine
+	// a sane default
+	Default NamespaceMode = "default"
 	// Host means the the namespace is derived from
 	// the host
 	Host NamespaceMode = "host"
@@ -83,7 +86,7 @@ func validateNetNS(n *Namespace) error {
 	return nil
 }
 
-// validate perform simple validation on the namespace to make sure it is not
+// Validate perform simple validation on the namespace to make sure it is not
 // invalid from the get-go
 func (n *Namespace) validate() error {
 	if n == nil {
@@ -103,7 +106,7 @@ func (n *Namespace) validate() error {
 	return nil
 }
 
-func (s *SpecGenerator) generateNamespaceContainerOpts(rt *libpod.Runtime) ([]libpod.CtrCreateOption, error) {
+func (s *SpecGenerator) GenerateNamespaceContainerOpts(rt *libpod.Runtime) ([]libpod.CtrCreateOption, error) {
 	var portBindings []ocicni.PortMapping
 	options := make([]libpod.CtrCreateOption, 0)
 
diff --git a/pkg/specgen/oci.go b/pkg/specgen/oci.go
index db60dc25e..0756782b4 100644
--- a/pkg/specgen/oci.go
+++ b/pkg/specgen/oci.go
@@ -11,7 +11,7 @@ import (
 	"github.com/opencontainers/runtime-tools/generate"
 )
 
-func (s *SpecGenerator) toOCISpec(rt *libpod.Runtime, newImage *image.Image) (*spec.Spec, error) {
+func (s *SpecGenerator) ToOCISpec(rt *libpod.Runtime, newImage *image.Image) (*spec.Spec, error) {
 	var (
 		inUserNS bool
 	)
diff --git a/pkg/specgen/security.go b/pkg/specgen/security.go
new file mode 100644
index 000000000..158e4a7b3
--- /dev/null
+++ b/pkg/specgen/security.go
@@ -0,0 +1,165 @@
+package specgen
+
+// ToCreateOptions convert the SecurityConfig to a slice of container create
+// options.
+/*
+func (c *SecurityConfig) ToCreateOptions() ([]libpod.CtrCreateOption, error) {
+	options := make([]libpod.CtrCreateOption, 0)
+	options = append(options, libpod.WithSecLabels(c.LabelOpts))
+	options = append(options, libpod.WithPrivileged(c.Privileged))
+	return options, nil
+}
+*/
+
+// SetLabelOpts sets the label options of the SecurityConfig according to the
+// input.
+/*
+func (c *SecurityConfig) SetLabelOpts(runtime *libpod.Runtime, pidConfig *PidConfig, ipcConfig *IpcConfig) error {
+	if c.Privileged {
+		c.LabelOpts = label.DisableSecOpt()
+		return nil
+	}
+
+	var labelOpts []string
+	if pidConfig.PidMode.IsHost() {
+		labelOpts = append(labelOpts, label.DisableSecOpt()...)
+	} else if pidConfig.PidMode.IsContainer() {
+		ctr, err := runtime.LookupContainer(pidConfig.PidMode.Container())
+		if err != nil {
+			return errors.Wrapf(err, "container %q not found", pidConfig.PidMode.Container())
+		}
+		secopts, err := label.DupSecOpt(ctr.ProcessLabel())
+		if err != nil {
+			return errors.Wrapf(err, "failed to duplicate label %q ", ctr.ProcessLabel())
+		}
+		labelOpts = append(labelOpts, secopts...)
+	}
+
+	if ipcConfig.IpcMode.IsHost() {
+		labelOpts = append(labelOpts, label.DisableSecOpt()...)
+	} else if ipcConfig.IpcMode.IsContainer() {
+		ctr, err := runtime.LookupContainer(ipcConfig.IpcMode.Container())
+		if err != nil {
+			return errors.Wrapf(err, "container %q not found", ipcConfig.IpcMode.Container())
+		}
+		secopts, err := label.DupSecOpt(ctr.ProcessLabel())
+		if err != nil {
+			return errors.Wrapf(err, "failed to duplicate label %q ", ctr.ProcessLabel())
+		}
+		labelOpts = append(labelOpts, secopts...)
+	}
+
+	c.LabelOpts = append(c.LabelOpts, labelOpts...)
+	return nil
+}
+*/
+
+// SetSecurityOpts the the security options (labels, apparmor, seccomp, etc.).
+func SetSecurityOpts(securityOpts []string) error {
+	return nil
+}
+
+// ConfigureGenerator configures the generator according to the input.
+/*
+func (c *SecurityConfig) ConfigureGenerator(g *generate.Generator, user *UserConfig) error {
+	// HANDLE CAPABILITIES
+	// NOTE: Must happen before SECCOMP
+	if c.Privileged {
+		g.SetupPrivileged(true)
+	}
+
+	useNotRoot := func(user string) bool {
+		if user == "" || user == "root" || user == "0" {
+			return false
+		}
+		return true
+	}
+
+	configSpec := g.Config
+	var err error
+	var defaultCaplist []string
+	bounding := configSpec.Process.Capabilities.Bounding
+	if useNotRoot(user.User) {
+		configSpec.Process.Capabilities.Bounding = defaultCaplist
+	}
+	defaultCaplist, err = capabilities.MergeCapabilities(configSpec.Process.Capabilities.Bounding, c.CapAdd, c.CapDrop)
+	if err != nil {
+		return err
+	}
+
+	privCapRequired := []string{}
+
+	if !c.Privileged && len(c.CapRequired) > 0 {
+		// Pass CapRequired in CapAdd field to normalize capabilities names
+		capRequired, err := capabilities.MergeCapabilities(nil, c.CapRequired, nil)
+		if err != nil {
+			logrus.Errorf("capabilities requested by user or image are not valid: %q", strings.Join(c.CapRequired, ","))
+		} else {
+			// Verify all capRequiered are in the defaultCapList
+			for _, cap := range capRequired {
+				if !util.StringInSlice(cap, defaultCaplist) {
+					privCapRequired = append(privCapRequired, cap)
+				}
+			}
+		}
+		if len(privCapRequired) == 0 {
+			defaultCaplist = capRequired
+		} else {
+			logrus.Errorf("capabilities requested by user or image are not allowed by default: %q", strings.Join(privCapRequired, ","))
+		}
+	}
+	configSpec.Process.Capabilities.Bounding = defaultCaplist
+	configSpec.Process.Capabilities.Permitted = defaultCaplist
+	configSpec.Process.Capabilities.Inheritable = defaultCaplist
+	configSpec.Process.Capabilities.Effective = defaultCaplist
+	configSpec.Process.Capabilities.Ambient = defaultCaplist
+	if useNotRoot(user.User) {
+		defaultCaplist, err = capabilities.MergeCapabilities(bounding, c.CapAdd, c.CapDrop)
+		if err != nil {
+			return err
+		}
+	}
+	configSpec.Process.Capabilities.Bounding = defaultCaplist
+
+	// HANDLE SECCOMP
+	if c.SeccompProfilePath != "unconfined" {
+		seccompConfig, err := getSeccompConfig(c, configSpec)
+		if err != nil {
+			return err
+		}
+		configSpec.Linux.Seccomp = seccompConfig
+	}
+
+	// Clear default Seccomp profile from Generator for privileged containers
+	if c.SeccompProfilePath == "unconfined" || c.Privileged {
+		configSpec.Linux.Seccomp = nil
+	}
+
+	for _, opt := range c.SecurityOpts {
+		// Split on both : and =
+		splitOpt := strings.Split(opt, "=")
+		if len(splitOpt) == 1 {
+			splitOpt = strings.Split(opt, ":")
+		}
+		if len(splitOpt) < 2 {
+			continue
+		}
+		switch splitOpt[0] {
+		case "label":
+			configSpec.Annotations[libpod.InspectAnnotationLabel] = splitOpt[1]
+		case "seccomp":
+			configSpec.Annotations[libpod.InspectAnnotationSeccomp] = splitOpt[1]
+		case "apparmor":
+			configSpec.Annotations[libpod.InspectAnnotationApparmor] = splitOpt[1]
+		}
+	}
+
+	g.SetRootReadonly(c.ReadOnlyRootfs)
+	for sysctlKey, sysctlVal := range c.Sysctl {
+		g.AddLinuxSysctl(sysctlKey, sysctlVal)
+	}
+
+	return nil
+}
+
+*/
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go
index 89c76c273..2e6dd9c1d 100644
--- a/pkg/specgen/specgen.go
+++ b/pkg/specgen/specgen.go
@@ -4,8 +4,9 @@ import (
 	"net"
 	"syscall"
 
-	"github.com/containers/image/v5/manifest"
 	"github.com/containers/libpod/libpod"
+
+	"github.com/containers/image/v5/manifest"
 	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/storage"
 	"github.com/cri-o/ocicni/pkg/ocicni"
@@ -371,6 +372,16 @@ type ContainerResourceConfig struct {
 	// processes to kill for the container's process.
 	// Optional.
 	OOMScoreAdj *int `json:"oom_score_adj,omitempty"`
+	// Weight per cgroup per device, can override BlkioWeight
+	WeightDevice map[string]spec.LinuxWeightDevice `json:"weightDevice,omitempty"`
+	// IO read rate limit per cgroup per device, bytes per second
+	ThrottleReadBpsDevice map[string]spec.LinuxThrottleDevice `json:"throttleReadBpsDevice,omitempty"`
+	// IO write rate limit per cgroup per device, bytes per second
+	ThrottleWriteBpsDevice map[string]spec.LinuxThrottleDevice `json:"throttleWriteBpsDevice,omitempty"`
+	// IO read rate limit per cgroup per device, IO per second
+	ThrottleReadIOPSDevice map[string]spec.LinuxThrottleDevice `json:"throttleReadIOPSDevice,omitempty"`
+	// IO write rate limit per cgroup per device, IO per second
+	ThrottleWriteIOPSDevice map[string]spec.LinuxThrottleDevice `json:"throttleWriteIOPSDevice,omitempty"`
 }
 
 // ContainerHealthCheckConfig describes a container healthcheck with attributes
diff --git a/pkg/specgen/storage.go b/pkg/specgen/storage.go
new file mode 100644
index 000000000..1b903f608
--- /dev/null
+++ b/pkg/specgen/storage.go
@@ -0,0 +1,885 @@
+package specgen
+
+//nolint
+
+import (
+	"fmt"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"github.com/containers/libpod/libpod"
+
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/libpod/pkg/util"
+	spec "github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+)
+
+const (
+	// TypeBind is the type for mounting host dir
+	TypeBind = "bind"
+	// TypeVolume is the type for named volumes
+	TypeVolume = "volume"
+	// TypeTmpfs is the type for mounting tmpfs
+	TypeTmpfs = "tmpfs"
+)
+
+var (
+	errDuplicateDest = errors.Errorf("duplicate mount destination")         //nolint
+	optionArgError   = errors.Errorf("must provide an argument for option") //nolint
+	noDestError      = errors.Errorf("must set volume destination")         //nolint
+)
+
+// Parse all volume-related options in the create config into a set of mounts
+// and named volumes to add to the container.
+// Handles --volumes-from, --volumes, --tmpfs, --init, and --init-path flags.
+// TODO: Named volume options -  should we default to rprivate? It bakes into a
+// bind mount under the hood...
+// TODO: handle options parsing/processing via containers/storage/pkg/mount
+func (s *SpecGenerator) parseVolumes(mounts, volMounts, tmpMounts []string) error { //nolint
+
+	// TODO this needs to come from the image and erquires a runtime
+
+	// Add image volumes.
+	//baseMounts, baseVolumes, err := config.getImageVolumes()
+	//if err != nil {
+	//	return nil, nil, err
+	//}
+
+	// Add --volumes-from.
+	// Overrides image volumes unconditionally.
+	//vFromMounts, vFromVolumes, err := config.getVolumesFrom(runtime)
+	//if err != nil {
+	//	return nil, nil, err
+	//}
+	//for dest, mount := range vFromMounts {
+	//	baseMounts[dest] = mount
+	//}
+	//for dest, volume := range vFromVolumes {
+	//	baseVolumes[dest] = volume
+	//}
+
+	// Next mounts from the --mounts flag.
+	// Do not override yet.
+	//unifiedMounts, _, err := getMounts(mounts)
+	//if err != nil {
+	//	return err
+	//}
+	//
+	//// Next --volumes flag.
+	//// Do not override yet.
+	//volumeMounts, _ , err := getVolumeMounts(volMounts)
+	//if err != nil {
+	//	return err
+	//}
+	//
+	//// Next --tmpfs flag.
+	//// Do not override yet.
+	//tmpfsMounts, err := getTmpfsMounts(tmpMounts)
+	//if err != nil {
+	//	return err
+	//}
+
+	//// Unify mounts from --mount, --volume, --tmpfs.
+	//// Also add mounts + volumes directly from createconfig.
+	//// Start with --volume.
+	//for dest, mount := range volumeMounts {
+	//	if _, ok := unifiedMounts[dest]; ok {
+	//		return nil, nil, errors.Wrapf(errDuplicateDest, dest)
+	//	}
+	//	unifiedMounts[dest] = mount
+	//}
+	//for dest, volume := range volumeVolumes {
+	//	if _, ok := unifiedVolumes[dest]; ok {
+	//		return nil, nil, errors.Wrapf(errDuplicateDest, dest)
+	//	}
+	//	unifiedVolumes[dest] = volume
+	//}
+	//// Now --tmpfs
+	//for dest, tmpfs := range tmpfsMounts {
+	//	if _, ok := unifiedMounts[dest]; ok {
+	//		return nil, nil, errors.Wrapf(errDuplicateDest, dest)
+	//	}
+	//	unifiedMounts[dest] = tmpfs
+	//}
+	//// Now spec mounts and volumes
+	//for _, mount := range config.Mounts {
+	//	dest := mount.Destination
+	//	if _, ok := unifiedMounts[dest]; ok {
+	//		return nil, nil, errors.Wrapf(errDuplicateDest, dest)
+	//	}
+	//	unifiedMounts[dest] = mount
+	//}
+	//for _, volume := range config.NamedVolumes {
+	//	dest := volume.Dest
+	//	if _, ok := unifiedVolumes[dest]; ok {
+	//		return nil, nil, errors.Wrapf(errDuplicateDest, dest)
+	//	}
+	//	unifiedVolumes[dest] = volume
+	//}
+	//
+	//// If requested, add container init binary
+	//if config.Init {
+	//	initPath := config.InitPath
+	//	if initPath == "" {
+	//		rtc, err := runtime.GetConfig()
+	//		if err != nil {
+	//			return nil, nil, err
+	//		}
+	//		initPath = rtc.Engine.InitPath
+	//	}
+	//	initMount, err := config.addContainerInitBinary(initPath)
+	//	if err != nil {
+	//		return nil, nil, err
+	//	}
+	//	if _, ok := unifiedMounts[initMount.Destination]; ok {
+	//		return nil, nil, errors.Wrapf(errDuplicateDest, "conflict with mount added by --init to %q", initMount.Destination)
+	//	}
+	//	unifiedMounts[initMount.Destination] = initMount
+	//}
+	//
+	//// Before superseding, we need to find volume mounts which conflict with
+	//// named volumes, and vice versa.
+	//// We'll delete the conflicts here as we supersede.
+	//for dest := range unifiedMounts {
+	//	if _, ok := baseVolumes[dest]; ok {
+	//		delete(baseVolumes, dest)
+	//	}
+	//}
+	//for dest := range unifiedVolumes {
+	//	if _, ok := baseMounts[dest]; ok {
+	//		delete(baseMounts, dest)
+	//	}
+	//}
+	//
+	//// Supersede volumes-from/image volumes with unified volumes from above.
+	//// This is an unconditional replacement.
+	//for dest, mount := range unifiedMounts {
+	//	baseMounts[dest] = mount
+	//}
+	//for dest, volume := range unifiedVolumes {
+	//	baseVolumes[dest] = volume
+	//}
+	//
+	//// If requested, add tmpfs filesystems for read-only containers.
+	//if config.Security.ReadOnlyRootfs && config.Security.ReadOnlyTmpfs {
+	//	readonlyTmpfs := []string{"/tmp", "/var/tmp", "/run"}
+	//	options := []string{"rw", "rprivate", "nosuid", "nodev", "tmpcopyup"}
+	//	for _, dest := range readonlyTmpfs {
+	//		if _, ok := baseMounts[dest]; ok {
+	//			continue
+	//		}
+	//		if _, ok := baseVolumes[dest]; ok {
+	//			continue
+	//		}
+	//		localOpts := options
+	//		if dest == "/run" {
+	//			localOpts = append(localOpts, "noexec", "size=65536k")
+	//		} else {
+	//			localOpts = append(localOpts, "exec")
+	//		}
+	//		baseMounts[dest] = spec.Mount{
+	//			Destination: dest,
+	//			Type:        "tmpfs",
+	//			Source:      "tmpfs",
+	//			Options:     localOpts,
+	//		}
+	//	}
+	//}
+	//
+	//// Check for conflicts between named volumes and mounts
+	//for dest := range baseMounts {
+	//	if _, ok := baseVolumes[dest]; ok {
+	//		return nil, nil, errors.Wrapf(errDuplicateDest, "conflict at mount destination %v", dest)
+	//	}
+	//}
+	//for dest := range baseVolumes {
+	//	if _, ok := baseMounts[dest]; ok {
+	//		return nil, nil, errors.Wrapf(errDuplicateDest, "conflict at mount destination %v", dest)
+	//	}
+	//}
+	//
+	//// Final step: maps to arrays
+	//finalMounts := make([]spec.Mount, 0, len(baseMounts))
+	//for _, mount := range baseMounts {
+	//	if mount.Type == TypeBind {
+	//		absSrc, err := filepath.Abs(mount.Source)
+	//		if err != nil {
+	//			return nil, nil, errors.Wrapf(err, "error getting absolute path of %s", mount.Source)
+	//		}
+	//		mount.Source = absSrc
+	//	}
+	//	finalMounts = append(finalMounts, mount)
+	//}
+	//finalVolumes := make([]*define.ContainerNamedVolume, 0, len(baseVolumes))
+	//for _, volume := range baseVolumes {
+	//	finalVolumes = append(finalVolumes, volume)
+	//}
+
+	//return finalMounts, finalVolumes, nil
+	return nil
+}
+
+// Parse volumes from - a set of containers whose volumes we will mount in.
+// Grab the containers, retrieve any user-created spec mounts and all named
+// volumes, and return a list of them.
+// Conflicts are resolved simply - the last container specified wins.
+// Container names may be suffixed by mount options after a colon.
+// TODO: We should clean these paths if possible
+// TODO deferred baude
+func getVolumesFrom() (map[string]spec.Mount, map[string]*libpod.ContainerNamedVolume, error) { //nolint
+	// Both of these are maps of mount destination to mount type.
+	// We ensure that each destination is only mounted to once in this way.
+	//finalMounts := make(map[string]spec.Mount)
+	//finalNamedVolumes := make(map[string]*define.ContainerNamedVolume)
+	//
+	//for _, vol := range config.VolumesFrom {
+	//	var (
+	//		options  = []string{}
+	//		err      error
+	//		splitVol = strings.SplitN(vol, ":", 2)
+	//	)
+	//	if len(splitVol) == 2 {
+	//		splitOpts := strings.Split(splitVol[1], ",")
+	//		for _, checkOpt := range splitOpts {
+	//			switch checkOpt {
+	//			case "z", "ro", "rw":
+	//				// Do nothing, these are valid options
+	//			default:
+	//				return nil, nil, errors.Errorf("invalid options %q, can only specify 'ro', 'rw', and 'z'", splitVol[1])
+	//			}
+	//		}
+	//
+	//		if options, err = parse.ValidateVolumeOpts(splitOpts); err != nil {
+	//			return nil, nil, err
+	//		}
+	//	}
+	//	ctr, err := runtime.LookupContainer(splitVol[0])
+	//	if err != nil {
+	//		return nil, nil, errors.Wrapf(err, "error looking up container %q for volumes-from", splitVol[0])
+	//	}
+	//
+	//	logrus.Debugf("Adding volumes from container %s", ctr.ID())
+	//
+	//	// Look up the container's user volumes. This gets us the
+	//	// destinations of all mounts the user added to the container.
+	//	userVolumesArr := ctr.UserVolumes()
+	//
+	//	// We're going to need to access them a lot, so convert to a map
+	//	// to reduce looping.
+	//	// We'll also use the map to indicate if we missed any volumes along the way.
+	//	userVolumes := make(map[string]bool)
+	//	for _, dest := range userVolumesArr {
+	//		userVolumes[dest] = false
+	//	}
+	//
+	//	// Now we get the container's spec and loop through its volumes
+	//	// and append them in if we can find them.
+	//	spec := ctr.Spec()
+	//	if spec == nil {
+	//		return nil, nil, errors.Errorf("error retrieving container %s spec for volumes-from", ctr.ID())
+	//	}
+	//	for _, mnt := range spec.Mounts {
+	//		if mnt.Type != TypeBind {
+	//			continue
+	//		}
+	//		if _, exists := userVolumes[mnt.Destination]; exists {
+	//			userVolumes[mnt.Destination] = true
+	//
+	//			if len(options) != 0 {
+	//				mnt.Options = options
+	//			}
+	//
+	//			if _, ok := finalMounts[mnt.Destination]; ok {
+	//				logrus.Debugf("Overriding mount to %s with new mount from container %s", mnt.Destination, ctr.ID())
+	//			}
+	//			finalMounts[mnt.Destination] = mnt
+	//		}
+	//	}
+	//
+	//	// We're done with the spec mounts. Add named volumes.
+	//	// Add these unconditionally - none of them are automatically
+	//	// part of the container, as some spec mounts are.
+	//	namedVolumes := ctr.NamedVolumes()
+	//	for _, namedVol := range namedVolumes {
+	//		if _, exists := userVolumes[namedVol.Dest]; exists {
+	//			userVolumes[namedVol.Dest] = true
+	//		}
+	//
+	//		if len(options) != 0 {
+	//			namedVol.Options = options
+	//		}
+	//
+	//		if _, ok := finalMounts[namedVol.Dest]; ok {
+	//			logrus.Debugf("Overriding named volume mount to %s with new named volume from container %s", namedVol.Dest, ctr.ID())
+	//		}
+	//		finalNamedVolumes[namedVol.Dest] = namedVol
+	//	}
+	//
+	//	// Check if we missed any volumes
+	//	for volDest, found := range userVolumes {
+	//		if !found {
+	//			logrus.Warnf("Unable to match volume %s from container %s for volumes-from", volDest, ctr.ID())
+	//		}
+	//	}
+	//}
+	//
+	//return finalMounts, finalNamedVolumes, nil
+	return nil, nil, nil
+}
+
+// getMounts takes user-provided input from the --mount flag and creates OCI
+// spec mounts and Libpod named volumes.
+// podman run --mount type=bind,src=/etc/resolv.conf,target=/etc/resolv.conf ...
+// podman run --mount type=tmpfs,target=/dev/shm ...
+// podman run --mount type=volume,source=test-volume, ...
+func getMounts(mounts []string) (map[string]spec.Mount, map[string]*libpod.ContainerNamedVolume, error) { //nolint
+	finalMounts := make(map[string]spec.Mount)
+	finalNamedVolumes := make(map[string]*libpod.ContainerNamedVolume)
+
+	errInvalidSyntax := errors.Errorf("incorrect mount format: should be --mount type=<bind|tmpfs|volume>,[src=<host-dir|volume-name>,]target=<ctr-dir>[,options]")
+
+	// TODO(vrothberg): the manual parsing can be replaced with a regular expression
+	//                  to allow a more robust parsing of the mount format and to give
+	//                  precise errors regarding supported format versus supported options.
+	for _, mount := range mounts {
+		arr := strings.SplitN(mount, ",", 2)
+		if len(arr) < 2 {
+			return nil, nil, errors.Wrapf(errInvalidSyntax, "%q", mount)
+		}
+		kv := strings.Split(arr[0], "=")
+		// TODO: type is not explicitly required in Docker.
+		// If not specified, it defaults to "volume".
+		if len(kv) != 2 || kv[0] != "type" {
+			return nil, nil, errors.Wrapf(errInvalidSyntax, "%q", mount)
+		}
+
+		tokens := strings.Split(arr[1], ",")
+		switch kv[1] {
+		case TypeBind:
+			mount, err := getBindMount(tokens)
+			if err != nil {
+				return nil, nil, err
+			}
+			if _, ok := finalMounts[mount.Destination]; ok {
+				return nil, nil, errors.Wrapf(errDuplicateDest, mount.Destination)
+			}
+			finalMounts[mount.Destination] = mount
+		case TypeTmpfs:
+			mount, err := getTmpfsMount(tokens)
+			if err != nil {
+				return nil, nil, err
+			}
+			if _, ok := finalMounts[mount.Destination]; ok {
+				return nil, nil, errors.Wrapf(errDuplicateDest, mount.Destination)
+			}
+			finalMounts[mount.Destination] = mount
+		case "volume":
+			volume, err := getNamedVolume(tokens)
+			if err != nil {
+				return nil, nil, err
+			}
+			if _, ok := finalNamedVolumes[volume.Dest]; ok {
+				return nil, nil, errors.Wrapf(errDuplicateDest, volume.Dest)
+			}
+			finalNamedVolumes[volume.Dest] = volume
+		default:
+			return nil, nil, errors.Errorf("invalid filesystem type %q", kv[1])
+		}
+	}
+
+	return finalMounts, finalNamedVolumes, nil
+}
+
+// Parse a single bind mount entry from the --mount flag.
+func getBindMount(args []string) (spec.Mount, error) { //nolint
+	newMount := spec.Mount{
+		Type: TypeBind,
+	}
+
+	var setSource, setDest, setRORW, setSuid, setDev, setExec, setRelabel bool
+
+	for _, val := range args {
+		kv := strings.Split(val, "=")
+		switch kv[0] {
+		case "bind-nonrecursive":
+			newMount.Options = append(newMount.Options, "bind")
+		case "ro", "rw":
+			if setRORW {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'ro' or 'rw' options more than once")
+			}
+			setRORW = true
+			// Can be formatted as one of:
+			// ro
+			// ro=[true|false]
+			// rw
+			// rw=[true|false]
+			switch len(kv) {
+			case 1:
+				newMount.Options = append(newMount.Options, kv[0])
+			case 2:
+				switch strings.ToLower(kv[1]) {
+				case "true":
+					newMount.Options = append(newMount.Options, kv[0])
+				case "false":
+					// Set the opposite only for rw
+					// ro's opposite is the default
+					if kv[0] == "rw" {
+						newMount.Options = append(newMount.Options, "ro")
+					}
+				default:
+					return newMount, errors.Wrapf(optionArgError, "%s must be set to true or false, instead received %q", kv[0], kv[1])
+				}
+			default:
+				return newMount, errors.Wrapf(optionArgError, "badly formatted option %q", val)
+			}
+		case "nosuid", "suid":
+			if setSuid {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'nosuid' and 'suid' options more than once")
+			}
+			setSuid = true
+			newMount.Options = append(newMount.Options, kv[0])
+		case "nodev", "dev":
+			if setDev {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'nodev' and 'dev' options more than once")
+			}
+			setDev = true
+			newMount.Options = append(newMount.Options, kv[0])
+		case "noexec", "exec":
+			if setExec {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'noexec' and 'exec' options more than once")
+			}
+			setExec = true
+			newMount.Options = append(newMount.Options, kv[0])
+		case "shared", "rshared", "private", "rprivate", "slave", "rslave", "Z", "z":
+			newMount.Options = append(newMount.Options, kv[0])
+		case "bind-propagation":
+			if len(kv) == 1 {
+				return newMount, errors.Wrapf(optionArgError, kv[0])
+			}
+			newMount.Options = append(newMount.Options, kv[1])
+		case "src", "source":
+			if len(kv) == 1 {
+				return newMount, errors.Wrapf(optionArgError, kv[0])
+			}
+			if err := parse.ValidateVolumeHostDir(kv[1]); err != nil {
+				return newMount, err
+			}
+			newMount.Source = kv[1]
+			setSource = true
+		case "target", "dst", "destination":
+			if len(kv) == 1 {
+				return newMount, errors.Wrapf(optionArgError, kv[0])
+			}
+			if err := parse.ValidateVolumeCtrDir(kv[1]); err != nil {
+				return newMount, err
+			}
+			newMount.Destination = filepath.Clean(kv[1])
+			setDest = true
+		case "relabel":
+			if setRelabel {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'relabel' option more than once")
+			}
+			setRelabel = true
+			if len(kv) != 2 {
+				return newMount, errors.Wrapf(util.ErrBadMntOption, "%s mount option must be 'private' or 'shared'", kv[0])
+			}
+			switch kv[1] {
+			case "private":
+				newMount.Options = append(newMount.Options, "z")
+			case "shared":
+				newMount.Options = append(newMount.Options, "Z")
+			default:
+				return newMount, errors.Wrapf(util.ErrBadMntOption, "%s mount option must be 'private' or 'shared'", kv[0])
+			}
+		default:
+			return newMount, errors.Wrapf(util.ErrBadMntOption, kv[0])
+		}
+	}
+
+	if !setDest {
+		return newMount, noDestError
+	}
+
+	if !setSource {
+		newMount.Source = newMount.Destination
+	}
+
+	options, err := parse.ValidateVolumeOpts(newMount.Options)
+	if err != nil {
+		return newMount, err
+	}
+	newMount.Options = options
+	return newMount, nil
+}
+
+// Parse a single tmpfs mount entry from the --mount flag
+func getTmpfsMount(args []string) (spec.Mount, error) { //nolint
+	newMount := spec.Mount{
+		Type:   TypeTmpfs,
+		Source: TypeTmpfs,
+	}
+
+	var setDest, setRORW, setSuid, setDev, setExec, setTmpcopyup bool
+
+	for _, val := range args {
+		kv := strings.Split(val, "=")
+		switch kv[0] {
+		case "tmpcopyup", "notmpcopyup":
+			if setTmpcopyup {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'tmpcopyup' and 'notmpcopyup' options more than once")
+			}
+			setTmpcopyup = true
+			newMount.Options = append(newMount.Options, kv[0])
+		case "ro", "rw":
+			if setRORW {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'ro' and 'rw' options more than once")
+			}
+			setRORW = true
+			newMount.Options = append(newMount.Options, kv[0])
+		case "nosuid", "suid":
+			if setSuid {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'nosuid' and 'suid' options more than once")
+			}
+			setSuid = true
+			newMount.Options = append(newMount.Options, kv[0])
+		case "nodev", "dev":
+			if setDev {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'nodev' and 'dev' options more than once")
+			}
+			setDev = true
+			newMount.Options = append(newMount.Options, kv[0])
+		case "noexec", "exec":
+			if setExec {
+				return newMount, errors.Wrapf(optionArgError, "cannot pass 'noexec' and 'exec' options more than once")
+			}
+			setExec = true
+			newMount.Options = append(newMount.Options, kv[0])
+		case "tmpfs-mode":
+			if len(kv) == 1 {
+				return newMount, errors.Wrapf(optionArgError, kv[0])
+			}
+			newMount.Options = append(newMount.Options, fmt.Sprintf("mode=%s", kv[1]))
+		case "tmpfs-size":
+			if len(kv) == 1 {
+				return newMount, errors.Wrapf(optionArgError, kv[0])
+			}
+			newMount.Options = append(newMount.Options, fmt.Sprintf("size=%s", kv[1]))
+		case "src", "source":
+			return newMount, errors.Errorf("source is not supported with tmpfs mounts")
+		case "target", "dst", "destination":
+			if len(kv) == 1 {
+				return newMount, errors.Wrapf(optionArgError, kv[0])
+			}
+			if err := parse.ValidateVolumeCtrDir(kv[1]); err != nil {
+				return newMount, err
+			}
+			newMount.Destination = filepath.Clean(kv[1])
+			setDest = true
+		default:
+			return newMount, errors.Wrapf(util.ErrBadMntOption, kv[0])
+		}
+	}
+
+	if !setDest {
+		return newMount, noDestError
+	}
+
+	return newMount, nil
+}
+
+// Parse a single volume mount entry from the --mount flag.
+// Note that the volume-label option for named volumes is currently NOT supported.
+// TODO: add support for --volume-label
+func getNamedVolume(args []string) (*libpod.ContainerNamedVolume, error) { //nolint
+	newVolume := new(libpod.ContainerNamedVolume)
+
+	var setSource, setDest, setRORW, setSuid, setDev, setExec bool
+
+	for _, val := range args {
+		kv := strings.Split(val, "=")
+		switch kv[0] {
+		case "ro", "rw":
+			if setRORW {
+				return nil, errors.Wrapf(optionArgError, "cannot pass 'ro' and 'rw' options more than once")
+			}
+			setRORW = true
+			newVolume.Options = append(newVolume.Options, kv[0])
+		case "nosuid", "suid":
+			if setSuid {
+				return nil, errors.Wrapf(optionArgError, "cannot pass 'nosuid' and 'suid' options more than once")
+			}
+			setSuid = true
+			newVolume.Options = append(newVolume.Options, kv[0])
+		case "nodev", "dev":
+			if setDev {
+				return nil, errors.Wrapf(optionArgError, "cannot pass 'nodev' and 'dev' options more than once")
+			}
+			setDev = true
+			newVolume.Options = append(newVolume.Options, kv[0])
+		case "noexec", "exec":
+			if setExec {
+				return nil, errors.Wrapf(optionArgError, "cannot pass 'noexec' and 'exec' options more than once")
+			}
+			setExec = true
+			newVolume.Options = append(newVolume.Options, kv[0])
+		case "volume-label":
+			return nil, errors.Errorf("the --volume-label option is not presently implemented")
+		case "src", "source":
+			if len(kv) == 1 {
+				return nil, errors.Wrapf(optionArgError, kv[0])
+			}
+			newVolume.Name = kv[1]
+			setSource = true
+		case "target", "dst", "destination":
+			if len(kv) == 1 {
+				return nil, errors.Wrapf(optionArgError, kv[0])
+			}
+			if err := parse.ValidateVolumeCtrDir(kv[1]); err != nil {
+				return nil, err
+			}
+			newVolume.Dest = filepath.Clean(kv[1])
+			setDest = true
+		default:
+			return nil, errors.Wrapf(util.ErrBadMntOption, kv[0])
+		}
+	}
+
+	if !setSource {
+		return nil, errors.Errorf("must set source volume")
+	}
+	if !setDest {
+		return nil, noDestError
+	}
+
+	return newVolume, nil
+}
+
+func getVolumeMounts(vols []string) (map[string]spec.Mount, map[string]*libpod.ContainerNamedVolume, error) { //nolint
+	mounts := make(map[string]spec.Mount)
+	volumes := make(map[string]*libpod.ContainerNamedVolume)
+
+	volumeFormatErr := errors.Errorf("incorrect volume format, should be [host-dir:]ctr-dir[:option]")
+
+	for _, vol := range vols {
+		var (
+			options []string
+			src     string
+			dest    string
+			err     error
+		)
+
+		splitVol := strings.Split(vol, ":")
+		if len(splitVol) > 3 {
+			return nil, nil, errors.Wrapf(volumeFormatErr, vol)
+		}
+
+		src = splitVol[0]
+		if len(splitVol) == 1 {
+			// This is an anonymous named volume. Only thing given
+			// is destination.
+			// Name/source will be blank, and populated by libpod.
+			src = ""
+			dest = splitVol[0]
+		} else if len(splitVol) > 1 {
+			dest = splitVol[1]
+		}
+		if len(splitVol) > 2 {
+			if options, err = parse.ValidateVolumeOpts(strings.Split(splitVol[2], ",")); err != nil {
+				return nil, nil, err
+			}
+		}
+
+		// Do not check source dir for anonymous volumes
+		if len(splitVol) > 1 {
+			if err := parse.ValidateVolumeHostDir(src); err != nil {
+				return nil, nil, err
+			}
+		}
+		if err := parse.ValidateVolumeCtrDir(dest); err != nil {
+			return nil, nil, err
+		}
+
+		cleanDest := filepath.Clean(dest)
+
+		if strings.HasPrefix(src, "/") || strings.HasPrefix(src, ".") {
+			// This is not a named volume
+			newMount := spec.Mount{
+				Destination: cleanDest,
+				Type:        string(TypeBind),
+				Source:      src,
+				Options:     options,
+			}
+			if _, ok := mounts[newMount.Destination]; ok {
+				return nil, nil, errors.Wrapf(errDuplicateDest, newMount.Destination)
+			}
+			mounts[newMount.Destination] = newMount
+		} else {
+			// This is a named volume
+			newNamedVol := new(libpod.ContainerNamedVolume)
+			newNamedVol.Name = src
+			newNamedVol.Dest = cleanDest
+			newNamedVol.Options = options
+
+			if _, ok := volumes[newNamedVol.Dest]; ok {
+				return nil, nil, errors.Wrapf(errDuplicateDest, newNamedVol.Dest)
+			}
+			volumes[newNamedVol.Dest] = newNamedVol
+		}
+
+		logrus.Debugf("User mount %s:%s options %v", src, dest, options)
+	}
+
+	return mounts, volumes, nil
+}
+
+// Get mounts for container's image volumes
+// TODO deferred baude
+func getImageVolumes() (map[string]spec.Mount, map[string]*libpod.ContainerNamedVolume, error) { //nolint
+	//mounts := make(map[string]spec.Mount)
+	//volumes := make(map[string]*define.ContainerNamedVolume)
+	//
+	//if config.ImageVolumeType == "ignore" {
+	//	return mounts, volumes, nil
+	//}
+	//
+	//for vol := range config.BuiltinImgVolumes {
+	//	cleanDest := filepath.Clean(vol)
+	//	logrus.Debugf("Adding image volume at %s", cleanDest)
+	//	if config.ImageVolumeType == "tmpfs" {
+	//		// Tmpfs image volumes are handled as mounts
+	//		mount := spec.Mount{
+	//			Destination: cleanDest,
+	//			Source:      TypeTmpfs,
+	//			Type:        TypeTmpfs,
+	//			Options:     []string{"rprivate", "rw", "nodev", "exec"},
+	//		}
+	//		mounts[cleanDest] = mount
+	//	} else {
+	//		// Anonymous volumes have no name.
+	//		namedVolume := new(define.ContainerNamedVolume)
+	//		namedVolume.Options = []string{"rprivate", "rw", "nodev", "exec"}
+	//		namedVolume.Dest = cleanDest
+	//		volumes[cleanDest] = namedVolume
+	//	}
+	//}
+	//
+	//return mounts, volumes, nil
+	return nil, nil, nil
+}
+
+// GetTmpfsMounts creates spec.Mount structs for user-requested tmpfs mounts
+func getTmpfsMounts(mounts []string) (map[string]spec.Mount, error) { //nolint
+	m := make(map[string]spec.Mount)
+	for _, i := range mounts {
+		// Default options if nothing passed
+		var options []string
+		spliti := strings.Split(i, ":")
+		destPath := spliti[0]
+		if err := parse.ValidateVolumeCtrDir(spliti[0]); err != nil {
+			return nil, err
+		}
+		if len(spliti) > 1 {
+			options = strings.Split(spliti[1], ",")
+		}
+
+		if _, ok := m[destPath]; ok {
+			return nil, errors.Wrapf(errDuplicateDest, destPath)
+		}
+
+		mount := spec.Mount{
+			Destination: filepath.Clean(destPath),
+			Type:        string(TypeTmpfs),
+			Options:     options,
+			Source:      string(TypeTmpfs),
+		}
+		m[destPath] = mount
+	}
+	return m, nil
+}
+
+// AddContainerInitBinary adds the init binary specified by path iff the
+// container will run in a private PID namespace that is not shared with the
+// host or another pre-existing container, where an init-like process is
+// already running.
+//
+// Note that AddContainerInitBinary prepends "/dev/init" "--" to the command
+// to execute the bind-mounted binary as PID 1.
+// TODO this needs to be worked on to work in new env
+func addContainerInitBinary(path string) (spec.Mount, error) { //nolint
+	mount := spec.Mount{
+		Destination: "/dev/init",
+		Type:        TypeBind,
+		Source:      path,
+		Options:     []string{TypeBind, "ro"},
+	}
+
+	//if path == "" {
+	//	return mount, fmt.Errorf("please specify a path to the container-init binary")
+	//}
+	//if !config.Pid.PidMode.IsPrivate() {
+	//	return mount, fmt.Errorf("cannot add init binary as PID 1 (PID namespace isn't private)")
+	//}
+	//if config.Systemd {
+	//	return mount, fmt.Errorf("cannot use container-init binary with systemd")
+	//}
+	//if _, err := os.Stat(path); os.IsNotExist(err) {
+	//	return mount, errors.Wrap(err, "container-init binary not found on the host")
+	//}
+	//config.Command = append([]string{"/dev/init", "--"}, config.Command...)
+	return mount, nil
+}
+
+// Supersede existing mounts in the spec with new, user-specified mounts.
+// TODO: Should we unmount subtree mounts? E.g., if /tmp/ is mounted by
+// one mount, and we already have /tmp/a and /tmp/b, should we remove
+// the /tmp/a and /tmp/b mounts in favor of the more general /tmp?
+func SupercedeUserMounts(mounts []spec.Mount, configMount []spec.Mount) []spec.Mount {
+	if len(mounts) > 0 {
+		// If we have overlappings mounts, remove them from the spec in favor of
+		// the user-added volume mounts
+		destinations := make(map[string]bool)
+		for _, mount := range mounts {
+			destinations[path.Clean(mount.Destination)] = true
+		}
+		// Copy all mounts from spec to defaultMounts, except for
+		//  - mounts overridden by a user supplied mount;
+		//  - all mounts under /dev if a user supplied /dev is present;
+		mountDev := destinations["/dev"]
+		for _, mount := range configMount {
+			if _, ok := destinations[path.Clean(mount.Destination)]; !ok {
+				if mountDev && strings.HasPrefix(mount.Destination, "/dev/") {
+					// filter out everything under /dev if /dev is user-mounted
+					continue
+				}
+
+				logrus.Debugf("Adding mount %s", mount.Destination)
+				mounts = append(mounts, mount)
+			}
+		}
+		return mounts
+	}
+	return configMount
+}
+
+func InitFSMounts(mounts []spec.Mount) error {
+	for i, m := range mounts {
+		switch {
+		case m.Type == TypeBind:
+			opts, err := util.ProcessOptions(m.Options, false, m.Source)
+			if err != nil {
+				return err
+			}
+			mounts[i].Options = opts
+		case m.Type == TypeTmpfs && filepath.Clean(m.Destination) != "/dev":
+			opts, err := util.ProcessOptions(m.Options, true, "")
+			if err != nil {
+				return err
+			}
+			mounts[i].Options = opts
+		}
+	}
+	return nil
+}