From 5d973da95b9e809638111f8054d335a7e54874e5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 3 Jan 2025 20:20:47 +0100 Subject: [PATCH 1/2] docs: dockerd: --oom-score-adj flag This flag was deprecated in docker v24.0, and no longer functional since v25.0; fully removed in v26.0, so we can remove the docs for this. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit eb5c507cd18fceb282c650404d6bdec715ca8178) Signed-off-by: Sebastiaan van Stijn --- docs/reference/dockerd.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/reference/dockerd.md b/docs/reference/dockerd.md index ae6eb2fee3..523eb82f13 100644 --- a/docs/reference/dockerd.md +++ b/docs/reference/dockerd.md @@ -92,7 +92,6 @@ Options: --no-new-privileges Set no-new-privileges by default for new containers --no-proxy string Comma-separated list of hosts or IP addresses for which the proxy is skipped --node-generic-resource list Advertise user-defined resource - --oom-score-adjust int Set the oom_score_adj for the daemon -p, --pidfile string Path to use for daemon PID file (default "/var/run/docker.pid") --raw-logs Full timestamps without ANSI coloring --registry-mirror list Preferred registry mirror @@ -1172,7 +1171,6 @@ The following is a full example of the allowed configuration options on Linux: "NVIDIA-GPU=UUID1", "NVIDIA-GPU=UUID2" ], - "oom-score-adjust": 0, "pidfile": "", "raw-logs": false, "registry-mirrors": [], From f068c14063f9c97ae03121d8f546198c959bfff7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 3 Jan 2025 20:21:30 +0100 Subject: [PATCH 2/2] contrib/completion: remove --oom-score-adj daemon flag This flag was deprecated in docker v24.0, and no longer functional since v25.0; fully removed in v26.0, so we can remove the docs for this. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 2db88599fd07d4dceb2e98c84ff093e346581645) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 1 - contrib/completion/zsh/_docker | 1 - 2 files changed, 2 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 903ddc6d7a..08c6f0a542 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -2591,7 +2591,6 @@ _docker_daemon() { --mtu --network-control-plane-mtu --node-generic-resource - --oom-score-adjust --pidfile -p --registry-mirror --seccomp-profile diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 4236c225e3..333e981c25 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -2770,7 +2770,6 @@ __docker_subcommand() { "($help)--max-concurrent-uploads[Set the max concurrent uploads]" \ "($help)--max-download-attempts[Set the max download attempts for each pull]" \ "($help)--mtu=[Network MTU]:mtu:(0 576 1420 1500 9000)" \ - "($help)--oom-score-adjust=[Set the oom_score_adj for the daemon]:oom-score:(-500)" \ "($help -p --pidfile)"{-p=,--pidfile=}"[Path to use for daemon PID file]:PID file:_files" \ "($help)--raw-logs[Full timestamps without ANSI coloring]" \ "($help)*--registry-mirror=[Preferred registry mirror]:registry mirror: " \