mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-10 21:53:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1233 from WeiZhang555/bump-runtime-spec

Browse Source 
Bump runtime-spec to v1.0.0-rc3
This commit is contained in:
Qiang Huang
2016-12-19 15:35:08 +08:00
committed by GitHub
parent 6222318e93 8eea644ccc
commit 9a1e53eafc
9 changed files with 133 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec.go
+5 -5
View File
@@ -92,7 +92,7 @@ container on your host.`,
"CAP_KILL",
"CAP_NET_BIND_SERVICE",
},
Rlimits: []specs.Rlimit{
Rlimits: []specs.LinuxRlimit{
{
Type: "RLIMIT_NOFILE",
Hard: uint64(1024),
@@ -162,15 +162,15 @@ container on your host.`,
"/proc/sys",
"/proc/sysrq-trigger",
},
Resources: &specs.Resources{
Devices: []specs.DeviceCgroup{
Resources: &specs.LinuxResources{
Devices: []specs.LinuxDeviceCgroup{
{
Allow: false,
Access: sPtr("rwm"),
},
},
},
Namespaces: []specs.Namespace{
Namespaces: []specs.LinuxNamespace{
{
Type: "pid",
},
@@ -246,7 +246,7 @@ func loadSpec(cPath string) (spec *specs.Spec, err error) {
return spec, validateProcessSpec(&spec.Process)
}
func createLibContainerRlimit(rlimit specs.Rlimit) (configs.Rlimit, error) {
func createLibContainerRlimit(rlimit specs.LinuxRlimit) (configs.Rlimit, error) {
rl, err := strToRlimit(rlimit.Type)
if err != nil {
return configs.Rlimit{}, err