Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

printServerWarningsLegacy: silence "No oom kill disable support" on cgroup v2 

The warning should be ignored on cgroup v2 hosts.

Relevant: 8086443a44

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 05ec0188fa)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Akihiro Suda 2021-05-04 18:43:18 +09:00 committed by Sebastiaan van Stijn
parent 00755d7dba
commit 12e2f94eba
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/system/info.go
View File

@ -402,7 +402,7 @@ func printServerWarningsLegacy(dockerCli command.Cli, info types.Info) {
if !info.SwapLimit { if !info.SwapLimit {
fmt.Fprintln(dockerCli.Err(), "WARNING: No swap limit support") fmt.Fprintln(dockerCli.Err(), "WARNING: No swap limit support")
} }
if !info.OomKillDisable { if !info.OomKillDisable && info.CgroupVersion != "2" {
fmt.Fprintln(dockerCli.Err(), "WARNING: No oom kill disable support") fmt.Fprintln(dockerCli.Err(), "WARNING: No oom kill disable support")
} }
if !info.CPUCfsQuota { if !info.CPUCfsQuota {