Skip to content

Commit 0d27375

Browse files
authoredJan 3, 2025
Merge pull request #5723 from thaJeztah/27.x_backport_rm_oom_score_adj
[27.x backport] remove remnants of --oom-score-adj daemon config (docs, completion)
2 parents 498a416 + f068c14 commit 0d27375

File tree

3 files changed

+0
-4
lines changed

3 files changed

+0
-4
lines changed
 

‎contrib/completion/bash/docker

-1
Original file line numberDiff line numberDiff line change
@@ -2591,7 +2591,6 @@ _docker_daemon() {
25912591
--mtu
25922592
--network-control-plane-mtu
25932593
--node-generic-resource
2594-
--oom-score-adjust
25952594
--pidfile -p
25962595
--registry-mirror
25972596
--seccomp-profile

‎contrib/completion/zsh/_docker

-1
Original file line numberDiff line numberDiff line change
@@ -2770,7 +2770,6 @@ __docker_subcommand() {
27702770
"($help)--max-concurrent-uploads[Set the max concurrent uploads]" \
27712771
"($help)--max-download-attempts[Set the max download attempts for each pull]" \
27722772
"($help)--mtu=[Network MTU]:mtu:(0 576 1420 1500 9000)" \
2773-
"($help)--oom-score-adjust=[Set the oom_score_adj for the daemon]:oom-score:(-500)" \
27742773
"($help -p --pidfile)"{-p=,--pidfile=}"[Path to use for daemon PID file]:PID file:_files" \
27752774
"($help)--raw-logs[Full timestamps without ANSI coloring]" \
27762775
"($help)*--registry-mirror=[Preferred registry mirror]:registry mirror: " \

‎docs/reference/dockerd.md

-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ Options:
9292
--no-new-privileges Set no-new-privileges by default for new containers
9393
--no-proxy string Comma-separated list of hosts or IP addresses for which the proxy is skipped
9494
--node-generic-resource list Advertise user-defined resource
95-
--oom-score-adjust int Set the oom_score_adj for the daemon
9695
-p, --pidfile string Path to use for daemon PID file (default "/var/run/docker.pid")
9796
--raw-logs Full timestamps without ANSI coloring
9897
--registry-mirror list Preferred registry mirror
@@ -1172,7 +1171,6 @@ The following is a full example of the allowed configuration options on Linux:
11721171
"NVIDIA-GPU=UUID1",
11731172
"NVIDIA-GPU=UUID2"
11741173
],
1175-
"oom-score-adjust": 0,
11761174
"pidfile": "",
11771175
"raw-logs": false,
11781176
"registry-mirrors": [],

0 commit comments

Comments
 (0)
Please sign in to comment.