Ver código fonte

bash completion for syslog over TLS log driver

Signed-off-by: Harald Albers <github@albersweb.de>
Harald Albers 9 anos atrás
pai
commit
6723c8aa26
1 arquivos alterados com 11 adições e 2 exclusões
  1. 11 2
      contrib/completion/bash/docker

+ 11 - 2
contrib/completion/bash/docker

@@ -409,7 +409,7 @@ __docker_complete_log_options() {
 	local gelf_options="env gelf-address labels tag"
 	local gelf_options="env gelf-address labels tag"
 	local journald_options="env labels"
 	local journald_options="env labels"
 	local json_file_options="env labels max-file max-size"
 	local json_file_options="env labels max-file max-size"
-	local syslog_options="syslog-address syslog-facility tag"
+	local syslog_options="syslog-address syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify syslog-facility tag"
 	local splunk_options="env labels splunk-caname splunk-capath splunk-index splunk-insecureskipverify splunk-source splunk-sourcetype splunk-token splunk-url tag"
 	local splunk_options="env labels splunk-caname splunk-capath splunk-index splunk-insecureskipverify splunk-source splunk-sourcetype splunk-token splunk-url tag"
 
 
 	local all_options="$fluentd_options $gelf_options $journald_options $json_file_options $syslog_options $splunk_options"
 	local all_options="$fluentd_options $gelf_options $journald_options $json_file_options $syslog_options $splunk_options"
@@ -457,8 +457,9 @@ __docker_complete_log_driver_options() {
 			return
 			return
 			;;
 			;;
 		*syslog-address=*)
 		*syslog-address=*)
-			COMPREPLY=( $( compgen -W "tcp udp unix" -S "://" -- "${cur#=}" ) )
+			COMPREPLY=( $( compgen -W "tcp:// tcp+tls:// udp:// unix://" -- "${cur#=}" ) )
 			__docker_nospace
 			__docker_nospace
+			__ltrim_colon_completions "${cur}"
 			return
 			return
 			;;
 			;;
 		*syslog-facility=*)
 		*syslog-facility=*)
@@ -486,6 +487,14 @@ __docker_complete_log_driver_options() {
 			" -- "${cur#=}" ) )
 			" -- "${cur#=}" ) )
 			return
 			return
 			;;
 			;;
+		*syslog-tls-@(ca-cert|cert|key)=*)
+			_filedir
+			return
+			;;
+		*syslog-tls-skip-verify=*)
+			COMPREPLY=( $( compgen -W "true" -- "${cur#=}" ) )
+			return
+			;;
 		*splunk-url=*)
 		*splunk-url=*)
 			COMPREPLY=( $( compgen -W "http:// https://" -- "${cur#=}" ) )
 			COMPREPLY=( $( compgen -W "http:// https://" -- "${cur#=}" ) )
 			compopt -o nospace
 			compopt -o nospace