Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #610 from albers/completion-service--detach 

Update bash completion and deprecation for synchronous service updates
This commit is contained in:
Vincent Demeester 2017-10-07 15:31:48 +02:00 committed by GitHub
parent 1649af8129 20d9ceca78
commit e3c580c300
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/completion/bash/docker
View File

@ -3224,7 +3224,7 @@ _docker_service_rm() {
_docker_service_rollback() { _docker_service_rollback() {
case "$cur" in 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 ) local counter=$( __docker_pos_first_nonflag )
@ -3238,7 +3238,7 @@ _docker_service_rollback() {
_docker_service_scale() { _docker_service_scale() {
case "$cur" in case "$cur" in
-*) -*)
COMPREPLY=( $( compgen -W "--detach=false -d=false --help" -- "$cur" ) ) COMPREPLY=( $( compgen -W "--detach -d --help" -- "$cur" ) )
;; ;;
*) *)
__docker_complete_services __docker_complete_services
@ -3339,7 +3339,7 @@ _docker_service_update_and_create() {
" "
local boolean_options=" local boolean_options="
--detach=false -d=false --detach -d
--help --help
--no-healthcheck --no-healthcheck
--read-only --read-only

7
docs/deprecated.md
View File

@ -24,13 +24,16 @@ see [Feature Deprecation Policy](https://docs.docker.com/engine/#feature-depreca
**Deprecated In Release: v17.05.0** **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 17.05.0 added an optional `--detach=false` option to make the
`docker service create` and `docker service update` work synchronously. This `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. 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` ### `-g` and `--graph` flags on `dockerd`
**Deprecated In Release: v17.05.0** **Deprecated In Release: v17.05.0**