Fix docs for oom-kill-disable

Addresses: #14440

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c92fb4d517281033a96fa05e0f1eadb899bfe2a3
Component: engine
This commit is contained in:
Qiang Huang
2015-07-08 09:51:10 +08:00
parent 78101e16cc
commit 5353b0d726
+1 -1
View File
@@ -590,7 +590,7 @@ would be 2*300M, so processes can use 300M swap memory as well.
We set both memory and swap memory, so the processes in the container can use
300M memory and 700M swap memory.
By default, Docker kills processes in a container if an out-of-memory (OOM)
By default, kernel kills processes in a container if an out-of-memory (OOM)
error occurs. To change this behaviour, use the `--oom-kill-disable` option.
Only disable the OOM killer on containers where you have also set the
`-m/--memory` option. If the `-m` flag is not set, this can result in the host