opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 14:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Respect user-added mounts over default spec mounts

Browse Source 
When there was a conflict between a user-added volume and a mount
already in the spec, we previously respected the mount already in
the spec and discarded the user-added mount. This is counter to
expected behavior - if I volume-mount /dev into the container, I
epxect it will override the default /dev in the container, and
not be ignored.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #1419
Approved by: TomSweeneyRedHat
This commit is contained in:
Matthew Heon
2018-09-07 10:40:31 -04:00
committed by Atomic Bot
parent 2e89e5a204
commit ccc4a339cd
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/spec/createconfig.go
View File

@ -160,9 +160,6 @@ func (c *CreateConfig) GetVolumeMounts(specMounts []spec.Mount) ([]spec.Mount, e
if len(spliti) > 2 {
options = strings.Split(spliti[2], ",")
}
if libpod.MountExists(specMounts, spliti[1]) {
continue
}
options = append(options, "rbind")
for _, opt := range options {
switch opt {
@ -201,6 +198,8 @@ func (c *CreateConfig) GetVolumeMounts(specMounts []spec.Mount) ([]spec.Mount, e
Source: spliti[0],
Options: options,
})
logrus.Debugf("User mount %s:%s options %v", spliti[0], spliti[1], options)
}
// volumes from image config

24
pkg/spec/spec.go
View File

@ -2,6 +2,7 @@ package createconfig
import (
"os"
"path"
"strings"
"github.com/containers/libpod/libpod"
@ -310,18 +311,21 @@ func CreateConfigToOCISpec(config *CreateConfig) (*spec.Spec, error) { //nolint
if err != nil {
return nil, errors.Wrapf(err, "error getting volume mounts")
}
// 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[mount.Destination] = true
}
for _, mount := range configSpec.Mounts {
if _, ok := destinations[mount.Destination]; !ok {
mounts = append(mounts, 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
}
for _, mount := range configSpec.Mounts {
if _, ok := destinations[path.Clean(mount.Destination)]; !ok {
logrus.Debugf("Adding mount %s", mount.Destination)
mounts = append(mounts, mount)
}
}
configSpec.Mounts = mounts
}
configSpec.Mounts = mounts
if err := g.SetLinuxRootPropagation("shared"); err != nil {
return nil, errors.Wrapf(err, "failed to set propagation to rslave")