From 49a7d75a22fc19235fa77d3936d02b2578e5ddc1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 7 Apr 2022 14:22:30 +0200 Subject: [PATCH 1/7] docs: reformat table for compatibility My IDE's linter kept complaining: > For compatibility reasons all table rows should have borders (pipe > symbols) at the start and at the end. Signed-off-by: Sebastiaan van Stijn --- docs/deprecated.md | 104 ++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/docs/deprecated.md b/docs/deprecated.md index 2808035d85..8c0d574e01 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -48,58 +48,58 @@ The table below provides an overview of the current status of deprecated feature alternatives. In such cases, a warning may be printed, and users should not rely on this feature. -Status | Feature | Deprecated | Remove ------------|------------------------------------------------------------------------------------------------------------------------------------|------------|------------ -Deprecated | [Legacy builder for Linux images](#legacy-builder-for-linux-images) | v22.04 | - -Deprecated | [Legacy builder fallback](#legacy-builder-fallback) | v22.04 | - -Removed | [Support for encrypted TLS private keys](#support-for-encrypted-tls-private-keys) | v20.10 | v22.04 -Removed | [Kubernetes stack and context support](#kubernetes-stack-and-context-support) | v20.10 | v22.04 -Deprecated | [Pulling images from non-compliant image registries](#pulling-images-from-non-compliant-image-registries) | v20.10 | - -Removed | [Linux containers on Windows (LCOW)](#linux-containers-on-windows-lcow-experimental) | v20.10 | v22.04 -Deprecated | [BLKIO weight options with cgroups v1](#blkio-weight-options-with-cgroups-v1) | v20.10 | - -Deprecated | [Kernel memory limit](#kernel-memory-limit) | v20.10 | - -Deprecated | [Classic Swarm and overlay networks using external key/value stores](#classic-swarm-and-overlay-networks-using-cluster-store) | v20.10 | - -Removed | [Support for the legacy `~/.dockercfg` configuration file for authentication](#support-for-legacy-dockercfg-configuration-files) | v20.10 | v22.04 -Deprecated | [CLI plugins support](#cli-plugins-support) | v20.10 | - -Deprecated | [Dockerfile legacy `ENV name value` syntax](#dockerfile-legacy-env-name-value-syntax) | v20.10 | - -Removed | [`docker build --stream` flag (experimental)](#docker-build---stream-flag-experimental) | v20.10 | v20.10 -Deprecated | [Configuration options for experimental CLI features](#configuration-options-for-experimental-cli-features) | v19.03 | v20.10 -Deprecated | [Pushing and pulling with image manifest v2 schema 1](#pushing-and-pulling-with-image-manifest-v2-schema-1) | v19.03 | v20.10 -Removed | [`docker engine` subcommands](#docker-engine-subcommands) | v19.03 | v20.10 -Removed | [Top-level `docker deploy` subcommand (experimental)](#top-level-docker-deploy-subcommand-experimental) | v19.03 | v20.10 -Removed | [`docker stack deploy` using "dab" files (experimental)](#docker-stack-deploy-using-dab-files-experimental) | v19.03 | v20.10 -Deprecated | [AuFS storage driver](#aufs-storage-driver) | v19.03 | - -Deprecated | [Legacy "overlay" storage driver](#legacy-overlay-storage-driver) | v18.09 | - -Deprecated | [Device mapper storage driver](#device-mapper-storage-driver) | v18.09 | - -Removed | [Use of reserved namespaces in engine labels](#use-of-reserved-namespaces-in-engine-labels) | v18.06 | v20.10 -Removed | [`--disable-legacy-registry` override daemon option](#--disable-legacy-registry-override-daemon-option) | v17.12 | v19.03 -Removed | [Interacting with V1 registries](#interacting-with-v1-registries) | v17.06 | v17.12 -Removed | [Asynchronous `service create` and `service update` as default](#asynchronous-service-create-and-service-update-as-default) | v17.05 | v17.10 -Removed | [`-g` and `--graph` flags on `dockerd`](#-g-and---graph-flags-on-dockerd) | v17.05 | - -Deprecated | [Top-level network properties in NetworkSettings](#top-level-network-properties-in-networksettings) | v1.13 | v17.12 -Removed | [`filter` param for `/images/json` endpoint](#filter-param-for-imagesjson-endpoint) | v1.13 | v20.10 -Removed | [`repository:shortid` image references](#repositoryshortid-image-references) | v1.13 | v17.12 -Removed | [`docker daemon` subcommand](#docker-daemon-subcommand) | v1.13 | v17.12 -Removed | [Duplicate keys with conflicting values in engine labels](#duplicate-keys-with-conflicting-values-in-engine-labels) | v1.13 | v17.12 -Deprecated | [`MAINTAINER` in Dockerfile](#maintainer-in-dockerfile) | v1.13 | - -Deprecated | [API calls without a version](#api-calls-without-a-version) | v1.13 | v17.12 -Removed | [Backing filesystem without `d_type` support for overlay/overlay2](#backing-filesystem-without-d_type-support-for-overlayoverlay2) | v1.13 | v17.12 -Removed | [`--automated` and `--stars` flags on `docker search`](#--automated-and---stars-flags-on-docker-search) | v1.12 | v20.10 -Deprecated | [`-h` shorthand for `--help`](#-h-shorthand-for---help) | v1.12 | v17.09 -Removed | [`-e` and `--email` flags on `docker login`](#-e-and---email-flags-on-docker-login) | v1.11 | v17.06 -Deprecated | [Separator (`:`) of `--security-opt` flag on `docker run`](#separator--of---security-opt-flag-on-docker-run) | v1.11 | v17.06 -Deprecated | [Ambiguous event fields in API](#ambiguous-event-fields-in-api) | v1.10 | - -Removed | [`-f` flag on `docker tag`](#-f-flag-on-docker-tag) | v1.10 | v1.12 -Removed | [HostConfig at API container start](#hostconfig-at-api-container-start) | v1.10 | v1.12 -Removed | [`--before` and `--since` flags on `docker ps`](#--before-and---since-flags-on-docker-ps) | v1.10 | v1.12 -Removed | [Driver-specific log tags](#driver-specific-log-tags) | v1.9 | v1.12 -Removed | [Docker Content Trust `ENV` passphrase variables name change](#docker-content-trust-env-passphrase-variables-name-change) | v1.9 | v1.12 -Removed | [`/containers/(id or name)/copy` endpoint](#containersid-or-namecopy-endpoint) | v1.8 | v1.12 -Removed | [LXC built-in exec driver](#lxc-built-in-exec-driver) | v1.8 | v1.10 -Removed | [Old Command Line Options](#old-command-line-options) | v1.8 | v1.10 -Removed | [`--api-enable-cors` flag on `dockerd`](#--api-enable-cors-flag-on-dockerd) | v1.6 | v17.09 -Removed | [`--run` flag on `docker commit`](#--run-flag-on-docker-commit) | v0.10 | v1.13 -Removed | [Three arguments form in `docker import`](#three-arguments-form-in-docker-import) | v0.6.7 | v1.12 +| Status | Feature | Deprecated | Remove | +|------------|------------------------------------------------------------------------------------------------------------------------------------|------------|--------| +| Deprecated | [Legacy builder for Linux images](#legacy-builder-for-linux-images) | v22.04 | - | +| Deprecated | [Legacy builder fallback](#legacy-builder-fallback) | v22.04 | - | +| Removed | [Support for encrypted TLS private keys](#support-for-encrypted-tls-private-keys) | v20.10 | v22.04 | +| Removed | [Kubernetes stack and context support](#kubernetes-stack-and-context-support) | v20.10 | v22.04 | +| Deprecated | [Pulling images from non-compliant image registries](#pulling-images-from-non-compliant-image-registries) | v20.10 | - | +| Removed | [Linux containers on Windows (LCOW)](#linux-containers-on-windows-lcow-experimental) | v20.10 | v22.04 | +| Deprecated | [BLKIO weight options with cgroups v1](#blkio-weight-options-with-cgroups-v1) | v20.10 | - | +| Deprecated | [Kernel memory limit](#kernel-memory-limit) | v20.10 | - | +| Deprecated | [Classic Swarm and overlay networks using external key/value stores](#classic-swarm-and-overlay-networks-using-cluster-store) | v20.10 | - | +| Removed | [Support for the legacy `~/.dockercfg` configuration file for authentication](#support-for-legacy-dockercfg-configuration-files) | v20.10 | v22.04 | +| Deprecated | [CLI plugins support](#cli-plugins-support) | v20.10 | - | +| Deprecated | [Dockerfile legacy `ENV name value` syntax](#dockerfile-legacy-env-name-value-syntax) | v20.10 | - | +| Removed | [`docker build --stream` flag (experimental)](#docker-build---stream-flag-experimental) | v20.10 | v20.10 | +| Deprecated | [Configuration options for experimental CLI features](#configuration-options-for-experimental-cli-features) | v19.03 | v20.10 | +| Deprecated | [Pushing and pulling with image manifest v2 schema 1](#pushing-and-pulling-with-image-manifest-v2-schema-1) | v19.03 | v20.10 | +| Removed | [`docker engine` subcommands](#docker-engine-subcommands) | v19.03 | v20.10 | +| Removed | [Top-level `docker deploy` subcommand (experimental)](#top-level-docker-deploy-subcommand-experimental) | v19.03 | v20.10 | +| Removed | [`docker stack deploy` using "dab" files (experimental)](#docker-stack-deploy-using-dab-files-experimental) | v19.03 | v20.10 | +| Deprecated | [AuFS storage driver](#aufs-storage-driver) | v19.03 | - | +| Deprecated | [Legacy "overlay" storage driver](#legacy-overlay-storage-driver) | v18.09 | - | +| Deprecated | [Device mapper storage driver](#device-mapper-storage-driver) | v18.09 | - | +| Removed | [Use of reserved namespaces in engine labels](#use-of-reserved-namespaces-in-engine-labels) | v18.06 | v20.10 | +| Removed | [`--disable-legacy-registry` override daemon option](#--disable-legacy-registry-override-daemon-option) | v17.12 | v19.03 | +| Removed | [Interacting with V1 registries](#interacting-with-v1-registries) | v17.06 | v17.12 | +| Removed | [Asynchronous `service create` and `service update` as default](#asynchronous-service-create-and-service-update-as-default) | v17.05 | v17.10 | +| Removed | [`-g` and `--graph` flags on `dockerd`](#-g-and---graph-flags-on-dockerd) | v17.05 | - | +| Deprecated | [Top-level network properties in NetworkSettings](#top-level-network-properties-in-networksettings) | v1.13 | v17.12 | +| Removed | [`filter` param for `/images/json` endpoint](#filter-param-for-imagesjson-endpoint) | v1.13 | v20.10 | +| Removed | [`repository:shortid` image references](#repositoryshortid-image-references) | v1.13 | v17.12 | +| Removed | [`docker daemon` subcommand](#docker-daemon-subcommand) | v1.13 | v17.12 | +| Removed | [Duplicate keys with conflicting values in engine labels](#duplicate-keys-with-conflicting-values-in-engine-labels) | v1.13 | v17.12 | +| Deprecated | [`MAINTAINER` in Dockerfile](#maintainer-in-dockerfile) | v1.13 | - | +| Deprecated | [API calls without a version](#api-calls-without-a-version) | v1.13 | v17.12 | +| Removed | [Backing filesystem without `d_type` support for overlay/overlay2](#backing-filesystem-without-d_type-support-for-overlayoverlay2) | v1.13 | v17.12 | +| Removed | [`--automated` and `--stars` flags on `docker search`](#--automated-and---stars-flags-on-docker-search) | v1.12 | v20.10 | +| Deprecated | [`-h` shorthand for `--help`](#-h-shorthand-for---help) | v1.12 | v17.09 | +| Removed | [`-e` and `--email` flags on `docker login`](#-e-and---email-flags-on-docker-login) | v1.11 | v17.06 | +| Deprecated | [Separator (`:`) of `--security-opt` flag on `docker run`](#separator--of---security-opt-flag-on-docker-run) | v1.11 | v17.06 | +| Deprecated | [Ambiguous event fields in API](#ambiguous-event-fields-in-api) | v1.10 | - | +| Removed | [`-f` flag on `docker tag`](#-f-flag-on-docker-tag) | v1.10 | v1.12 | +| Removed | [HostConfig at API container start](#hostconfig-at-api-container-start) | v1.10 | v1.12 | +| Removed | [`--before` and `--since` flags on `docker ps`](#--before-and---since-flags-on-docker-ps) | v1.10 | v1.12 | +| Removed | [Driver-specific log tags](#driver-specific-log-tags) | v1.9 | v1.12 | +| Removed | [Docker Content Trust `ENV` passphrase variables name change](#docker-content-trust-env-passphrase-variables-name-change) | v1.9 | v1.12 | +| Removed | [`/containers/(id or name)/copy` endpoint](#containersid-or-namecopy-endpoint) | v1.8 | v1.12 | +| Removed | [LXC built-in exec driver](#lxc-built-in-exec-driver) | v1.8 | v1.10 | +| Removed | [Old Command Line Options](#old-command-line-options) | v1.8 | v1.10 | +| Removed | [`--api-enable-cors` flag on `dockerd`](#--api-enable-cors-flag-on-dockerd) | v1.6 | v17.09 | +| Removed | [`--run` flag on `docker commit`](#--run-flag-on-docker-commit) | v0.10 | v1.13 | +| Removed | [Three arguments form in `docker import`](#three-arguments-form-in-docker-import) | v0.6.7 | v1.12 | ### Legacy builder for Linux images From 41fd1c49b6847ce3f3e74d70e71f9151e477b952 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 7 Apr 2022 14:36:11 +0200 Subject: [PATCH 2/7] update deprecation status of --kernel-memory(-tcp) Signed-off-by: Sebastiaan van Stijn --- cli/command/container/update.go | 8 +++++++- docs/deprecated.md | 27 ++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/cli/command/container/update.go b/cli/command/container/update.go index 8669936b2a..4d1b525ca5 100644 --- a/cli/command/container/update.go +++ b/cli/command/container/update.go @@ -64,7 +64,13 @@ func NewUpdateCommand(dockerCli command.Cli) *cobra.Command { flags.VarP(&options.memory, "memory", "m", "Memory limit") flags.Var(&options.memoryReservation, "memory-reservation", "Memory soft limit") flags.Var(&options.memorySwap, "memory-swap", "Swap limit equal to memory plus swap: '-1' to enable unlimited swap") - flags.Var(&options.kernelMemory, "kernel-memory", "Kernel memory limit") + flags.Var(&options.kernelMemory, "kernel-memory", "Kernel memory limit (deprecated)") + // --kernel-memory is deprecated on API v1.42 and up, but our current annotations + // do not support only showing on < API-version. This option is no longer supported + // by runc, so hiding it unconditionally. + flags.SetAnnotation("kernel-memory", "deprecated", nil) + flags.MarkHidden("kernel-memory") + flags.StringVar(&options.restartPolicy, "restart", "", "Restart policy to apply when a container exits") flags.Int64Var(&options.pidsLimit, "pids-limit", 0, "Tune container pids limit (set -1 for unlimited)") flags.SetAnnotation("pids-limit", "version", []string{"1.40"}) diff --git a/docs/deprecated.md b/docs/deprecated.md index 8c0d574e01..08cf139b2b 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -57,7 +57,7 @@ The table below provides an overview of the current status of deprecated feature | Deprecated | [Pulling images from non-compliant image registries](#pulling-images-from-non-compliant-image-registries) | v20.10 | - | | Removed | [Linux containers on Windows (LCOW)](#linux-containers-on-windows-lcow-experimental) | v20.10 | v22.04 | | Deprecated | [BLKIO weight options with cgroups v1](#blkio-weight-options-with-cgroups-v1) | v20.10 | - | -| Deprecated | [Kernel memory limit](#kernel-memory-limit) | v20.10 | - | +| Removed | [Kernel memory limit](#kernel-memory-limit) | v20.10 | v22.04 | | Deprecated | [Classic Swarm and overlay networks using external key/value stores](#classic-swarm-and-overlay-networks-using-cluster-store) | v20.10 | - | | Removed | [Support for the legacy `~/.dockercfg` configuration file for authentication](#support-for-legacy-dockercfg-configuration-files) | v20.10 | v22.04 | | Deprecated | [CLI plugins support](#cli-plugins-support) | v20.10 | - | @@ -281,9 +281,30 @@ When using cgroups v2, the `--blkio-weight` options are implemented using ### Kernel memory limit **Deprecated in Release: v20.10** +**Removed in Release: v22.04** -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). +Specifying kernel memory limit (`docker run --kernel-memory`) is no longer supported +because the [Linux kernel deprecated `kmem.limit_in_bytes` in v5.4](https://github.com/torvalds/linux/commit/0158115f702b0ba208ab0b5adf44cae99b3ebcc7). +The OCI runtime specification now marks this option (as well as `--kernel-memory-tcp`) +as ["NOT RECOMMENDED"](https://github.com/opencontainers/runtime-spec/pull/1093), +and OCI runtimes such as `runc` no longer support this option. + +Docker API v1.42 and up now ignores this option when set. Older versions of the +API continue to accept the option, but depending on the OCI runtime used, may +take no effect. + +> **Note** +> +> While not deprecated (yet) in Docker, the OCI runtime specification also +> deprecated the `memory.kmem.tcp.limit_in_bytes` option. When using `runc` as +> runtime, this option takes no effect. The linux kernel did not explicitly +> deprecate this feature, and there is a tracking ticket in the `runc` issue +> tracker to determine if this option should be reinstated or if this was an +> oversight of the Linux kernel maintainers (see [opencontainers/runc#3174](https://github.com/opencontainers/runc/issues/3174)). +> +> The `memory.kmem.tcp.limit_in_bytes` option is only supported with cgroups v1, +> and not available on installations running with cgroups v2. This option is +> only supported by the API, and not exposed on the `docker` command-line. ### Classic Swarm and overlay networks using cluster store From 9630e1490eca1f9cd44bf7f9c1752dff00bff48e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 7 Apr 2022 15:12:23 +0200 Subject: [PATCH 3/7] docs: update deprecation status of aufs, overlay, and devicemapper Signed-off-by: Sebastiaan van Stijn --- docs/deprecated.md | 61 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/docs/deprecated.md b/docs/deprecated.md index 08cf139b2b..d06211f036 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -68,9 +68,9 @@ The table below provides an overview of the current status of deprecated feature | Removed | [`docker engine` subcommands](#docker-engine-subcommands) | v19.03 | v20.10 | | Removed | [Top-level `docker deploy` subcommand (experimental)](#top-level-docker-deploy-subcommand-experimental) | v19.03 | v20.10 | | Removed | [`docker stack deploy` using "dab" files (experimental)](#docker-stack-deploy-using-dab-files-experimental) | v19.03 | v20.10 | -| Deprecated | [AuFS storage driver](#aufs-storage-driver) | v19.03 | - | -| Deprecated | [Legacy "overlay" storage driver](#legacy-overlay-storage-driver) | v18.09 | - | -| Deprecated | [Device mapper storage driver](#device-mapper-storage-driver) | v18.09 | - | +| Disabled | [AuFS storage driver](#aufs-storage-driver) | v19.03 | - | +| Disabled | [Legacy "overlay" storage driver](#legacy-overlay-storage-driver) | v18.09 | - | +| Disabled | [Device mapper storage driver](#device-mapper-storage-driver) | v18.09 | - | | Removed | [Use of reserved namespaces in engine labels](#use-of-reserved-namespaces-in-engine-labels) | v18.06 | v20.10 | | Removed | [`--disable-legacy-registry` override daemon option](#--disable-legacy-registry-override-daemon-option) | v17.12 | v19.03 | | Removed | [Interacting with V1 registries](#interacting-with-v1-registries) | v17.06 | v17.12 | @@ -445,6 +445,7 @@ using compose files. ### AuFS storage driver **Deprecated in Release: v19.03** +**Disabled by default in Release: v22.04** The `aufs` storage driver is deprecated in favor of `overlay2`, and will be removed in a future release. Users of the `aufs` storage driver are @@ -460,10 +461,28 @@ is available to all supported distros (as they are either on kernel 4.x, or have support for multiple lowerdirs backported), there is no reason to continue maintenance of the `aufs` storage driver. +#### Disabled by default in v22.04 + +Docker already prevented deprecated storage drivers from being automatically +selected on new installations, but continued to use these drivers when upgrading +existing installations. Starting with the v22.04 release, the Docker Engine will +fail to start if a deprecated storage driver is used (see [moby#43378](https://github.com/moby/moby/pull/43378): + +```console +failed to start daemon: error initializing graphdriver: prior storage driver +aufs is deprecated and will be removed in a future release; update the the daemon +configuration and explicitly choose this storage driver to continue using it; +visit https://docs.docker.com/go/storage-driver/ for more information. +``` + +To continue using the storage driver, update the daemon configuration to use +explicitly use the given storage driver. Users are encouraged to migrate to +different storage driver. ### Legacy "overlay" storage driver **Deprecated in Release: v18.09** +**Disabled by default in Release: v22.04** The `overlay` storage driver is deprecated in favor of the `overlay2` storage driver, which has all the benefits of `overlay`, without its limitations (excessive @@ -476,9 +495,28 @@ on pre 4.x kernels. Now that all supported distributions are able to run `overla (as they are either on kernel 4.x, or have support for multiple lowerdirs backported), there is no reason to keep maintaining the `overlay` storage driver. +#### Disabled by default in v22.04 + +Docker already prevented deprecated storage drivers from being automatically +selected on new installations, but continued to use these drivers when upgrading +existing installations. Starting with the v22.04 release, the Docker Engine will +fail to start if a deprecated storage driver is used (see [moby#43378](https://github.com/moby/moby/pull/43378): + +```console +failed to start daemon: error initializing graphdriver: prior storage driver +overlay is deprecated and will be removed in a future release; update the the daemon +configuration and explicitly choose this storage driver to continue using it; +visit https://docs.docker.com/go/storage-driver/ for more information. +``` + +To continue using the storage driver, update the daemon configuration to use +explicitly use the given storage driver. Users are encouraged to migrate to +different storage driver. + ### Device mapper storage driver **Deprecated in Release: v18.09** +**Disabled by default in Release: v22.04** The `devicemapper` storage driver is deprecated in favor of `overlay2`, and will be removed in a future release. Users of the `devicemapper` storage driver are @@ -492,6 +530,23 @@ Now that support for `overlay2` is added to all supported distros (as they are either on kernel 4.x, or have support for multiple lowerdirs backported), there is no reason to continue maintenance of the `devicemapper` storage driver. +#### Disabled by default in v22.04 + +Docker already prevented deprecated storage drivers from being automatically +selected on new installations, but continued to use these drivers when upgrading +existing installations. Starting with the v22.04 release, the Docker Engine will +fail to start if a deprecated storage driver is used (see [moby#43378](https://github.com/moby/moby/pull/43378): + +```console +failed to start daemon: error initializing graphdriver: prior storage driver +devicemapper is deprecated and will be removed in a future release; update the the daemon +configuration and explicitly choose this storage driver to continue using it; +visit https://docs.docker.com/go/storage-driver/ for more information. +``` + +To continue using the storage driver, update the daemon configuration to use +explicitly use the given storage driver. Users are encouraged to migrate to +different storage driver. ### Use of reserved namespaces in engine labels From 60a0e67e0a54a827980c668a2185494c9599ebd4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 7 Apr 2022 15:14:44 +0200 Subject: [PATCH 4/7] docs: update deprecation status of legacy overlay networks Signed-off-by: Sebastiaan van Stijn --- docs/deprecated.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/deprecated.md b/docs/deprecated.md index d06211f036..513edbf86f 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -58,7 +58,7 @@ The table below provides an overview of the current status of deprecated feature | Removed | [Linux containers on Windows (LCOW)](#linux-containers-on-windows-lcow-experimental) | v20.10 | v22.04 | | Deprecated | [BLKIO weight options with cgroups v1](#blkio-weight-options-with-cgroups-v1) | v20.10 | - | | Removed | [Kernel memory limit](#kernel-memory-limit) | v20.10 | v22.04 | -| Deprecated | [Classic Swarm and overlay networks using external key/value stores](#classic-swarm-and-overlay-networks-using-cluster-store) | v20.10 | - | +| Removed | [Classic Swarm and overlay networks using external key/value stores](#classic-swarm-and-overlay-networks-using-cluster-store) | v20.10 | v22.04 | | Removed | [Support for the legacy `~/.dockercfg` configuration file for authentication](#support-for-legacy-dockercfg-configuration-files) | v20.10 | v22.04 | | Deprecated | [CLI plugins support](#cli-plugins-support) | v20.10 | - | | Deprecated | [Dockerfile legacy `ENV name value` syntax](#dockerfile-legacy-env-name-value-syntax) | v20.10 | - | @@ -309,12 +309,11 @@ take no effect. ### Classic Swarm and overlay networks using cluster store **Deprecated in Release: v20.10** +**Removed in Release: v22.04** Standalone ("classic") Swarm has been deprecated, and with that the use of overlay networks using an external key/value store. The corresponding`--cluster-advertise`, -`--cluster-store`, and `--cluster-store-opt` daemon options have been marked -deprecated, and will be disabled or removed in a future release. - +`--cluster-store`, and `--cluster-store-opt` daemon options have been removed. ### Support for legacy `~/.dockercfg` configuration files From 47cad508a2d5106d8369a468cb2bf8e9bfdaae0d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 7 Apr 2022 17:44:46 +0200 Subject: [PATCH 5/7] docs: update deprecation status for overlay(2) on backingfs without d_type Signed-off-by: Sebastiaan van Stijn --- docs/deprecated.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/deprecated.md b/docs/deprecated.md index 513edbf86f..47b8ab94c0 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -693,12 +693,11 @@ The overlay and overlay2 storage driver does not work as expected if the backing filesystem does not support `d_type`. For example, XFS does not support `d_type` if it is formatted with the `ftype=0` option. -Starting with Docker 17.12, new installations will not support running overlay2 on -a backing filesystem without `d_type` support. For existing installations that upgrade -to 17.12, a warning will be printed. +Support for these setups has been removed, and Docker v22.04 and up now fails to +start when attempting to use the `overlay2` or `overlay` storage driver on a +backing filesystem without `d_type` support. -Please also refer to [#27358](https://github.com/docker/docker/issues/27358) for -further information. +Refer to [#27358](https://github.com/docker/docker/issues/27358) for details. ### `--automated` and `--stars` flags on `docker search` From f3a6e7eded10a9d85dca19da6255a90854ff5467 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 7 Apr 2022 22:10:24 +0200 Subject: [PATCH 6/7] docs: update deprecation status of "experimental" cli Change future tense to current tense. Signed-off-by: Sebastiaan van Stijn --- docs/deprecated.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/deprecated.md b/docs/deprecated.md index 47b8ab94c0..b09d2426d0 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -63,7 +63,7 @@ The table below provides an overview of the current status of deprecated feature | Deprecated | [CLI plugins support](#cli-plugins-support) | v20.10 | - | | Deprecated | [Dockerfile legacy `ENV name value` syntax](#dockerfile-legacy-env-name-value-syntax) | v20.10 | - | | Removed | [`docker build --stream` flag (experimental)](#docker-build---stream-flag-experimental) | v20.10 | v20.10 | -| Deprecated | [Configuration options for experimental CLI features](#configuration-options-for-experimental-cli-features) | v19.03 | v20.10 | +| Removed | [Configuration options for experimental CLI features](#configuration-options-for-experimental-cli-features) | v19.03 | v22.04 | | Deprecated | [Pushing and pulling with image manifest v2 schema 1](#pushing-and-pulling-with-image-manifest-v2-schema-1) | v19.03 | v20.10 | | Removed | [`docker engine` subcommands](#docker-engine-subcommands) | v19.03 | v20.10 | | Removed | [Top-level `docker deploy` subcommand (experimental)](#top-level-docker-deploy-subcommand-experimental) | v19.03 | v20.10 | @@ -336,9 +336,13 @@ notifying the user that the legacy file is present, but ignored. ### Configuration options for experimental CLI features +**Deprecated in Release: v19.03** + +**Removed in Release: v22.04** + The `DOCKER_CLI_EXPERIMENTAL` environment variable and the corresponding `experimental` -field in the CLI configuration file are deprecated. Experimental features will be -enabled by default, and these configuration options will no longer be functional. +field in the CLI configuration file are deprecated. Experimental features are +enabled by default, and these configuration options are no longer functional. ### CLI plugins support From 51aa683a888aa2be7f7ca563ac9e9b61f17ffdaf Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 7 Apr 2022 17:00:29 +0200 Subject: [PATCH 7/7] cli/command/system: remove printStorageDriverWarnings() These warnings were for features that are no longer supported (overlay on a backingFS without d_type support), or related to the deprecated devicemapper storage driver. Removing this function for that reason. Signed-off-by: Sebastiaan van Stijn --- cli/command/system/info.go | 46 -------------------------------------- 1 file changed, 46 deletions(-) diff --git a/cli/command/system/info.go b/cli/command/system/info.go index 1780487111..1d57f3f5ca 100644 --- a/cli/command/system/info.go +++ b/cli/command/system/info.go @@ -426,7 +426,6 @@ func printServerWarnings(dockerCli command.Cli, info types.Info) { return } // daemon didn't return warnings. Fallback to old behavior - printStorageDriverWarnings(dockerCli, info) printServerWarningsLegacy(dockerCli, info) } @@ -494,51 +493,6 @@ func printServerWarningsLegacy(dockerCli command.Cli, info types.Info) { } } -// printStorageDriverWarnings generates warnings based on storage-driver information -// returned by the daemon. -// DEPRECATED: warnings are now generated by the daemon, and returned in -// info.Warnings. This function is used to provide backward compatibility with -// daemons that do not provide these warnings. No new warnings should be added -// here. -func printStorageDriverWarnings(dockerCli command.Cli, info types.Info) { - if info.OSType == "windows" { - return - } - if info.DriverStatus == nil { - return - } - for _, pair := range info.DriverStatus { - if pair[0] == "Data loop file" { - fmt.Fprintf(dockerCli.Err(), "WARNING: %s: usage of loopback devices is "+ - "strongly discouraged for production use.\n "+ - "Use `--storage-opt dm.thinpooldev` to specify a custom block storage device.\n", info.Driver) - } - if pair[0] == "Supports d_type" && pair[1] == "false" { - backingFs := getBackingFs(info) - - msg := fmt.Sprintf("WARNING: %s: the backing %s filesystem is formatted without d_type support, which leads to incorrect behavior.\n", info.Driver, backingFs) - if backingFs == "xfs" { - msg += " Reformat the filesystem with ftype=1 to enable d_type support.\n" - } - msg += " Running without d_type support will not be supported in future releases." - fmt.Fprintln(dockerCli.Err(), msg) - } - } -} - -func getBackingFs(info types.Info) string { - if info.DriverStatus == nil { - return "" - } - - for _, pair := range info.DriverStatus { - if pair[0] == "Backing Filesystem" { - return pair[1] - } - } - return "" -} - func formatInfo(dockerCli command.Cli, info info, format string) error { // Ensure slice/array fields render as `[]` not `null` if info.ClientInfo != nil && info.ClientInfo.Plugins == nil {