diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-26 16:38:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-26 16:38:18 +0100 |
| commit | 5af0266847fa304a25e038e1cf7fe1e3f4143f65 (patch) | |
| tree | 7eeb18e06b04600cbf3ea045a03f3a920a1a519d | |
| parent | 397e9a9f1b146617120690243a89fa9541f0854c (diff) | |
| parent | f7f85fef7c7086a39e57eb36e875209bb9553f4e (diff) | |
| download | podman-5af0266847fa304a25e038e1cf7fe1e3f4143f65.tar.gz podman-5af0266847fa304a25e038e1cf7fe1e3f4143f65.tar.bz2 podman-5af0266847fa304a25e038e1cf7fe1e3f4143f65.zip | |
Merge pull request #8481 from Luap99/fix-remote-volume-path
Do not validate the volume source path in specgen
| -rw-r--r-- | cmd/podman/common/volumes.go | 4 | ||||
| -rw-r--r-- | pkg/specgen/volumes.go | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cmd/podman/common/volumes.go b/cmd/podman/common/volumes.go index 0468f15e0..dfbb7b1b2 100644 --- a/cmd/podman/common/volumes.go +++ b/cmd/podman/common/volumes.go @@ -323,8 +323,8 @@ func getBindMount(args []string) (spec.Mount, error) { if len(kv) == 1 { return newMount, errors.Wrapf(optionArgError, kv[0]) } - if err := parse.ValidateVolumeHostDir(kv[1]); err != nil { - return newMount, err + if len(kv[1]) == 0 { + return newMount, errors.Wrapf(optionArgError, "host directory cannot be empty") } newMount.Source = kv[1] setSource = true diff --git a/pkg/specgen/volumes.go b/pkg/specgen/volumes.go index 1178f9960..41efee3b3 100644 --- a/pkg/specgen/volumes.go +++ b/pkg/specgen/volumes.go @@ -84,11 +84,10 @@ func GenVolumeMounts(volumeFlag []string) (map[string]spec.Mount, map[string]*Na return nil, nil, nil, err } } - // Do not check source dir for anonymous volumes if len(splitVol) > 1 { - if err := parse.ValidateVolumeHostDir(src); err != nil { - return nil, nil, nil, err + if len(src) == 0 { + return nil, nil, nil, errors.New("host directory cannot be empty") } } if err := parse.ValidateVolumeCtrDir(dest); err != nil { |