diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-09-24 15:57:17 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-09-24 15:57:17 -0400 |
| commit | d89414b1f0ca3fa2e9685681361c667960332f03 (patch) | |
| tree | 74a22adfad49c627e1b730e99c23d937f21711de /pkg | |
| parent | 0000afc1af06b04ececeb91637bb3d80d6f47e14 (diff) | |
| download | podman-d89414b1f0ca3fa2e9685681361c667960332f03.tar.gz podman-d89414b1f0ca3fa2e9685681361c667960332f03.tar.bz2 podman-d89414b1f0ca3fa2e9685681361c667960332f03.zip | |
Handle conflict between volumes and --read-only-tmpfs
When a named volume is mounted on any of the tmpfs filesystems
created by read-only tmpfs, it caused a conflict that was not
resolved prior to this.
Fixes BZ1755119
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/spec/storage.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/spec/storage.go b/pkg/spec/storage.go index 3d59d70d8..93919dd0a 100644 --- a/pkg/spec/storage.go +++ b/pkg/spec/storage.go @@ -168,6 +168,9 @@ func (config *CreateConfig) parseVolumes(runtime *libpod.Runtime) ([]spec.Mount, if _, ok := baseMounts[dest]; ok { continue } + if _, ok := baseVolumes[dest]; ok { + continue + } localOpts := options if dest == "/run" { localOpts = append(localOpts, "noexec", "size=65536k") |