From 82334437e0d3aa87147086281b57fbfa47649d1b Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Wed, 13 Jan 2016 10:40:49 -0800 Subject: [PATCH] Better warning message on OOM kill disable without mem limit Modify the warning to be more readable/understandable. Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) Upstream-commit: 4983e5807eb86a71f88dd83791f7a9f277bc2889 Component: engine --- components/engine/api/client/run.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/api/client/run.go b/components/engine/api/client/run.go index 1fd392c04d..3b3a1a2c77 100644 --- a/components/engine/api/client/run.go +++ b/components/engine/api/client/run.go @@ -91,7 +91,7 @@ func (cli *DockerCli) CmdRun(args ...string) error { } if hostConfig.OomKillDisable != nil && *hostConfig.OomKillDisable && hostConfig.Memory == 0 { - fmt.Fprintf(cli.err, "WARNING: Dangerous only disable the OOM Killer on containers but not set the '-m/--memory' option\n") + fmt.Fprintf(cli.err, "WARNING: Disabling the OOM killer on containers without setting a '-m/--memory' limit may be dangerous.\n") } if len(hostConfig.DNS) > 0 {