Merge pull request #19308 from estesp/better-warning-msg

Better warning message on OOM kill disable without mem limit
This commit is contained in:
Arnaud Porterie 2016-01-14 16:49:38 -08:00
commit 6add477c91

View file

@ -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 {