jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

add devices for resources and DeviceCgroup
This commit is contained in:
Michael Crosby 2016-08-30 13:42:07 -07:00 committed by GitHub
parent 53917150da 60672c0b3c
commit 4a910f0711
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
schema/config-linux.json
View File

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

34
schema/defs-linux.json
View File

@ -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": { "NetworkInterfacePriority": {
"type": "object", "type": "object",
"properties": { "properties": {