opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 16:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8481 from Luap99/fix-remote-volume-path

Browse Source 
Do not validate the volume source path in specgen
This commit is contained in:
OpenShift Merge Robot
2020-11-26 16:38:18 +01:00
committed by GitHub
parent 397e9a9f1b f7f85fef7c
commit 5af0266847
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/common/volumes.go
View File

@ -323,8 +323,8 @@ func getBindMount(args []string) (spec.Mount, error) {
if len(kv) == 1 { if len(kv) == 1 {
return newMount, errors.Wrapf(optionArgError, kv[0]) return newMount, errors.Wrapf(optionArgError, kv[0])
} }
if err := parse.ValidateVolumeHostDir(kv[1]); err != nil { if len(kv[1]) == 0 {
return newMount, err return newMount, errors.Wrapf(optionArgError, "host directory cannot be empty")
} }
newMount.Source = kv[1] newMount.Source = kv[1]
setSource = true setSource = true

5
pkg/specgen/volumes.go
View File

@ -84,11 +84,10 @@ func GenVolumeMounts(volumeFlag []string) (map[string]spec.Mount, map[string]*Na
return nil, nil, nil, err return nil, nil, nil, err
} }
} }
// Do not check source dir for anonymous volumes // Do not check source dir for anonymous volumes
if len(splitVol) > 1 { if len(splitVol) > 1 {
if err := parse.ValidateVolumeHostDir(src); err != nil { if len(src) == 0 {
return nil, nil, nil, err return nil, nil, nil, errors.New("host directory cannot be empty")
} }
} }
if err := parse.ValidateVolumeCtrDir(dest); err != nil { if err := parse.ValidateVolumeCtrDir(dest); err != nil {