toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

daemon: execdriver: lxc: fix wrong template value passed to lxc conf

Browse Source 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 7b4f73ee6c2a06532124e77ec5f4972f078a7d5c
Component: engine
This commit is contained in:
Antonio Murdaca
2015-09-21 21:40:46 +02:00
parent 17451ec748
commit fd7f03427f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/execdriver/lxc/lxc_template.go
+2 -2
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}}