summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-01 05:10:55 -0500
committerGitHub <noreply@github.com>2021-02-01 05:10:55 -0500
commit15e5a5c32b39fd8a62eb02fc4234c3a0d51e67f5 (patch)
tree1660c1b970b7ff1ded22f4471de166feadd56115 /cmd
parent4ead8067cd0fb0ee3dcf8245f81b97f8b25edc4d (diff)
parent4a6d042c282753b1c175468d23746de08b60cd53 (diff)
downloadpodman-15e5a5c32b39fd8a62eb02fc4234c3a0d51e67f5.tar.gz
podman-15e5a5c32b39fd8a62eb02fc4234c3a0d51e67f5.tar.bz2
podman-15e5a5c32b39fd8a62eb02fc4234c3a0d51e67f5.zip
Merge pull request #9151 from rhatdan/mount
Docker ignores mount flags that begin with constency
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/common/volumes.go16
1 files changed, 16 insertions, 0 deletions
diff --git a/cmd/podman/common/volumes.go b/cmd/podman/common/volumes.go
index a6e6faeca..2a598d7a5 100644
--- a/cmd/podman/common/volumes.go
+++ b/cmd/podman/common/volumes.go
@@ -353,6 +353,10 @@ func getBindMount(args []string) (spec.Mount, error) {
default:
return newMount, errors.Wrapf(util.ErrBadMntOption, "%s mount option must be 'private' or 'shared'", kv[0])
}
+ case "consistency":
+ // Often used on MACs and mistakenly on Linux platforms.
+ // Since Docker ignores this option so shall we.
+ continue
default:
return newMount, errors.Wrapf(util.ErrBadMntOption, kv[0])
}
@@ -437,6 +441,10 @@ func getTmpfsMount(args []string) (spec.Mount, error) {
}
newMount.Destination = filepath.Clean(kv[1])
setDest = true
+ case "consistency":
+ // Often used on MACs and mistakenly on Linux platforms.
+ // Since Docker ignores this option so shall we.
+ continue
default:
return newMount, errors.Wrapf(util.ErrBadMntOption, kv[0])
}
@@ -534,6 +542,10 @@ func getNamedVolume(args []string) (*specgen.NamedVolume, error) {
}
newVolume.Dest = filepath.Clean(kv[1])
setDest = true
+ case "consistency":
+ // Often used on MACs and mistakenly on Linux platforms.
+ // Since Docker ignores this option so shall we.
+ continue
default:
return nil, errors.Wrapf(util.ErrBadMntOption, kv[0])
}
@@ -581,6 +593,10 @@ func getImageVolume(args []string) (*specgen.ImageVolume, error) {
default:
return nil, errors.Wrapf(util.ErrBadMntOption, "invalid rw value %q", kv[1])
}
+ case "consistency":
+ // Often used on MACs and mistakenly on Linux platforms.
+ // Since Docker ignores this option so shall we.
+ continue
default:
return nil, errors.Wrapf(util.ErrBadMntOption, kv[0])
}