clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-05-14 18:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16466 from runcom/15876-fix-TestRunWithKernelMemory

Browse Source 
daemon: execdriver: lxc: fix wrong template value passed to lxc conf
This commit is contained in:
Tibor Vass
2015-09-21 16:34:34 -04:00
parent 0c71c19239 7b4f73ee6c
commit da82b5fedb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/execdriver/lxc/lxc_template.go
View File

@@ -96,8 +96,8 @@ lxc.cgroup.memory.soft_limit_in_bytes = {{.Resources.Memory}}
lxc.cgroup.memory.memsw.limit_in_bytes = {{$memSwap}}
{{end}}
{{end}}
{{if .Resources.KernelMemory}}
lxc.cgroup.memory.kmem.limit_in_bytes = {{.Resources.Memory}}
{{if gt .Resources.KernelMemory 0}}
lxc.cgroup.memory.kmem.limit_in_bytes = {{.Resources.KernelMemory}}
{{end}}
{{if .Resources.CPUShares}}
lxc.cgroup.cpu.shares = {{.Resources.CPUShares}}