Merge pull request opencontainers#550 from Mashimiao/add-devicecgroup-and-devices

add devices for resources and DeviceCgroup

Author: Michael Crosby

schema/config-linux.json

@@ -61,6 +61,20 @@
                 "id": "https://opencontainers.org/schema/bundle/linux/resources",
                 "type": "object",
                 "properties": {
+                    "devices": {
+                        "id": "https://opencontainers.org/schema/bundle/linux/resources/devices",
+                        "oneOf": [
+                            {
+                                "type": "array",
+                                "items": {
+                                    "$ref": "defs-linux.json#/definitions/DeviceCgroup"
+                                }
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
                     "oomScoreAdj": {
                         "id": "https://opencontainers.org/schema/bundle/linux/resources/oomScoreAdj",
                         "type": "integer",

schema/defs-linux.json

@@ -217,6 +217,40 @@
                 }
             ]
         },
+        "DeviceCgroup": {
+            "type": "object",
+            "properties": {
+                "allow": {
+                    "type": "boolean"
+                },
+                "type": {
+                    "$ref": "defs.json#/definitions/stringPointer"
+                },
+                "major": {
+                    "oneOf": [
+                        {
+                            "$ref": "#/definitions/Major"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ]
+                },
+                "minor": {
+                    "oneOf": [
+                        {
+                            "$ref": "#/definitions/Minor"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ]
+                },
+                "access": {
+                    "$ref": "defs.json#/definitions/stringPointer"
+                }
+            }
+        },
         "NetworkInterfacePriority": {
             "type": "object",
             "properties": {