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

Merge pull request #353 from albers/completion-nodelist 

Use native formatting in bash completion of nodes
This commit is contained in:
Daniel Nephin 2017-09-05 15:09:00 -04:00 committed by GitHub
parent 5c5cdd0e36 e391e34801
commit 0426ea1443
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/completion/bash/docker
View File

@ -441,18 +441,23 @@ __docker_complete_stacks() {
# precedence over the environment setting. # precedence over the environment setting.
# Completions may be added with `--add`, e.g. `--add self`. # Completions may be added with `--add`, e.g. `--add self`.
__docker_nodes() { __docker_nodes() {
local format
if [ "$DOCKER_COMPLETION_SHOW_NODE_IDS" = yes ] ; then
format='{{.ID}} {{.Hostname}}'
else
format='{{.Hostname}}'
fi
local add=() local add=()
local fields='$2' # default: node name only
[ "${DOCKER_COMPLETION_SHOW_NODE_IDS}" = yes ] && fields='$1,$2' # ID and name
while true ; do while true ; do
case "$1" in case "$1" in
--id) --id)
fields='$1' # IDs only format='{{.ID}}'
shift shift
;; ;;
--name) --name)
fields='$2' # names only format='{{.Hostname}}'
shift shift
;; ;;
--add) --add)
@ -465,7 +470,7 @@ __docker_nodes() {
esac esac
done done
echo "$(__docker_q node ls "$@" | tr -d '*' | awk "NR>1 {print $fields}")" "${add[@]}" echo "$(__docker_q node ls --format "$format" "$@")" "${add[@]}"
} }
# __docker_complete_nodes applies completion of nodes based on the current # __docker_complete_nodes applies completion of nodes based on the current