vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Add exec rlimit support to containerd

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-03-15 11:46:47 -07:00
parent e637c1ea80
commit a4844a68a6
4 changed files with 226 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

14
api/grpc/server/server_linux.go
View file

@ -255,6 +255,13 @@ func setUserFieldsInProcess(p *types.Process, oldProc specs.ProcessSpec) {
p.ApparmorProfile = oldProc.ApparmorProfile
p.SelinuxLabel = oldProc.SelinuxLabel
p.NoNewPrivileges = oldProc.NoNewPrivileges
for _, rl := range oldProc.Rlimits {
p.Rlimits = append(p.Rlimits, &types.Rlimit{
Type: rl.Type,
Soft: rl.Soft,
Hard: rl.Hard,
})
}
}
func setPlatformRuntimeProcessSpecUserFields(r *types.AddProcessRequest, process *specs.ProcessSpec) {
@ -267,4 +274,11 @@ func setPlatformRuntimeProcessSpecUserFields(r *types.AddProcessRequest, process
process.ApparmorProfile = r.ApparmorProfile
process.SelinuxLabel = r.SelinuxLabel
process.NoNewPrivileges = r.NoNewPrivileges
for _, rl := range r.Rlimits {
process.Rlimits = append(process.Rlimits, ocs.Rlimit{
Type: rl.Type,
Soft: rl.Soft,
Hard: rl.Hard,
})
}
}