From c92fb4d517281033a96fa05e0f1eadb899bfe2a3 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Wed, 8 Jul 2015 09:51:10 +0800 Subject: [PATCH] Fix docs for oom-kill-disable Addresses: #14440 Signed-off-by: Qiang Huang --- docs/reference/run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/run.md b/docs/reference/run.md index b7a63440e8..c084f375f7 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -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