From 6c66c799c7fe1c7f58d022a6e343aea54c504df6 Mon Sep 17 00:00:00 2001 From: Tim Sampson Date: Sun, 25 Aug 2019 16:57:30 +0300 Subject: [PATCH 1/7] add rudimentary fish completions for docker network Signed-off-by: Tim Sampson (cherry picked from commit 2f7b364cb397526812f13c0d6c107919e9516ca3) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/fish/docker.fish | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index 53c19e9c88..b62582e245 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -16,7 +16,7 @@ function __fish_docker_no_subcommand --description 'Test if docker has yet to be given the subcommand' for i in (commandline -opc) - if contains -- $i attach build commit cp create diff events exec export history images import info inspect kill load login logout logs pause port ps pull push rename restart rm rmi run save search start stop tag top trust unpause version wait stats + if contains -- $i attach build commit cp create diff events exec export history images import info inspect kill load login logout logs network pause port ps pull push rename restart rm rmi run save search start stop tag top trust unpause version wait stats return 1 end end @@ -34,6 +34,11 @@ function __fish_print_docker_containers --description 'Print a list of docker co end end +function __fish_print_docker_networks --description 'Print a list of docker networks' + docker network ls --format "{{.ID}}\n{{.Name}}" | tr ',' '\n' +end + + function __fish_docker_no_subcommand_trust --description 'Test if docker has yet to be given the trust subcommand' if __fish_seen_subcommand_from trust for i in (commandline -opc) @@ -370,6 +375,21 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -l since -d 'Show complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -l tail -d 'Output the specified number of lines at the end of logs (defaults to all logs)' complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -a '(__fish_print_docker_containers running)' -d "Container" +# network +complete -c docker -f -n '__fish_docker_no_subcommand' -a network -d 'Manage networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a connect -d 'Connect a container to a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a create -d 'Create a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a disconnect -d 'Disconnect a container from a network' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a inspect -d 'Display detailed information on one or more networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a ls -d 'List networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a prune -d 'Remove all unused networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -a rm -d 'Remove one or more networks' +complete -c docker -A -f -n '__fish_seen_subcommand_from network' -l help -d 'Print usage' +complete -c docker -A -f -n '__fish_seen_subcommand_from network rm' -a '(__fish_print_docker_networks)' -d "Network" +complete -c docker -A -f -n '__fish_seen_subcommand_from network connect' -a '(__fish_print_docker_networks)' -d "Network" +complete -c docker -A -f -n '__fish_seen_subcommand_from network disconnect' -a '(__fish_print_docker_networks)' -d "Network" +complete -c docker -A -f -n '__fish_seen_subcommand_from network inspect' -a '(__fish_print_docker_networks)' -d "Network" + # port complete -c docker -f -n '__fish_docker_no_subcommand' -a port -d 'Lookup the public-facing port that is NAT-ed to PRIVATE_PORT' complete -c docker -A -f -n '__fish_seen_subcommand_from port' -l help -d 'Print usage' From 667bd9a1b8fd9bb2066fbb575e6359d15892707e Mon Sep 17 00:00:00 2001 From: Morten Hekkvang Date: Thu, 5 Sep 2019 15:50:24 +0200 Subject: [PATCH 2/7] Make service completion faster Signed-off-by: Morten Hekkvang (cherry picked from commit f55c5b6566e52d3ead55bc0d96528bc2a39daeea) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 0c0fa986af..14f2858119 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -550,17 +550,18 @@ __docker_complete_nodes() { # output to the IDs or names of matching items. This setting takes # precedence over the environment setting. __docker_services() { - local fields='$2' # default: service name only - [ "${DOCKER_COMPLETION_SHOW_SERVICE_IDS}" = yes ] && fields='$1,$2' # ID & name + local format='{{.Name}}' # default: service name only + [ "${DOCKER_COMPLETION_SHOW_SERVICE_IDS}" = yes ] && format='{{.ID}},{{.Name}}' # ID & name if [ "$1" = "--id" ] ; then - fields='$1' # IDs only + format='{{.ID}}' # IDs only shift elif [ "$1" = "--name" ] ; then - fields='$2' # names only + format='{{.Name}}' # names only shift fi - __docker_q service ls "$@" | awk "NR>1 {print $fields}" + + __docker_q service ls -q --format "$format" --filter "name=$1" } # __docker_complete_services applies completion of services based on the current @@ -572,7 +573,7 @@ __docker_complete_services() { current="$2" shift 2 fi - COMPREPLY=( $(compgen -W "$(__docker_services "$@")" -- "$current") ) + COMPREPLY=( $(__docker_services "$@" "$current") ) } # __docker_tasks returns a list of all task IDs. From c70ce79adc2e13e48d45c58301a371623d4aaf12 Mon Sep 17 00:00:00 2001 From: Morten Hekkvang Date: Fri, 6 Sep 2019 10:15:06 +0200 Subject: [PATCH 3/7] Fix substitution of comma to space character, suggested by @albers Signed-off-by: Morten Hekkvang (cherry picked from commit b85e1e2efefcc06c8de426d003fa2936f2286bb4) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 14f2858119..f18f62fc2d 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -551,7 +551,7 @@ __docker_complete_nodes() { # precedence over the environment setting. __docker_services() { local format='{{.Name}}' # default: service name only - [ "${DOCKER_COMPLETION_SHOW_SERVICE_IDS}" = yes ] && format='{{.ID}},{{.Name}}' # ID & name + [ "${DOCKER_COMPLETION_SHOW_SERVICE_IDS}" = yes ] && format='{{.ID}} {{.Name}}' # ID & name if [ "$1" = "--id" ] ; then format='{{.ID}}' # IDs only From 9447d7431b8354083e25dc5768bcba23c5256bd8 Mon Sep 17 00:00:00 2001 From: Morten Hekkvang Date: Tue, 10 Sep 2019 16:05:25 +0200 Subject: [PATCH 4/7] Move filtering to __docker_complete_services, as suggested by @albers Signed-off-by: Morten Hekkvang (cherry picked from commit 6ebcc211a7a955b93297db1f0ad96237c14691ae) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index f18f62fc2d..26823fce93 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -561,7 +561,7 @@ __docker_services() { shift fi - __docker_q service ls -q --format "$format" --filter "name=$1" + __docker_q service ls --quiet --format "$format" "$@" } # __docker_complete_services applies completion of services based on the current @@ -573,7 +573,7 @@ __docker_complete_services() { current="$2" shift 2 fi - COMPREPLY=( $(__docker_services "$@" "$current") ) + COMPREPLY=( $(__docker_services "$@" --filter "name=$current") ) } # __docker_tasks returns a list of all task IDs. From 69f0132397ba95e3a00d3b66cea905302b6a6c9b Mon Sep 17 00:00:00 2001 From: Morten Hekkvang Date: Fri, 11 Oct 2019 09:59:10 +0200 Subject: [PATCH 5/7] Fix erroneous space indentation of shell script Signed-off-by: Morten Hekkvang (cherry picked from commit fc19fb6d95da6a4496ffd170412918da3529eb99) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 26823fce93..3aacd240f7 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -561,7 +561,7 @@ __docker_services() { shift fi - __docker_q service ls --quiet --format "$format" "$@" + __docker_q service ls --quiet --format "$format" "$@" } # __docker_complete_services applies completion of services based on the current From 2fe281d17066fe5b1af336cfc3fa21844dab62c9 Mon Sep 17 00:00:00 2001 From: Trapier Marshall Date: Mon, 30 Sep 2019 11:57:00 -0400 Subject: [PATCH 6/7] Add bash completion for `builder build` Signed-off-by: Trapier Marshall (cherry picked from commit 86ae871e0a229d08e7d9746a35fa71f5305dd7d7) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 3aacd240f7..2afb6f9fc0 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1205,6 +1205,7 @@ _docker_build() { _docker_builder() { local subcommands=" + build prune " __docker_subcommands "$subcommands" && return From 57332bcea37ebd00954ad0c3d3574abea9cd3529 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sat, 5 Oct 2019 22:33:11 +0200 Subject: [PATCH 7/7] Add bash completion for `builder build` options Signed-off-by: Harald Albers (cherry picked from commit cd9b39fc524c3b5f63b99b6795216d2180b0bfba) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 2afb6f9fc0..52c7449552 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1220,6 +1220,10 @@ _docker_builder() { esac } +_docker_builder_build() { + _docker_image_build +} + _docker_builder_prune() { case "$prev" in --filter)