diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-04 12:14:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-04 12:14:47 +0200 |
commit | 919e5d4d6e6f4a54fd5b02c3f1352b00b6494936 (patch) | |
tree | e0ee0aada635cb38717075e70bff1794b5df495d /cmd/podman/common | |
parent | 1ed1e583a06288bb2f3058f7d4dff7650af5f3bd (diff) | |
parent | 976e364a9741d10d99a71253bc69bfa8ef47a0f0 (diff) | |
download | podman-919e5d4d6e6f4a54fd5b02c3f1352b00b6494936.tar.gz podman-919e5d4d6e6f4a54fd5b02c3f1352b00b6494936.tar.bz2 podman-919e5d4d6e6f4a54fd5b02c3f1352b00b6494936.zip |
Merge pull request #7209 from giuseppe/support-mount-devpts
podman: support --mount type=devpts
Diffstat (limited to 'cmd/podman/common')
-rw-r--r-- | cmd/podman/common/volumes.go | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/cmd/podman/common/volumes.go b/cmd/podman/common/volumes.go index 3b8f7ec6e..20c31bd81 100644 --- a/cmd/podman/common/volumes.go +++ b/cmd/podman/common/volumes.go @@ -20,6 +20,8 @@ const ( TypeVolume = "volume" // TypeTmpfs is the type for mounting tmpfs TypeTmpfs = "tmpfs" + // TypeDevpts is the type for creating a devpts + TypeDevpts = "devpts" ) var ( @@ -197,6 +199,15 @@ func getMounts(mountFlag []string) (map[string]spec.Mount, map[string]*specgen.N return nil, nil, errors.Wrapf(errDuplicateDest, mount.Destination) } finalMounts[mount.Destination] = mount + case TypeDevpts: + mount, err := getDevptsMount(tokens) + if err != nil { + return nil, nil, err + } + if _, ok := finalMounts[mount.Destination]; ok { + return nil, nil, errors.Wrapf(errDuplicateDest, mount.Destination) + } + finalMounts[mount.Destination] = mount case "volume": volume, err := getNamedVolume(tokens) if err != nil { @@ -416,6 +427,39 @@ func getTmpfsMount(args []string) (spec.Mount, error) { return newMount, nil } +// Parse a single devpts mount entry from the --mount flag +func getDevptsMount(args []string) (spec.Mount, error) { + newMount := spec.Mount{ + Type: TypeDevpts, + Source: TypeDevpts, + } + + var setDest bool + + for _, val := range args { + kv := strings.Split(val, "=") + switch kv[0] { + case "target", "dst", "destination": + if len(kv) == 1 { + return newMount, errors.Wrapf(optionArgError, kv[0]) + } + if err := parse.ValidateVolumeCtrDir(kv[1]); err != nil { + return newMount, err + } + newMount.Destination = filepath.Clean(kv[1]) + setDest = true + default: + return newMount, errors.Wrapf(util.ErrBadMntOption, kv[0]) + } + } + + if !setDest { + return newMount, noDestError + } + + return newMount, nil +} + // Parse a single volume mount entry from the --mount flag. // Note that the volume-label option for named volumes is currently NOT supported. // TODO: add support for --volume-label |