Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

{WIP}Add support for * for device name in --device 

This is still Work in Progress
Currently for --device we support /dev/xyz1 and if there
are 0 such devices, then user has to have --device for each one.
Instead with this change in allows --device=/dev/xyz*

Signed-off-by: Venky Natham <vrnatham@amazon.com>
This commit is contained in:
Venky Natham 2021-02-22 14:08:46 -08:00
parent 70a00157f1
commit 030f286d2d
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cli/command/container/opts.go
View File

@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"path" "path"
"path/filepath"
"reflect" "reflect"
"regexp" "regexp"
"strconv" "strconv"
@ -435,18 +436,18 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con
for _, device := range copts.devices.GetAll() { for _, device := range copts.devices.GetAll() {
var ( var (
validated string validated string
deviceMapping container.DeviceMapping parsedDeviceMappings []container.DeviceMapping
err error err error
) )
validated, err = validateDevice(device, serverOS) validated, err = validateDevice(device, serverOS)
if err != nil { if err != nil {
return nil, err return nil, err
} }
deviceMapping, err = parseDevice(validated, serverOS) parsedDeviceMappings, err = parseDevice(validated, serverOS)
if err != nil { if err != nil {
return nil, err return nil, err
} }
deviceMappings = append(deviceMappings, deviceMapping) deviceMappings = append(deviceMappings, parsedDeviceMappings...)
} }
// collect all the environment variables for the container // collect all the environment variables for the container
@ -897,19 +898,21 @@ func parseStorageOpts(storageOpts []string) (map[string]string, error) {
} }
// parseDevice parses a device mapping string to a container.DeviceMapping struct // parseDevice parses a device mapping string to a container.DeviceMapping struct
func parseDevice(device, serverOS string) (container.DeviceMapping, error) { func parseDevice(device, serverOS string) ([]container.DeviceMapping, error) {
var deviceMappings []container.DeviceMapping
switch serverOS { switch serverOS {
case "linux": case "linux":
return parseLinuxDevice(device) return parseLinuxDevice(device)
case "windows": case "windows":
return parseWindowsDevice(device) return parseWindowsDevice(device)
} }
return container.DeviceMapping{}, errors.Errorf("unknown server OS: %s", serverOS) return append(deviceMappings, container.DeviceMapping{}), errors.Errorf("unknown server OS: %s", serverOS)
} }
// parseLinuxDevice parses a device mapping string to a container.DeviceMapping struct // parseLinuxDevice parses a device mapping string to a container.DeviceMapping struct
// knowing that the target is a Linux daemon // knowing that the target is a Linux daemon
func parseLinuxDevice(device string) (container.DeviceMapping, error) { func parseLinuxDevice(device string) ([]container.DeviceMapping, error) {
var deviceMappings []container.DeviceMapping
src := "" src := ""
dst := "" dst := ""
permissions := "rwm" permissions := "rwm"
@ -927,10 +930,27 @@ func parseLinuxDevice(device string) (container.DeviceMapping, error) {
fallthrough fallthrough
case 1: case 1:
src = arr[0] src = arr[0]
if strings.HasSuffix(src, "*") {
if dst != "" {
return deviceMappings, errors.Errorf("device with * suffix can't have dst: %s", device)
}
}
default: default:
return container.DeviceMapping{}, errors.Errorf("invalid device specification: %s", device) return deviceMappings, errors.Errorf("invalid device specification: %s", device)
} }
if strings.HasSuffix(src, "*") {
devicePaths, _ := filepath.Glob(src)
for _, devicePath := range devicePaths {
deviceMapping := container.DeviceMapping{
PathOnHost: devicePath,
PathInContainer: devicePath,
CgroupPermissions: permissions,
}
deviceMappings = append(deviceMappings, deviceMapping)
}
} else {
if dst == "" { if dst == "" {
dst = src dst = src
} }
@ -940,13 +960,16 @@ func parseLinuxDevice(device string) (container.DeviceMapping, error) {
PathInContainer: dst, PathInContainer: dst,
CgroupPermissions: permissions, CgroupPermissions: permissions,
} }
return deviceMapping, nil deviceMappings = append(deviceMappings, deviceMapping)
}
return deviceMappings, nil
} }
// parseWindowsDevice parses a device mapping string to a container.DeviceMapping struct // parseWindowsDevice parses a device mapping string to a container.DeviceMapping struct
// knowing that the target is a Windows daemon // knowing that the target is a Windows daemon
func parseWindowsDevice(device string) (container.DeviceMapping, error) { func parseWindowsDevice(device string) ([]container.DeviceMapping, error) {
return container.DeviceMapping{PathOnHost: device}, nil var deviceMappings []container.DeviceMapping
return append(deviceMappings, container.DeviceMapping{PathOnHost: device}), nil
} }
// validateDeviceCgroupRule validates a device cgroup rule string format // validateDeviceCgroupRule validates a device cgroup rule string format