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

Add support for options added in 1.20.0 to bash completion 

New options:
- `docker-compose --log-level`
- `docker-compose pull --include-deps`
- `docker-compose run --use-aliases`

Signed-off-by: Harald Albers <github@albersweb.de>
This commit is contained in:
Harald Albers 2018-03-01 15:32:41 +01:00
parent 4ceeaad089
commit 7049bea1bb
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/completion/bash/docker-compose
View File

@ -179,18 +179,22 @@ _docker_compose_docker_compose() {
_filedir "y?(a)ml" _filedir "y?(a)ml"
return return
;; ;;
--log-level)
COMPREPLY=( $( compgen -W "debug info warning error critical" -- "$cur" ) )
return
;;
--project-directory) --project-directory)
_filedir -d _filedir -d
return return
;; ;;
$(__docker_compose_to_extglob "$top_level_options_with_args") ) $(__docker_compose_to_extglob "$daemon_options_with_args") )
return return
;; ;;
esac esac
case "$cur" in case "$cur" in
-*) -*)
COMPREPLY=( $( compgen -W "$top_level_boolean_options $top_level_options_with_args --help -h --no-ansi --verbose --version -v" -- "$cur" ) ) COMPREPLY=( $( compgen -W "$daemon_boolean_options $daemon_options_with_args $top_level_options_with_args --help -h --no-ansi --verbose --version -v" -- "$cur" ) )
;; ;;
*) *)
COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) ) COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
@ -375,7 +379,7 @@ _docker_compose_ps() {
_docker_compose_pull() { _docker_compose_pull() {
case "$cur" in case "$cur" in
-*) -*)
COMPREPLY=( $( compgen -W "--help --ignore-pull-failures --parallel --quiet -q" -- "$cur" ) ) COMPREPLY=( $( compgen -W "--help --ignore-pull-failures --include-deps --parallel --quiet -q" -- "$cur" ) )
;; ;;
*) *)
__docker_compose_services_from_image __docker_compose_services_from_image
@ -444,7 +448,7 @@ _docker_compose_run() {
case "$cur" in case "$cur" in
-*) -*)
COMPREPLY=( $( compgen -W "-d --detach --entrypoint -e --help --label -l --name --no-deps --publish -p --rm --service-ports -T --user -u --volume -v --workdir -w" -- "$cur" ) ) COMPREPLY=( $( compgen -W "--detach -d --entrypoint -e --help --label -l --name --no-deps --publish -p --rm --service-ports -T --use-aliases --user -u --volume -v --workdir -w" -- "$cur" ) )
;; ;;
*) *)
__docker_compose_services_all __docker_compose_services_all
@ -605,14 +609,12 @@ _docker_compose() {
# Options for the docker daemon that have to be passed to secondary calls to # Options for the docker daemon that have to be passed to secondary calls to
# docker-compose executed by this script. # docker-compose executed by this script.
# Other global otions that are not relevant for secondary calls are defined in local daemon_boolean_options="
# `_docker_compose_docker_compose`.
local top_level_boolean_options="
--skip-hostname-check --skip-hostname-check
--tls --tls
--tlsverify --tlsverify
" "
local top_level_options_with_args=" local daemon_options_with_args="
--file -f --file -f
--host -H --host -H
--project-directory --project-directory
@ -622,6 +624,11 @@ _docker_compose() {
--tlskey --tlskey
" "
# These options are require special treatment when searching the command.
local top_level_options_with_args="
--log-level
"
COMPREPLY=() COMPREPLY=()
local cur prev words cword local cur prev words cword
_get_comp_words_by_ref -n : cur prev words cword _get_comp_words_by_ref -n : cur prev words cword
@ -634,15 +641,18 @@ _docker_compose() {
while [ $counter -lt $cword ]; do while [ $counter -lt $cword ]; do
case "${words[$counter]}" in case "${words[$counter]}" in
$(__docker_compose_to_extglob "$top_level_boolean_options") ) $(__docker_compose_to_extglob "$daemon_boolean_options") )
local opt=${words[counter]} local opt=${words[counter]}
top_level_options+=($opt) top_level_options+=($opt)
;; ;;
$(__docker_compose_to_extglob "$top_level_options_with_args") ) $(__docker_compose_to_extglob "$daemon_options_with_args") )
local opt=${words[counter]} local opt=${words[counter]}
local arg=${words[++counter]} local arg=${words[++counter]}
top_level_options+=($opt $arg) top_level_options+=($opt $arg)
;; ;;
$(__docker_compose_to_extglob "$top_level_options_with_args") )
(( counter++ ))
;;
-*) -*)
;; ;;
*) *)