From 06c1f784dd1dd728f61636bc59fc892983bba418 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 13 Oct 2020 09:37:17 +0200 Subject: [PATCH 1/3] Update version to 20.10-dev Signed-off-by: Sebastiaan van Stijn --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7bfdc328e9..53391fa4db 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20.03.0-dev +20.10.0-dev From 6c0a3dfbff2280482e68b8bfa2d5a0d955875e82 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 13 Oct 2020 09:38:48 +0200 Subject: [PATCH 2/3] docs: update 20.03 -> 20.10 in deprecated.md Signed-off-by: Sebastiaan van Stijn --- docs/deprecated.md | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/deprecated.md b/docs/deprecated.md index d960e23094..348e1f6e93 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -50,33 +50,33 @@ 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 | - -Deprecated | [Classic Swarm and overlay networks using external key/value stores](#classic-swarm-and-overlay-networks-using-cluster-store) | v20.03 | - -Deprecated | [Support for the legacy `~/.dockercfg` configuration file for authentication](#support-for-legacy-dockercfg-configuration-files) | v20.03 | - -Deprecated | [CLI plugins support](#cli-plugins-support) | v20.03 | - -Deprecated | [Dockerfile legacy `ENV name value` syntax](#dockerfile-legacy-env-name-value-syntax) | v20.03 | - -Deprecated | [Configuration options for experimental CLI features](#configuration-options-for-experimental-cli-features) | v19.03 | v20.03 -Deprecated | [Pushing and pulling with image manifest v2 schema 1](#pushing-and-pulling-with-image-manifest-v2-schema-1) | v19.03 | v20.03 -Removed | [`docker engine` subcommands](#docker-engine-subcommands) | v19.03 | v20.03 -Removed | [Top-level `docker deploy` subcommand (experimental)](#top-level-docker-deploy-subcommand-experimental) | v19.03 | v20.03 -Removed | [`docker stack deploy` using "dab" files (experimental)](#docker-stack-deploy-using-dab-files-experimental) | v19.03 | v20.03 +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 | - +Deprecated | [Support for the legacy `~/.dockercfg` configuration file for authentication](#support-for-legacy-dockercfg-configuration-files) | v20.10 | - +Deprecated | [CLI plugins support](#cli-plugins-support) | v20.10 | - +Deprecated | [Dockerfile legacy `ENV name value` syntax](#dockerfile-legacy-env-name-value-syntax) | 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.03 +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.03 +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.03 +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 @@ -95,14 +95,14 @@ Removed | [Three arguments form in `docker import`](#three-arguments-form-in- ### Kernel memory limit -**Deprecated in Release: v20.03** +**Deprecated in Release: v20.10** 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** +**Deprecated in Release: v20.10** Standalone ("classic") Swarm has been deprecated, and with that the use of overlay networks using an external key/value store. The corresponding`--cluster-advertise`, @@ -112,7 +112,7 @@ deprecated, and will be disabled or removed in a future release. ### Support for legacy `~/.dockercfg` configuration files -**Deprecated in Release: v20.03** +**Deprecated in Release: v20.10** The docker CLI up until v1.7.0 used the `~/.dockercfg` file to store credentials after authenticating to a registry (`docker login`). Docker v1.7.0 replaced this @@ -133,13 +133,13 @@ enabled by default, and these configuration options will no longer be functional ### CLI plugins support -**Deprecated in Release: v20.03** +**Deprecated in Release: v20.10** CLI Plugin API is now marked as deprecated. ### Dockerfile legacy `ENV name value` syntax -**Deprecated in Release: v20.03** +**Deprecated in Release: v20.10** The Dockerfile `ENV` instruction allows values to be set using either `ENV name=value` or `ENV name value`. The latter (`ENV name value`) form can be ambiguous, for example, @@ -165,7 +165,7 @@ ENV ONE="" TWO="" THREE="world" **Deprecated in Release: v19.03** -**Target For Removal In Release: v20.03** +**Target For Removal In Release: v20.10** The image manifest [v2 schema 1](https://github.com/docker/distribution/blob/fda42e5ef908bdba722d435ff1f330d40dfcd56c/docs/spec/manifest-v2-1.md) @@ -179,7 +179,7 @@ If the registry you are using still supports v2 schema 1, urge their administrat **Deprecated in Release: v19.03** -**Removed in Release: v20.03** +**Removed in Release: v20.10** The `docker engine activate`, `docker engine check`, and `docker engine update` provided an alternative installation method to upgrade Docker Community engines @@ -195,7 +195,7 @@ standard package managers. **Deprecated in Release: v19.03** -**Removed in Release: v20.03** +**Removed in Release: v20.10** The top-level `docker deploy` command (using the "Docker Application Bundle" (.dab) file format was introduced as an experimental feature in Docker 1.13 / @@ -207,7 +207,7 @@ subcommand. **Deprecated in Release: v19.03** -**Removed in Release: v20.03** +**Removed in Release: v20.10** With no development being done on this feature, and no active use of the file format, support for the DAB file format and the top-level docker deploy command @@ -270,13 +270,13 @@ is no reason to continue maintenance of the `devicemapper` storage driver. **Deprecated in Release: v18.06** -**Removed In Release: v20.03** +**Removed In Release: v20.10** The namespaces `com.docker.*`, `io.docker.*`, and `org.dockerproject.*` in engine labels were always documented to be reserved, but there was never any enforcement. Usage of these namespaces will now cause a warning in the engine logs to discourage their -use, and will error instead in v20.03 and above. +use, and will error instead in v20.10 and above. ### `--disable-legacy-registry` override daemon option @@ -358,7 +358,7 @@ information. ### `filter` param for `/images/json` endpoint **Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)** -**Removed In Release: v20.03** +**Removed In Release: v20.10** The `filter` param to filter the list of image by reference (name or name:tag) is now implemented as a regular filter, named `reference`. @@ -424,7 +424,7 @@ further information. **Deprecated in Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)** -**Removed In Release: v20.03** +**Removed In Release: v20.10** The `docker search --automated` and `docker search --stars` options are deprecated. Use `docker search --filter=is-automated=` and `docker search --filter=stars=...` instead. From ee419236451b8871e9b173dcb7cc5c7e2670fba0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 13 Oct 2020 09:39:42 +0200 Subject: [PATCH 3/3] docs: update 20.03 -> 20.10 in docker update docs Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/update.md | 2 +- man/src/container/update.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/commandline/update.md b/docs/reference/commandline/update.md index a80d91b375..43b650b7a2 100644 --- a/docs/reference/commandline/update.md +++ b/docs/reference/commandline/update.md @@ -81,7 +81,7 @@ the container before updating kernel memory. > **Note** > -> The `--kernel-memory` option has been deprecated since Docker 20.03. +> The `--kernel-memory` option has been deprecated since Docker 20.10. For example, if you started a container with this command: diff --git a/man/src/container/update.md b/man/src/container/update.md index d89180a343..12011e8e70 100644 --- a/man/src/container/update.md +++ b/man/src/container/update.md @@ -60,7 +60,7 @@ 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. +NOTE: The **--kernel-memory** option has been deprecated since Docker 20.10. For example, if you started a container with this command: