Sfoglia il codice sorgente

Merge pull request #17356 from HuKeping/warn-on-oom

Warning out when disalbe oom killer but not set the memory limit
David Calavera 9 anni fa
parent
commit
aa22191093
1 ha cambiato i file con 4 aggiunte e 0 eliminazioni
  1. 4 0
      api/client/run.go

+ 4 - 0
api/client/run.go

@@ -88,6 +88,10 @@ func (cli *DockerCli) CmdRun(args ...string) error {
 		os.Exit(125)
 		os.Exit(125)
 	}
 	}
 
 
+	if 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")
+	}
+
 	if len(hostConfig.DNS) > 0 {
 	if len(hostConfig.DNS) > 0 {
 		// check the DNS settings passed via --dns against
 		// check the DNS settings passed via --dns against
 		// localhost regexp to warn if they are trying to
 		// localhost regexp to warn if they are trying to