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

Daemon: passdown the `--oom-kill-disable` option to containerd

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
 	}