41eedd37005f6b3668fcebe2a5f5a26324753519

Message

Update Docker completion plugin (#6410)

Diff

This diff is truncated to protect this page.

 1diff --git a/plugins/docker/README.md b/plugins/docker/README.md
 2index 1615f75f5fe57e988e404de5ba1e3108ece602cf..e91798485da030f021bbe86716591461cd44e1fb 100644
 3--- a/plugins/docker/README.md
 4+++ b/plugins/docker/README.md
 5@@ -1,5 +1,5 @@
 6 ## Docker autocomplete plugin
 7 
 8 A copy of the completion script from the
 9-[docker](https://github.com/docker/docker/tree/master/contrib/completion/zsh)
10+[docker/cli](https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker)
11 git repo.
12diff --git a/plugins/docker/_docker b/plugins/docker/_docker
13index 1aec353c57b0c674051bb1798b2f333d501e0574..5d6edd88014021edaec5643f9dbe26808f379a49 100644
14--- a/plugins/docker/_docker
15+++ b/plugins/docker/_docker
16@@ -78,7 +78,7 @@ __docker_get_containers() {
17             s="${${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}[0,12]}"
18             s="$s:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
19             s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
20-            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
21+            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = (Exit*|Created*) ]]; then
22                 stopped=($stopped $s)
23             else
24                 running=($running $s)
25@@ -100,7 +100,7 @@ __docker_get_containers() {
26             (( $#s != 0 )) || continue
27             s="$s:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
28             s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
29-            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
30+            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = (Exit*|Created*) ]]; then
31                 stopped=($stopped $s)
32             else
33                 running=($running $s)
34@@ -221,17 +221,19 @@ __docker_get_log_options() {
35 
36     integer ret=1
37     local log_driver=${opt_args[--log-driver]:-"all"}
38-    local -a awslogs_options fluentd_options gelf_options journald_options json_file_options logentries_options syslog_options splunk_options
39-
40-    awslogs_options=("awslogs-region" "awslogs-group" "awslogs-stream")
41-    fluentd_options=("env" "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "labels" "tag")
42-    gcplogs_options=("env" "gcp-log-cmd" "gcp-project" "labels")
43-    gelf_options=("env" "gelf-address" "gelf-compression-level" "gelf-compression-type" "labels" "tag")
44-    journald_options=("env" "labels" "tag")
45-    json_file_options=("env" "labels" "max-file" "max-size")
46-    logentries_options=("logentries-token")
47-    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")