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

Merge pull request #14901 from albers/completion-log-opt-fixes 

Fixes to bash completion for log driver options
This commit is contained in:
David Calavera 2015-07-23 10:03:29 -07:00
parent 9e438ffb61 de40f3997a
commit 2cf9fec111
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/completion/bash/docker
View File

@ -227,15 +227,22 @@ __docker_log_drivers() {
__docker_log_driver_options() { __docker_log_driver_options() {
# see docs/reference/logging/index.md # see docs/reference/logging/index.md
local fluentd_options="fluentd-address fluentd-tag"
local gelf_options="gelf-address gelf-tag"
local syslog_options="syslog-address syslog-facility syslog-tag"
case $(__docker_value_of_option --log-driver) in case $(__docker_value_of_option --log-driver) in
'')
COMPREPLY=( $( compgen -W "$fluentd_options $gelf_options $syslog_options" -S = -- "$cur" ) )
;;
fluentd) fluentd)
COMPREPLY=( $( compgen -W "fluentd-address fluentd-tag" -S = -- "$cur" ) ) COMPREPLY=( $( compgen -W "$fluentd_options" -S = -- "$cur" ) )
;; ;;
gelf) gelf)
COMPREPLY=( $( compgen -W "gelf-address gelf-tag" -S = -- "$cur" ) ) COMPREPLY=( $( compgen -W "$gelf_options" -S = -- "$cur" ) )
;; ;;
syslog) syslog)
COMPREPLY=( $( compgen -W "syslog-address syslog-facility syslog-tag" -S = -- "$cur" ) ) COMPREPLY=( $( compgen -W "$syslog_options" -S = -- "$cur" ) )
;; ;;
*) *)
return return
@ -359,7 +366,10 @@ _docker_docker() {
COMPREPLY=( $( compgen -W "$boolean_options $main_options_with_args" -- "$cur" ) ) COMPREPLY=( $( compgen -W "$boolean_options $main_options_with_args" -- "$cur" ) )
;; ;;
*) *)
local counter="$(__docker_pos_first_nonflag $main_options_with_args_glob)"
if [ $cword -eq $counter ]; then
COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) ) COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) )
fi
;; ;;
esac esac
} }