p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #15208 from albers/daemon-completion-fixes

Browse Source 
Fixes to bash completion for docker daemon
Upstream-commit: ce99a462f82f163afb486abb6804c7293f09324a
Component: engine
This commit is contained in:
Tianon Gravi
2015-07-31 11:56:11 -07:00
parent f32577e8c4 6739612157
commit cd6fed98de
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
components/engine/contrib/completion/bash/docker
View File

@ -295,6 +295,10 @@ __docker_complete_log_driver_options() {
return 1
}
__docker_log_levels() {
COMPREPLY=( $( compgen -W "debug info warn error fatal" -- "$cur" ) )
}
# a selection of the available signals that is most likely of interest in the
# context of docker containers.
__docker_signals() {
@ -315,16 +319,14 @@ __docker_signals() {
# global options that may appear after the docker command
_docker_docker() {
local boolean_options="
--debug -D
$global_boolean_options
--help -h
--tls
--tlsverify
--version -v
"
case "$prev" in
--log-level|-l)
COMPREPLY=( $( compgen -W "debug info warn error fatal" -- "$cur" ) )
__docker_log_levels
return
;;
$(__docker_to_extglob "$global_options_with_args") )
@ -339,7 +341,7 @@ _docker_docker() {
COMPREPLY=( $( compgen -W "$boolean_options $global_options_with_args" -- "$cur" ) )
;;
*)
local counter="$(__docker_pos_first_nonflag $main_options_with_args_glob)"
local counter=$( __docker_pos_first_nonflag $(__docker_to_extglob "$global_options_with_args") )
if [ $cword -eq $counter ]; then
COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) )
fi
@ -453,6 +455,7 @@ _docker_create() {
_docker_daemon() {
local boolean_options="
$global_boolean_options
--help -h
--icc=false
--ip-forward=false
@ -463,6 +466,7 @@ _docker_daemon() {
--userland-proxy=false
"
local options_with_args="
$global_options_with_args
--api-cors-header
--bip
--bridge -b
@ -507,6 +511,10 @@ _docker_daemon() {
COMPREPLY=( $( compgen -W "aufs devicemapper btrfs overlay" -- "$(echo $cur | tr '[:upper:]' '[:lower:]')" ) )
return
;;
--log-level|-l)
__docker_log_levels
return
;;
--log-opt)
__docker_log_driver_options
return
@ -514,7 +522,6 @@ _docker_daemon() {
$(__docker_to_extglob "$options_with_args") )
return
;;
$main_options_with_args_glob )
esac
case "$cur" in
@ -1370,6 +1377,13 @@ _docker() {
wait
)
# These options are valid as global options for all client commands
# and valid as command options for `docker daemon`
local global_boolean_options="
--debug -D
--tls
--tlsverify
"
local global_options_with_args="
--host -H
--log-level -l