From 9f5039a8d033d77428514a9c219bd981fc66bf67 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sun, 25 Jun 2017 00:27:14 +0200 Subject: [PATCH 01/12] Add bash completion for `network create --ingress` Signed-off-by: Harald Albers (cherry picked from commit e4f9ad77c8de298af11a57f9ca89c88fa3d62181) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 79209c2941f..c395858b237 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -2723,7 +2723,7 @@ _docker_network_create() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--attachable --aux-address --driver -d --gateway --help --internal --ip-range --ipam-driver --ipam-opt --ipv6 --label --opt -o --subnet" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--attachable --aux-address --driver -d --gateway --help --ingress --internal --ip-range --ipam-driver --ipam-opt --ipv6 --label --opt -o --subnet" -- "$cur" ) ) ;; esac } From 8f5b746fdd159d7581c33a04a99d59116cb9e4f8 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 27 Jun 2017 11:28:52 +0200 Subject: [PATCH 02/12] Add bash completion for `label` filter of `prune` commands Signed-off-by: Harald Albers (cherry picked from commit 8b99b65ca82534edca786a9e3a61d77297626690) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index c395858b237..459cae999cb 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -1413,7 +1413,7 @@ _docker_container_port() { _docker_container_prune() { case "$prev" in --filter) - COMPREPLY=( $( compgen -W "until" -S = -- "$cur" ) ) + COMPREPLY=( $( compgen -W "label label! until" -S = -- "$cur" ) ) __docker_nospace return ;; @@ -2428,7 +2428,7 @@ _docker_image_ls() { _docker_image_prune() { case "$prev" in --filter) - COMPREPLY=( $( compgen -W "until" -S = -- "$cur" ) ) + COMPREPLY=( $( compgen -W "label label! until" -S = -- "$cur" ) ) __docker_nospace return ;; @@ -2806,7 +2806,7 @@ _docker_network_ls() { _docker_network_prune() { case "$prev" in --filter) - COMPREPLY=( $( compgen -W "until" -S = -- "$cur" ) ) + COMPREPLY=( $( compgen -W "label label! until" -S = -- "$cur" ) ) __docker_nospace return ;; @@ -4314,7 +4314,7 @@ _docker_system_info() { _docker_system_prune() { case "$prev" in --filter) - COMPREPLY=( $( compgen -W "until" -S = -- "$cur" ) ) + COMPREPLY=( $( compgen -W "label label! until" -S = -- "$cur" ) ) __docker_nospace return ;; @@ -4433,9 +4433,17 @@ _docker_volume_ls() { } _docker_volume_prune() { + case "$prev" in + --filter) + COMPREPLY=( $( compgen -W "label label!" -S = -- "$cur" ) ) + __docker_nospace + return + ;; + esac + case "$cur" in -*) - COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--filter --force -f --help" -- "$cur" ) ) ;; esac } From 224f23149ed433de99060947aa4eef7be44dcc6d Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 27 Jun 2017 11:52:06 +0200 Subject: [PATCH 03/12] Add bash completion for `service create|update --entrypoint` Also fixes a wrong option: `--arg` should be `--args`. Signed-off-by: Harald Albers (cherry picked from commit e0462e8472af1f0835104651e062b35756901d59) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 459cae999cb..2884fa162bf 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -3039,6 +3039,7 @@ _docker_service_update() { _docker_service_update_and_create() { local options_with_args=" --endpoint-mode + --entrypoint --env -e --force --health-cmd @@ -3138,7 +3139,7 @@ _docker_service_update_and_create() { fi if [ "$subcommand" = "update" ] ; then options_with_args="$options_with_args - --arg + --args --constraint-add --constraint-rm --container-label-add From 1c96c7a5ec42a89e3efaf88e2a1d2376b6d08a9e Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 27 Jun 2017 12:19:37 +0200 Subject: [PATCH 04/12] Add bash completion for `network create --scope|--config-only|config-from` Signed-off-by: Harald Albers (cherry picked from commit 22579ba56cd5da8fa2808f1041b9dbc65738d40a) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 2884fa162bf..b887202d62f 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -2707,8 +2707,8 @@ _docker_network_create() { --aux-address|--gateway|--internal|--ip-range|--ipam-opt|--ipv6|--opt|-o|--subnet) return ;; - --ipam-driver) - COMPREPLY=( $( compgen -W "default" -- "$cur" ) ) + --config-from) + __docker_complete_networks return ;; --driver|-d) @@ -2716,14 +2716,22 @@ _docker_network_create() { __docker_complete_plugins_bundled --type Network --remove host --remove null --add macvlan return ;; + --ipam-driver) + COMPREPLY=( $( compgen -W "default" -- "$cur" ) ) + return + ;; --label) return ;; + --scope) + COMPREPLY=( $( compgen -W "local swarm" -- "$cur" ) ) + return + ;; esac case "$cur" in -*) - COMPREPLY=( $( compgen -W "--attachable --aux-address --driver -d --gateway --help --ingress --internal --ip-range --ipam-driver --ipam-opt --ipv6 --label --opt -o --subnet" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--attachable --aux-address --config-from --config-only --driver -d --gateway --help --ingress --internal --ip-range --ipam-driver --ipam-opt --ipv6 --label --opt -o --scope --subnet" -- "$cur" ) ) ;; esac } From 3d418e35c98d8799413866743bbf4998b2fca468 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 27 Jun 2017 12:39:27 +0200 Subject: [PATCH 05/12] Fix bash completion for `network create --internal` `--internal` is a boolean option. It was falsely treated as non-boolean. Signed-off-by: Harald Albers (cherry picked from commit 12dc9eb11f3e6911a024008dc664fd124f8eb36f) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index b887202d62f..138ac76cf33 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -2704,7 +2704,7 @@ _docker_network_connect() { _docker_network_create() { case "$prev" in - --aux-address|--gateway|--internal|--ip-range|--ipam-opt|--ipv6|--opt|-o|--subnet) + --aux-address|--gateway|--ip-range|--ipam-opt|--ipv6|--opt|-o|--subnet) return ;; --config-from) From c1383568b136f8dc64c77ebc30ca720f10f7de8a Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 27 Jun 2017 12:58:38 +0200 Subject: [PATCH 06/12] Add bash completion for `service create --detach` Signed-off-by: Harald Albers (cherry picked from commit 8baef1098ecef546040b7582344d4f08aab08dc9) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 1 + 1 file changed, 1 insertion(+) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 138ac76cf33..cfbd7f3ff6b 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -3087,6 +3087,7 @@ _docker_service_update_and_create() { " local boolean_options=" + --detach -d --help --no-healthcheck --read-only From 15c737a076b952ac09e3a917085188ac93e24a29 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 27 Jun 2017 15:37:14 +0200 Subject: [PATCH 07/12] Add bash completion for plugin events Signed-off-by: Harald Albers (cherry picked from commit f0f71505377ef2af5e51ee07b1b054cd83ec3886) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index cfbd7f3ff6b..9e59aff052a 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -4240,13 +4240,16 @@ _docker_system_events() { destroy detach die + disable disconnect + enable exec_create exec_detach exec_start export health_status import + install kill load mount @@ -4255,6 +4258,7 @@ _docker_system_events() { pull push reload + remove rename resize restart @@ -4280,7 +4284,7 @@ _docker_system_events() { return ;; type) - COMPREPLY=( $( compgen -W "container daemon image network volume" -- "${cur##*=}" ) ) + COMPREPLY=( $( compgen -W "container daemon image network plugin volume" -- "${cur##*=}" ) ) return ;; volume) From 849813590494cc966ee524855ffb9e6bb94e1e25 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 27 Jun 2017 17:32:43 +0200 Subject: [PATCH 08/12] Add bash completion for `service create|update (update|rollback)-order` Signed-off-by: Harald Albers (cherry picked from commit 71dd0e0b668a5755d89815a9c310c2370680c1dc) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 9e59aff052a..0f2e7722e33 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -3074,6 +3074,7 @@ _docker_service_update_and_create() { --rollback-failure-action --rollback-max-failure-ratio --rollback-monitor + --rollback-order --rollback-parallelism --stop-grace-period --stop-signal @@ -3081,6 +3082,7 @@ _docker_service_update_and_create() { --update-failure-action --update-max-failure-ratio --update-monitor + --update-order --update-parallelism --user -u --workdir -w @@ -3250,6 +3252,10 @@ _docker_service_update_and_create() { COMPREPLY=( $( compgen -W "continue pause rollback" -- "$cur" ) ) return ;; + --update-order|--rollback-order) + COMPREPLY=( $( compgen -W "start-first stop-first" -- "$cur" ) ) + return + ;; --user|-u) __docker_complete_user_group return From fd95ab90ad284ecc0abbfc371066519ebfac5645 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 27 Jun 2017 17:43:05 +0200 Subject: [PATCH 09/12] Add bash completion for `service create|update --network-(add|rm)` Signed-off-by: Harald Albers (cherry picked from commit fa0f470a5f43c11b611afcdfc47d1d985f98553c) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 0f2e7722e33..db2ae0e3dff 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -3166,6 +3166,8 @@ _docker_service_update_and_create() { --host-add --host-rm --image + --network-add + --network-rm --placement-pref-add --placement-pref-rm --publish-add @@ -3192,6 +3194,10 @@ _docker_service_update_and_create() { __docker_complete_image_repos_and_tags return ;; + --network-add|--network-rm) + __docker_complete_networks + return + ;; --placement-pref-add|--placement-pref-rm) COMPREPLY=( $( compgen -W "spread" -S = -- "$cur" ) ) __docker_nospace From 8e17167c78ca1c6abab04bdb80fd7fb64f2361cf Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 29 Jun 2017 16:28:50 +0200 Subject: [PATCH 10/12] Add bash completion for `swarm ca` Signed-off-by: Harald Albers (cherry picked from commit 5bd00a563e9cc013d9d67e4770cae2be65963f98) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index db2ae0e3dff..e24fdc64346 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -3292,6 +3292,7 @@ _docker_service_update_and_create() { _docker_swarm() { local subcommands=" + ca init join join-token @@ -3312,6 +3313,24 @@ _docker_swarm() { esac } +_docker_swarm_ca() { + case "$prev" in + --ca-cert|--ca-key) + _filedir + return + ;; + --cert-expiry|--external-ca) + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--ca-cert --ca-key --cert-expiry --detach -d --external-ca --help --quiet -q --rotate" -- "$cur" ) ) + ;; + esac +} + _docker_swarm_init() { case "$prev" in --advertise-addr) From 5b4a4cc549eb3e11cc0c8cba121e9f0e53e3b93a Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 29 Jun 2017 16:43:22 +0200 Subject: [PATCH 11/12] Fix bash completion for `swarm init|join --data-path-addr` Signed-off-by: Harald Albers (cherry picked from commit fa4dc8820af82052834d96704f927ec789530be1) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index e24fdc64346..47f6066c625 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -3349,6 +3349,10 @@ _docker_swarm_init() { --cert-expiry|--dispatcher-heartbeat|--external-ca|--max-snapshots|--snapshot-interval|--task-history-limit) return ;; + --data-path-addr) + __docker_complete_local_interfaces + return + ;; --listen-addr) if [[ $cur == *: ]] ; then COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) ) @@ -3362,7 +3366,7 @@ _docker_swarm_init() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--advertise-addr --data-path-addr --autolock --availability --cert-expiry --dispatcher-heartbeat --external-ca --force-new-cluster --help --listen-addr --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--advertise-addr --autolock --availability --cert-expiry --data-path-addr --dispatcher-heartbeat --external-ca --force-new-cluster --help --listen-addr --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) ) ;; esac } @@ -3378,6 +3382,14 @@ _docker_swarm_join() { fi return ;; + --availability) + COMPREPLY=( $( compgen -W "active drain pause" -- "$cur" ) ) + return + ;; + --data-path-addr) + __docker_complete_local_interfaces + return + ;; --listen-addr) if [[ $cur == *: ]] ; then COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) ) @@ -3387,10 +3399,6 @@ _docker_swarm_join() { fi return ;; - --availability) - COMPREPLY=( $( compgen -W "active drain pause" -- "$cur" ) ) - return - ;; --token) return ;; @@ -3398,7 +3406,7 @@ _docker_swarm_join() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--advertise-addr --data-path-addr --availability --help --listen-addr --token" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--advertise-addr --availability --data-path-addr --help --listen-addr --token" -- "$cur" ) ) ;; *:) COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) ) From 8cf887b304a30db4c09478b247226ca7c9e8e52a Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 11 Jul 2017 11:19:19 +0200 Subject: [PATCH 12/12] Remove bash completion for `service update --network` The `--network` option is only available for `docker service create`. Signed-off-by: Harald Albers (cherry picked from commit e7e77b5e65062006d1e858ab2d4a1cde2651abf2) Signed-off-by: Andrew Hsu --- components/cli/contrib/completion/bash/docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 47f6066c625..cc95639b709 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -3062,7 +3062,6 @@ _docker_service_update_and_create() { --log-driver --log-opt --mount - --network --replicas --reserve-cpu --reserve-memory @@ -3111,6 +3110,7 @@ _docker_service_update_and_create() { --host --mode --name + --network --placement-pref --publish -p --secret