From 60bfaba6fbf33b14ce1ae59fda396fe57dbfdc7c Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sat, 7 Oct 2017 13:57:26 +0200 Subject: [PATCH 1/2] Update bash completion for synchronous `docker service` commands The default value for `docker service create|update|scale|rollback --detach|-d` changed from `true` to `false`. This updates bash completion to complete just `--detach|-d`. Signed-off-by: Harald Albers --- contrib/completion/bash/docker | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index dd2ef853b9..96fc22f24b 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -3224,7 +3224,7 @@ _docker_service_rm() { _docker_service_rollback() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--detach=false -d --help --quit -q" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--detach -d --help --quit -q" -- "$cur" ) ) ;; *) local counter=$( __docker_pos_first_nonflag ) @@ -3238,7 +3238,7 @@ _docker_service_rollback() { _docker_service_scale() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--detach=false -d=false --help" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--detach -d --help" -- "$cur" ) ) ;; *) __docker_complete_services @@ -3339,7 +3339,7 @@ _docker_service_update_and_create() { " local boolean_options=" - --detach=false -d=false + --detach -d --help --no-healthcheck --read-only From 20d9ceca7859269778851c27b6b0aadd02a325a1 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sat, 7 Oct 2017 14:28:56 +0200 Subject: [PATCH 2/2] Update deprecation for synchronous service updates - The default was not changed in 17.09 but will be in 17.10 - `service scale` and `service rollback` are also affected. Signed-off-by: Harald Albers --- docs/deprecated.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/deprecated.md b/docs/deprecated.md index 3ad53c9392..8c3c6ffa48 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -24,13 +24,16 @@ see [Feature Deprecation Policy](https://docs.docker.com/engine/#feature-depreca **Deprecated In Release: v17.05.0** -**Disabled by default in release: [v17.09](https://github.com/docker/docker-ce/releases/tag/v17.09.0-ce)** +**Disabled by default in release: [v17.10](https://github.com/docker/docker-ce/releases/tag/v17.10.0-ce)** Docker 17.05.0 added an optional `--detach=false` option to make the `docker service create` and `docker service update` work synchronously. This -option will be enable by default in Docker 17.09, at which point the `--detach` +option will be enabled by default in Docker 17.10, at which point the `--detach` flag can be used to use the previous (asynchronous) behavior. +The default for this option will also be changed accordingly for `docker service rollback` +and `docker service scale` in Docker 17.10. + ### `-g` and `--graph` flags on `dockerd` **Deprecated In Release: v17.05.0**