From c231c381fe68564e1dcd185eeddf4844aa255c2f Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 8 Nov 2017 13:54:51 +0100 Subject: [PATCH 1/2] Add support for GELF tcp connections to bash completion Signed-off-by: Harald Albers --- contrib/completion/bash/docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 4a835239ba..a3730991d9 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -837,7 +837,7 @@ __docker_complete_log_options() { local fluentd_options="$common_options1 $common_options2 fluentd-address fluentd-async-connect fluentd-buffer-limit fluentd-retry-wait fluentd-max-retries tag" 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 tag" + 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 logentries_options="$common_options1 $common_options2 logentries-token tag" @@ -897,7 +897,7 @@ __docker_complete_log_driver_options() { return ;; gelf-address) - COMPREPLY=( $( compgen -W "udp" -S "://" -- "${cur##*=}" ) ) + COMPREPLY=( $( compgen -W "tcp udp" -S "://" -- "${cur##*=}" ) ) __docker_nospace return ;; From 1390ae602262ea451da89f395be00beb435bde7f Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 8 Nov 2017 14:07:05 +0100 Subject: [PATCH 2/2] Add `--log-opt awslogs-credentials-endpoint` to bash completion Signed-off-by: Harald Albers --- contrib/completion/bash/docker | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index a3730991d9..38a77d3956 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -833,7 +833,7 @@ __docker_complete_log_options() { local common_options2="env env-regex labels" # awslogs does not implement the $common_options2. - local awslogs_options="$common_options1 awslogs-create-group awslogs-datetime-format awslogs-group awslogs-multiline-pattern awslogs-region awslogs-stream tag" + local awslogs_options="$common_options1 awslogs-create-group awslogs-credentials-endpoint awslogs-datetime-format awslogs-group awslogs-multiline-pattern awslogs-region awslogs-stream tag" local fluentd_options="$common_options1 $common_options2 fluentd-address fluentd-async-connect fluentd-buffer-limit fluentd-retry-wait fluentd-max-retries tag" local gcplogs_options="$common_options1 $common_options2 gcp-log-cmd gcp-meta-id gcp-meta-name gcp-meta-zone gcp-project" @@ -892,6 +892,11 @@ __docker_complete_log_driver_options() { COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) ) return ;; + awslogs-credentials-endpoint) + COMPREPLY=( $( compgen -W "/" -- "${cur##*=}" ) ) + __docker_nospace + return + ;; fluentd-async-connect) COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) ) return