Skip to content

Commit a139bb2

Browse files
authored
Merge pull request #5722 from thaJeztah/rm_oom_score_adj
remove remnants of --oom-score-adj daemon config (docs, completion)
2 parents 5be685e + 2db8859 commit a139bb2

3 files changed

Lines changed: 0 additions & 4 deletions

File tree

contrib/completion/bash/docker

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ Options:
9393
--no-new-privileges Set no-new-privileges by default for new containers
9494
--no-proxy string Comma-separated list of hosts or IP addresses for which the proxy is skipped
9595
--node-generic-resource list Advertise user-defined resource
96-
--oom-score-adjust int Set the oom_score_adj for the daemon
9796
-p, --pidfile string Path to use for daemon PID file (default "/var/run/docker.pid")
9897
--raw-logs Full timestamps without ANSI coloring
9998
--registry-mirror list Preferred registry mirror
@@ -1186,7 +1185,6 @@ The following is a full example of the allowed configuration options on Linux:
11861185
"NVIDIA-GPU=UUID1",
11871186
"NVIDIA-GPU=UUID2"
11881187
],
1189-
"oom-score-adjust": 0,
11901188
"pidfile": "",
11911189
"raw-logs": false,
11921190
"registry-mirrors": [],

0 commit comments

Comments
 (0)