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

Merge pull request #436 from wking/remove-solaris-from-full-config 

config.md: Remove 'solaris' from full example
This commit is contained in:
Mrunal Patel 2016-05-18 10:09:59 -07:00
parent 3220f194cf a044e07006
commit 7cdb70fc35
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
config.md
View File

@ -654,29 +654,6 @@ Here is a full example `config.json` for reference.
], ],
"mountLabel": "system_u:object_r:svirt_sandbox_file_t:s0:c715,c811" "mountLabel": "system_u:object_r:svirt_sandbox_file_t:s0:c715,c811"
}, },
"solaris": {
"anet": [
{
"allowedAddress": "172.17.0.2/16",
"configureAllowedAddress": "true",
"defrouter": "172.17.0.1/16",
"linkProtection": "mac-nospoof, ip-nospoof",
"linkname": "net0",
"lowerLink": "net2",
"macAddress": "02:42:f8:52:c7:16"
}
],
"cappedCPU": {
"ncpus": "0.8"
},
"cappedMemory": {
"physical": "1G",
"swap": "512m"
},
"maxShmMemory": "256m",
"limitpriv": "default",
"milestone": "svc:/milestone/container:default"
},
"annotations": { "annotations": {
"key1": "value1", "key1": "value1",
"key2": "value2" "key2": "value2"