mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
api/docs: remove KernelMemory option from old API versions
This option is no longer supported by runc, and is deprecated in the kernel. We removed support for this feature from all API versions, so it's better to also amend the docs for older API versions. [kernel v5.4]: https://github.com/torvalds/linux/commit/0158115f702b0ba208ab0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
@@ -310,7 +310,6 @@ Create a container
|
||||
"Memory": 0,
|
||||
"MemorySwap": 0,
|
||||
"MemoryReservation": 0,
|
||||
"KernelMemory": 0,
|
||||
"CpuPercent": 80,
|
||||
"CpuShares": 512,
|
||||
"CpuPeriod": 100000,
|
||||
@@ -438,7 +437,6 @@ Create a container
|
||||
- **MemorySwap** - Total memory limit (memory + swap); set `-1` to enable unlimited swap.
|
||||
You must use this with `memory` and make the swap value larger than `memory`.
|
||||
- **MemoryReservation** - Memory soft limit in bytes.
|
||||
- **KernelMemory** - Kernel memory limit in bytes.
|
||||
- **CpuPercent** - An integer value containing the usable percentage of the available CPUs. (Windows daemon only)
|
||||
- **CpuShares** - An integer value containing the container's CPU Shares
|
||||
(ie. the relative weight vs other containers).
|
||||
@@ -627,7 +625,6 @@ Return low-level information on the container `id`
|
||||
"Memory": 0,
|
||||
"MemorySwap": 0,
|
||||
"MemoryReservation": 0,
|
||||
"KernelMemory": 0,
|
||||
"OomKillDisable": false,
|
||||
"OomScoreAdj": 500,
|
||||
"NetworkMode": "bridge",
|
||||
@@ -1197,7 +1194,6 @@ Update configuration of one or more containers.
|
||||
"Memory": 314572800,
|
||||
"MemorySwap": 514288000,
|
||||
"MemoryReservation": 209715200,
|
||||
"KernelMemory": 52428800,
|
||||
"RestartPolicy": {
|
||||
"MaximumRetryCount": 4,
|
||||
"Name": "on-failure"
|
||||
|
||||
@@ -432,10 +432,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -2717,7 +2713,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -3017,7 +3012,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
@@ -3698,7 +3692,6 @@ paths:
|
||||
Memory: 314572800
|
||||
MemorySwap: 514288000
|
||||
MemoryReservation: 209715200
|
||||
KernelMemory: 52428800
|
||||
RestartPolicy:
|
||||
MaximumRetryCount: 4
|
||||
Name: "on-failure"
|
||||
@@ -5105,7 +5098,6 @@ paths:
|
||||
IndexServerAddress: "https://index.docker.io/v1/"
|
||||
InitPath: "/usr/bin/docker"
|
||||
InitSha1: ""
|
||||
KernelMemory: true
|
||||
KernelVersion: "3.12.0-1-amd64"
|
||||
Labels:
|
||||
- "storage=ssd"
|
||||
|
||||
@@ -432,10 +432,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -2721,7 +2717,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
|
||||
@@ -434,10 +434,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -2780,7 +2776,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -3080,7 +3075,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
|
||||
@@ -440,10 +440,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -2869,7 +2865,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -3169,7 +3164,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
@@ -3860,7 +3854,6 @@ paths:
|
||||
Memory: 314572800
|
||||
MemorySwap: 514288000
|
||||
MemoryReservation: 209715200
|
||||
KernelMemory: 52428800
|
||||
RestartPolicy:
|
||||
MaximumRetryCount: 4
|
||||
Name: "on-failure"
|
||||
@@ -5292,7 +5285,6 @@ paths:
|
||||
IndexServerAddress: "https://index.docker.io/v1/"
|
||||
InitPath: "/usr/bin/docker"
|
||||
InitSha1: ""
|
||||
KernelMemory: true
|
||||
KernelVersion: "3.12.0-1-amd64"
|
||||
Labels:
|
||||
- "storage=ssd"
|
||||
|
||||
@@ -443,10 +443,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -2902,7 +2898,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -3202,7 +3197,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
@@ -3893,7 +3887,6 @@ paths:
|
||||
Memory: 314572800
|
||||
MemorySwap: 514288000
|
||||
MemoryReservation: 209715200
|
||||
KernelMemory: 52428800
|
||||
RestartPolicy:
|
||||
MaximumRetryCount: 4
|
||||
Name: "on-failure"
|
||||
@@ -5325,7 +5318,6 @@ paths:
|
||||
IndexServerAddress: "https://index.docker.io/v1/"
|
||||
InitPath: "/usr/bin/docker"
|
||||
InitSha1: ""
|
||||
KernelMemory: true
|
||||
KernelVersion: "3.12.0-1-amd64"
|
||||
Labels:
|
||||
- "storage=ssd"
|
||||
|
||||
@@ -445,10 +445,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -3115,7 +3111,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
|
||||
@@ -445,10 +445,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -3188,7 +3184,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
|
||||
@@ -449,10 +449,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -3523,10 +3519,6 @@ definitions:
|
||||
description: "Indicates if the host has memory swap limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
KernelMemory:
|
||||
description: "Indicates if the host has kernel memory limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
CpuCfsPeriod:
|
||||
description: "Indicates if CPU CFS(Completely Fair Scheduler) period is supported by the host."
|
||||
type: "boolean"
|
||||
@@ -4400,7 +4392,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -4708,7 +4699,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
@@ -5397,7 +5387,6 @@ paths:
|
||||
Memory: 314572800
|
||||
MemorySwap: 514288000
|
||||
MemoryReservation: 209715200
|
||||
KernelMemory: 52428800
|
||||
RestartPolicy:
|
||||
MaximumRetryCount: 4
|
||||
Name: "on-failure"
|
||||
|
||||
@@ -453,10 +453,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -3527,10 +3523,6 @@ definitions:
|
||||
description: "Indicates if the host has memory swap limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
KernelMemory:
|
||||
description: "Indicates if the host has kernel memory limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
CpuCfsPeriod:
|
||||
description: "Indicates if CPU CFS(Completely Fair Scheduler) period is supported by the host."
|
||||
type: "boolean"
|
||||
@@ -4404,7 +4396,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -4712,7 +4703,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
@@ -5401,7 +5391,6 @@ paths:
|
||||
Memory: 314572800
|
||||
MemorySwap: 514288000
|
||||
MemoryReservation: 209715200
|
||||
KernelMemory: 52428800
|
||||
RestartPolicy:
|
||||
MaximumRetryCount: 4
|
||||
Name: "on-failure"
|
||||
|
||||
@@ -455,10 +455,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -3555,10 +3551,6 @@ definitions:
|
||||
description: "Indicates if the host has memory swap limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
KernelMemory:
|
||||
description: "Indicates if the host has kernel memory limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
CpuCfsPeriod:
|
||||
description: "Indicates if CPU CFS(Completely Fair Scheduler) period is supported by the host."
|
||||
type: "boolean"
|
||||
@@ -4432,7 +4424,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -4740,7 +4731,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
@@ -5429,7 +5419,6 @@ paths:
|
||||
Memory: 314572800
|
||||
MemorySwap: 514288000
|
||||
MemoryReservation: 209715200
|
||||
KernelMemory: 52428800
|
||||
RestartPolicy:
|
||||
MaximumRetryCount: 4
|
||||
Name: "on-failure"
|
||||
|
||||
@@ -466,10 +466,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -3559,10 +3555,6 @@ definitions:
|
||||
description: "Indicates if the host has memory swap limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
KernelMemory:
|
||||
description: "Indicates if the host has kernel memory limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
CpuCfsPeriod:
|
||||
description: "Indicates if CPU CFS(Completely Fair Scheduler) period is supported by the host."
|
||||
type: "boolean"
|
||||
@@ -4436,7 +4428,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -4744,7 +4735,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
@@ -5438,7 +5428,6 @@ paths:
|
||||
Memory: 314572800
|
||||
MemorySwap: 514288000
|
||||
MemoryReservation: 209715200
|
||||
KernelMemory: 52428800
|
||||
RestartPolicy:
|
||||
MaximumRetryCount: 4
|
||||
Name: "on-failure"
|
||||
|
||||
@@ -467,10 +467,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -3646,10 +3642,6 @@ definitions:
|
||||
description: "Indicates if the host has memory swap limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
KernelMemory:
|
||||
description: "Indicates if the host has kernel memory limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
CpuCfsPeriod:
|
||||
description: "Indicates if CPU CFS(Completely Fair Scheduler) period is supported by the host."
|
||||
type: "boolean"
|
||||
@@ -4523,7 +4515,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -4841,7 +4832,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
@@ -5548,7 +5538,6 @@ paths:
|
||||
Memory: 314572800
|
||||
MemorySwap: 514288000
|
||||
MemoryReservation: 209715200
|
||||
KernelMemory: 52428800
|
||||
RestartPolicy:
|
||||
MaximumRetryCount: 4
|
||||
Name: "on-failure"
|
||||
|
||||
@@ -530,11 +530,6 @@ definitions:
|
||||
description: "Disk limit (in bytes)."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
KernelMemory:
|
||||
description: "Kernel memory limit in bytes."
|
||||
type: "integer"
|
||||
format: "int64"
|
||||
example: 209715200
|
||||
MemoryReservation:
|
||||
description: "Memory soft limit in bytes."
|
||||
type: "integer"
|
||||
@@ -4894,10 +4889,6 @@ definitions:
|
||||
description: "Indicates if the host has memory swap limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
KernelMemory:
|
||||
description: "Indicates if the host has kernel memory limit support enabled."
|
||||
type: "boolean"
|
||||
example: true
|
||||
CpuCfsPeriod:
|
||||
description: |
|
||||
Indicates if CPU CFS(Completely Fair Scheduler) period is supported by
|
||||
@@ -5828,7 +5819,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
NanoCpus: 500000
|
||||
CpuPercent: 80
|
||||
CpuShares: 512
|
||||
@@ -6102,7 +6092,6 @@ paths:
|
||||
Memory: 0
|
||||
MemorySwap: 0
|
||||
MemoryReservation: 0
|
||||
KernelMemory: 0
|
||||
OomKillDisable: false
|
||||
OomScoreAdj: 500
|
||||
NetworkMode: "bridge"
|
||||
@@ -6840,7 +6829,6 @@ paths:
|
||||
Memory: 314572800
|
||||
MemorySwap: 514288000
|
||||
MemoryReservation: 209715200
|
||||
KernelMemory: 52428800
|
||||
RestartPolicy:
|
||||
MaximumRetryCount: 4
|
||||
Name: "on-failure"
|
||||
|
||||
Reference in New Issue
Block a user