diff --git a/docs/deprecated.md b/docs/deprecated.md index 147911e9b8..76883a4f4a 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -50,6 +50,7 @@ The table below provides an overview of the current status of deprecated feature Status | Feature | Deprecated | Remove -----------|------------------------------------------------------------------------------------------------------------------------------------|------------|------------ +Deprecated | [Kernel memory limit](#kernel-memory-limit) | v20.03.0 | - Deprecated | [Classic Swarm and overlay networks using external key/value stores](#classic-swarm-and-overlay-networks-using-cluster-store) | v20.03.0 | - Deprecated | [CLI plugins support](#cli-plugins-support) | v20.03.0 | - Deprecated | [Pushing and pulling with image manifest v2 schema 1](#pushing-and-pulling-with-image-manifest-v2-schema-1) | v19.03.0 | v20.03.0 @@ -89,6 +90,13 @@ Removed | [`--api-enable-cors` flag on `dockerd`](#--api-enable-cors-flag-on- Removed | [`--run` flag on `docker commit`](#--run-flag-on-docker-commit) | v0.10.0 | v1.13.0 Removed | [Three arguments form in `docker import`](#three-arguments-form-in-docker-import) | v0.6.7 | v1.12.0 +### Kernel memory limit + +**Deprecated in Release: v20.03.0** + +Specifying kernel memory limit (`docker run --kernel-memory`) is now marked as deprecated, +as [Linux kernel deprecated `kmem.limit_in_bytes` in v5.4](https://github.com/torvalds/linux/commit/0158115f702b0ba208ab0b5adf44cae99b3ebcc7). + ### Classic Swarm and overlay networks using cluster store **Deprecated in Release: v20.03.0** diff --git a/docs/reference/commandline/update.md b/docs/reference/commandline/update.md index 7edeeb7fd7..a80d91b375 100644 --- a/docs/reference/commandline/update.md +++ b/docs/reference/commandline/update.md @@ -79,6 +79,10 @@ running container only if the container was started with `--kernel-memory`. If the container was started *without* `--kernel-memory` you need to stop the container before updating kernel memory. +> **Note** +> +> The `--kernel-memory` option has been deprecated since Docker 20.03. + For example, if you started a container with this command: ```bash diff --git a/man/src/container/update.md b/man/src/container/update.md index 26ee4e3216..d89180a343 100644 --- a/man/src/container/update.md +++ b/man/src/container/update.md @@ -60,6 +60,8 @@ running container only if the container was started with **--kernel-memory**. If the container was started *without* **--kernel-memory** you need to stop the container before updating kernel memory. +NOTE: The **--kernel-memory** option has been deprecated since Docker 20.03. + For example, if you started a container with this command: ```bash