Add support for * for device name in --device

This takes care of the [issue](docker/cli#2968) from the server side Signed-off-by: Venky Natham <[email protected]>
aws-vrnatham · Dec 9, 2021 · 3b0be33 · 3b0be33
1 parent d456264
commit 3b0be33
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/oci/devices_linux.go b/oci/devices_linux.go
@@ -38,6 +38,26 @@ func deviceCgroup(d *devices.Device) specs.LinuxDeviceCgroup {
 func DevicesFromPath(pathOnHost, pathInContainer, cgroupPermissions string) (devs []specs.LinuxDevice, devPermissions []specs.LinuxDeviceCgroup, err error) {
 	resolvedPathOnHost := pathOnHost
 
+	// Only wildcard * is supported
+	if strings.HasSuffix(resolvedPathOnHost, "*") {
+		devicePaths, _ := filepath.Glob(resolvedPathOnHost)
+		var err error
+		var dev *devices.Device
+		for _, devicePath := range devicePaths {
+			dev, err = devices.DeviceFromPath(devicePath, cgroupPermissions)
+			if err != nil {
+				return nil, nil, fmt.Errorf("no device %q %s", devicePath, err)
+			}
+			devs = append(devs, Device(dev))
+			devPermissions = append(devPermissions, deviceCgroup(dev))
+		}
+		if len(devs) > 0 {
+			return devs, devPermissions, nil
+		} else {
+			return devs, devPermissions, fmt.Errorf("error gathering device information while adding custom device %q: %s", pathOnHost, err)
+		}
+	}
+
 	// check if it is a symbolic link
 	if src, e := os.Lstat(pathOnHost); e == nil && src.Mode()&os.ModeSymlink == os.ModeSymlink {
 		if linkedPathOnHost, e := filepath.EvalSymlinks(pathOnHost); e == nil {

diff --git a/vendor/github.com/containerd/containerd/oci/utils_unix.go b/vendor/github.com/containerd/containerd/oci/utils_unix.go