From f88d0a219298cea15f7337874543a11fc7ac230b Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 27 Oct 2016 09:05:21 +0200 Subject: [PATCH 1/3] Add bash completion for new `docker system` command family Signed-off-by: Harald Albers Upstream-commit: 5290f748789474d9c826e84342f59e6b43e96c4e Component: engine --- .../engine/contrib/completion/bash/docker | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 5c918e022a..29c2ab73cf 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -3151,6 +3151,45 @@ _docker_stop() { _docker_container_stop } + +_docker_system() { + local subcommands=" + df + events + info + prune + " + __docker_subcommands "$subcommands $aliases" && return + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + ;; + *) + COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) ) + ;; + esac +} + +# TODO new command +_docker_system_df() { + : +} + +_docker_system_events() { + _docker_events +} + +_docker_system_info() { + _docker_info +} + +# TODO new command +_docker_system_prune() { + : +} + + _docker_tag() { _docker_image_tag } @@ -3325,6 +3364,7 @@ _docker() { stats stop swarm + system tag top unpause From 3c813f7ba633bf60369c57dadfdb31903de3df35 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 27 Oct 2016 09:08:18 +0200 Subject: [PATCH 2/3] Move bash completion logic to new subcommand: events Signed-off-by: Harald Albers Upstream-commit: 1de8e84a5cdc5146bdb75307be02bc881f5fb437 Component: engine --- .../engine/contrib/completion/bash/docker | 176 +++++++++--------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 29c2ab73cf..4a475617ed 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -1824,93 +1824,7 @@ _docker_diff() { } _docker_events() { - local key=$(__docker_map_key_of_current_option '-f|--filter') - case "$key" in - container) - __docker_complete_containers_all --cur "${cur##*=}" - return - ;; - daemon) - local name=$(__docker_q info | sed -n 's/^\(ID\|Name\): //p') - COMPREPLY=( $( compgen -W "$name" -- "${cur##*=}" ) ) - return - ;; - event) - COMPREPLY=( $( compgen -W " - attach - commit - connect - copy - create - delete - destroy - detach - die - disconnect - exec_create - exec_detach - exec_start - export - health_status - import - kill - load - mount - oom - pause - pull - push - reload - rename - resize - restart - save - start - stop - tag - top - unmount - unpause - untag - update - " -- "${cur##*=}" ) ) - return - ;; - image) - cur="${cur##*=}" - __docker_complete_images - return - ;; - network) - __docker_complete_networks --cur "${cur##*=}" - return - ;; - type) - COMPREPLY=( $( compgen -W "container daemon image network volume" -- "${cur##*=}" ) ) - return - ;; - volume) - __docker_complete_volumes --cur "${cur##*=}" - return - ;; - esac - - case "$prev" in - --filter|-f) - COMPREPLY=( $( compgen -S = -W "container daemon event image label network type volume" -- "$cur" ) ) - __docker_nospace - return - ;; - --since|--until) - return - ;; - esac - - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--filter -f --help --since --until --format" -- "$cur" ) ) - ;; - esac + _docker_system_events } _docker_exec() { @@ -3177,7 +3091,93 @@ _docker_system_df() { } _docker_system_events() { - _docker_events + local key=$(__docker_map_key_of_current_option '-f|--filter') + case "$key" in + container) + __docker_complete_containers_all --cur "${cur##*=}" + return + ;; + daemon) + local name=$(__docker_q info | sed -n 's/^\(ID\|Name\): //p') + COMPREPLY=( $( compgen -W "$name" -- "${cur##*=}" ) ) + return + ;; + event) + COMPREPLY=( $( compgen -W " + attach + commit + connect + copy + create + delete + destroy + detach + die + disconnect + exec_create + exec_detach + exec_start + export + health_status + import + kill + load + mount + oom + pause + pull + push + reload + rename + resize + restart + save + start + stop + tag + top + unmount + unpause + untag + update + " -- "${cur##*=}" ) ) + return + ;; + image) + cur="${cur##*=}" + __docker_complete_images + return + ;; + network) + __docker_complete_networks --cur "${cur##*=}" + return + ;; + type) + COMPREPLY=( $( compgen -W "container daemon image network volume" -- "${cur##*=}" ) ) + return + ;; + volume) + __docker_complete_volumes --cur "${cur##*=}" + return + ;; + esac + + case "$prev" in + --filter|-f) + COMPREPLY=( $( compgen -S = -W "container daemon event image label network type volume" -- "$cur" ) ) + __docker_nospace + return + ;; + --since|--until) + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--filter -f --help --since --until --format" -- "$cur" ) ) + ;; + esac } _docker_system_info() { From aa72e9f7459ca33e4288ceba667681d631cac829 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 27 Oct 2016 09:10:39 +0200 Subject: [PATCH 3/3] Move bash completion logic to new subcommand: info Signed-off-by: Harald Albers Upstream-commit: a3efa05d3ad6e38540c4fa6b55100e7b979cc260 Component: engine --- .../engine/contrib/completion/bash/docker | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 4a475617ed..ee4b00c794 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -2171,17 +2171,7 @@ _docker_import() { } _docker_info() { - case "$prev" in - --format|-f) - return - ;; - esac - - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) ) - ;; - esac + _docker_system_info } _docker_inspect() { @@ -3181,7 +3171,17 @@ _docker_system_events() { } _docker_system_info() { - _docker_info + case "$prev" in + --format|-f) + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) ) + ;; + esac } # TODO new command