summaryrefslogtreecommitdiff
path: root/pkg/specgen/generate/storage.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-21 12:06:46 +0000
committerGitHub <noreply@github.com>2020-09-21 12:06:46 +0000
commitdd4dc4b002e79c28cd824c59d8f6537d347868cf (patch)
tree938e1da3637fb32ef81b8be782f85792951b5cdb /pkg/specgen/generate/storage.go
parent852943516606f32ccc2406f41bcf3df42d7c622c (diff)
parent44d7270a34a0c3578d00858440f2adb53b83ef5e (diff)
downloadpodman-dd4dc4b002e79c28cd824c59d8f6537d347868cf.tar.gz
podman-dd4dc4b002e79c28cd824c59d8f6537d347868cf.tar.bz2
podman-dd4dc4b002e79c28cd824c59d8f6537d347868cf.zip
Merge pull request #7702 from Luap99/fix#7701
Fix incorrect parsing of create/run --volumes-from
Diffstat (limited to 'pkg/specgen/generate/storage.go')
-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 {