summaryrefslogtreecommitdiff
path: root/pkg/specgen/generate
diff options
context:
space:
mode:
authorPaul Holzinger <paul.holzinger@web.de>2020-09-20 19:43:19 +0200
committerPaul Holzinger <paul.holzinger@web.de>2020-09-20 22:49:09 +0200
commit44d7270a34a0c3578d00858440f2adb53b83ef5e (patch)
tree938e1da3637fb32ef81b8be782f85792951b5cdb /pkg/specgen/generate
parent852943516606f32ccc2406f41bcf3df42d7c622c (diff)
downloadpodman-44d7270a34a0c3578d00858440f2adb53b83ef5e.tar.gz
podman-44d7270a34a0c3578d00858440f2adb53b83ef5e.tar.bz2
podman-44d7270a34a0c3578d00858440f2adb53b83ef5e.zip
Fix incorrect parsing of create/run --volumes-from
Add a bunch of tests to ensure that --volumes-from works as expected. Also align the podman create and run man page. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'pkg/specgen/generate')
-rw-r--r--pkg/specgen/generate/storage.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go
index 7f55317ff..b225f79ee 100644
--- a/pkg/specgen/generate/storage.go
+++ b/pkg/specgen/generate/storage.go
@@ -195,9 +195,9 @@ func getVolumesFrom(volumesFrom []string, runtime *libpod.Runtime) (map[string]s
splitVol := strings.SplitN(volume, ":", 2)
if len(splitVol) == 2 {
splitOpts := strings.Split(splitVol[1], ",")
+ setRORW := false
+ setZ := false
for _, opt := range splitOpts {
- setRORW := false
- setZ := false
switch opt {
case "z":
if setZ {