Merge pull request #36201 from arm64b/oom-kill-disable-fixing

Daemon: passdown the `--oom-kill-disable` option to containerd Upstream-commit: 2e8ccbb49e21b8696ad4c39185036a8b7e50402f Component: engine
2018-02-06 21:39:43 -08:00
parent 9e9ebf27ff fa06c65a30
commit 0919d8f13e
1 changed files with 4 additions and 0 deletions
--- a/components/engine/daemon/daemon_unix.go
+++ b/components/engine/daemon/daemon_unix.go
@ -103,6 +103,10 @@ func getMemoryResources(config containertypes.Resources) *specs.LinuxMemory {
 		memory.Swappiness = &swappiness
 	}

+	if config.OomKillDisable != nil {
+		memory.DisableOOMKiller = config.OomKillDisable
+	}
+
 	if config.KernelMemory != 0 {
 		memory.Kernel = &config.KernelMemory
 	}