From f0885d1fabc2e2dbf39fb6a10ea842e9b8c1dac3 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sun, 2 Dec 2018 19:07:12 +0100 Subject: [PATCH 1/2] Add bash completion for "local" log driver Ref: https://github.com/moby/moby/pull/37092 Also adds log-opt `compress` to json-file log driver because this was also added in the referenced PR. Signed-off-by: Harald Albers (cherry picked from commit c59038b15c4fd2a796665925dec1cbb5993d4501) Signed-off-by: Sebastiaan van Stijn Upstream-commit: e05745b4a55bb9a7d5e5d01eb614949ab1d8e897 Component: cli --- components/cli/contrib/completion/bash/docker | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 54cd8394d4..8643f0e1cf 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -881,6 +881,7 @@ __docker_complete_log_drivers() { gelf journald json-file + local logentries none splunk @@ -904,7 +905,8 @@ __docker_complete_log_options() { local gcplogs_options="$common_options1 $common_options2 gcp-log-cmd gcp-meta-id gcp-meta-name gcp-meta-zone gcp-project" local gelf_options="$common_options1 $common_options2 gelf-address gelf-compression-level gelf-compression-type gelf-tcp-max-reconnect gelf-tcp-reconnect-delay tag" local journald_options="$common_options1 $common_options2 tag" - local json_file_options="$common_options1 $common_options2 max-file max-size" + local json_file_options="$common_options1 $common_options2 compress max-file max-size" + local local_options="$common_options1 compress max-file max-size" local logentries_options="$common_options1 $common_options2 line-only logentries-token tag" local splunk_options="$common_options1 $common_options2 splunk-caname splunk-capath splunk-format splunk-gzip splunk-gzip-level splunk-index splunk-insecureskipverify splunk-source splunk-sourcetype splunk-token splunk-url splunk-verify-connection tag" local syslog_options="$common_options1 $common_options2 syslog-address syslog-facility syslog-format syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify tag" @@ -933,6 +935,9 @@ __docker_complete_log_options() { json-file) COMPREPLY=( $( compgen -W "$json_file_options" -S = -- "$cur" ) ) ;; + local) + COMPREPLY=( $( compgen -W "$local_options" -S = -- "$cur" ) ) + ;; logentries) COMPREPLY=( $( compgen -W "$logentries_options" -S = -- "$cur" ) ) ;; @@ -962,7 +967,7 @@ __docker_complete_log_driver_options() { __docker_nospace return ;; - fluentd-async-connect) + compress|fluentd-async-connect) COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) ) return ;; From 0cbda9f76220b10212230071773283a0ff2cfcaf Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sat, 1 Dec 2018 23:30:30 +0100 Subject: [PATCH 2/2] Add bash completion for `import --platform` Signed-off-by: Harald Albers (cherry picked from commit e0fe546c376170a656b17b92a8437312e856ba8f) Signed-off-by: Sebastiaan van Stijn Upstream-commit: bcadc9061c8248720a7823ca10bc11d112043a24 Component: cli --- components/cli/contrib/completion/bash/docker | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 54cd8394d4..ac973fe557 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -2681,14 +2681,16 @@ _docker_image_images() { _docker_image_import() { case "$prev" in - --change|-c|--message|-m) + --change|-c|--message|-m|--platform) return ;; esac case "$cur" in -*) - COMPREPLY=( $( compgen -W "--change -c --help --message -m" -- "$cur" ) ) + local options="--change -c --help --message -m" + __docker_server_is_experimental && options+=" --platform" + COMPREPLY=( $( compgen -W "$options" -- "$cur" ) ) ;; *) local counter=$(__docker_pos_first_nonflag '--change|-c|--message|-m')