37bf9186a03a4e15dcccd1da76b9c6f597cc8e71

Message

Update docker completion (2015-10-25)

Closes #5568

Source:
https://github.com/docker/docker/commit/c9fdf9abf8d6443598808809b900d96e04adfcb1

Diff

This diff is truncated to protect this page.

 1diff --git a/plugins/docker/_docker b/plugins/docker/_docker
 2index 1366fd61b5af361aa7e798f8f60cb0ca6a4f165b..415e731f3be16bc75f143c2fdda0f2dafb9cf31b 100644
 3--- a/plugins/docker/_docker
 4+++ b/plugins/docker/_docker
 5@@ -57,7 +57,7 @@ __docker_get_containers() {
 6     type=$1; shift
 7     [[ $kind = (stopped|all) ]] && args=($args -a)
 8 
 9-    lines=(${(f)"$(_call_program commands docker $docker_options ps --format 'table' --no-trunc $args)"})
10+    lines=(${(f)${:-"$(_call_program commands docker $docker_options ps --format 'table' --no-trunc $args)"$'\n'}})
11 
12     # Parse header line to find columns
13     local i=1 j=1 k header=${lines[1]}
14@@ -153,7 +153,7 @@ __docker_images() {
15     [[ $PREFIX = -* ]] && return 1
16     integer ret=1
17     declare -a images
18-    images=(${${${(f)"$(_call_program commands docker $docker_options images)"}[2,-1]}/(#b)([^ ]##) ##([^ ]##) ##([^ ]##)*/${match[3]}:${(r:15:: :::)match[2]} in ${match[1]}})
19+    images=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}[2,-1]}/(#b)([^ ]##) ##([^ ]##) ##([^ ]##)*/${match[3]}:${(r:15:: :::)match[2]} in ${match[1]}})
20     _describe -t docker-images "images" images && ret=0
21     __docker_repositories_with_tags && ret=0
22     return ret
23@@ -162,7 +162,7 @@ __docker_images() {
24 __docker_repositories() {
25     [[ $PREFIX = -* ]] && return 1
26     declare -a repos
27-    repos=(${${${(f)"$(_call_program commands docker $docker_options images)"}%% *}[2,-1]})
28+    repos=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}%% *}[2,-1]})
29     repos=(${repos#<none>})
30     _describe -t docker-repos "repositories" repos
31 }
32@@ -172,7 +172,7 @@ __docker_repositories_with_tags() {
33     integer ret=1
34     declare -a repos onlyrepos matched
35     declare m
36-    repos=(${${${${(f)"$(_call_program commands docker $docker_options images)"}[2,-1]}/ ##/:::}%% *})
37+    repos=(${${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}[2,-1]}/ ##/:::}%% *})
38     repos=(${${repos%:::<none>}#<none>})
39     # Check if we have a prefix-match for the current prefix.
40     onlyrepos=(${repos%::*})
41@@ -208,7 +208,7 @@ __docker_search() {
42     if ( [[ ${(P)+cachename} -eq 0 ]] || _cache_invalid ${cachename#_} ) \
43         && ! _retrieve_cache ${cachename#_}; then
44         _message "Searching for ${searchterm}..."
45-        result=(${${${(f)"$(_call_program commands docker $docker_options search $searchterm)"}%% *}[2,-1]})
46+        result=(${${${(f)${:-"$(_call_program commands docker $docker_options search $searchterm)"$'\n'}}%% *}[2,-1]})
47         _store_cache ${cachename#_} result
48     fi
49     _wanted dockersearch expl 'available images' compadd -a result
50@@ -219,7 +219,7 @@ __docker_get_log_options() {
51 
52     integer ret=1
53     local log_driver=${opt_args[--log-driver]:-"all"}
54-    local -a awslogs_options fluentd_options gelf_options journald_options json_file_options syslog_options splunk_options
55+    local -a awslogs_options fluentd_options gelf_options journald_options json_file_options logentries_options syslog_options splunk_options
56 
57     awslogs_options=("awslogs-region" "awslogs-group" "awslogs-stream")
58     fluentd_options=("env" "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "labels" "tag")
59@@ -227,6 +227,7 @@ __docker_get_log_options() {
60     gelf_options=("env" "gelf-address" "gelf-compression-level" "gelf-compression-type" "labels" "tag")
61     journald_options=("env" "labels" "tag")
62     json_file_options=("env" "labels" "max-file" "max-size")
63+    logentries_options=("logentries-token")
64     syslog_options=("env" "labels" "syslog-address" "syslog-facility" "syslog-format" "syslog-tls-ca-cert" "syslog-tls-cert" "syslog-tls-key" "syslog-tls-skip-verify" "tag")