d22189848e3549800486d009aeb7d6a692fd55be

Author
Alexey Pristavkin <pristavkin@gmail.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Update of docker completion (#6542)

Diff

 1diff --git a/plugins/docker/_docker b/plugins/docker/_docker
 2index 5d6edd88014021edaec5643f9dbe26808f379a49..0c20cf28e1164c01f4ac63586b1a104ab403fd7d 100644
 3--- a/plugins/docker/_docker
 4+++ b/plugins/docker/_docker
 5@@ -226,7 +226,7 @@ __docker_get_log_options() {
 6     common_options=("max-buffer-size" "mode")
 7     common_options2=("env" "env-regex" "labels")
 8     awslogs_options=($common_options "awslogs-create-group" "awslogs-datetime-format" "awslogs-group" "awslogs-multiline-pattern" "awslogs-region" "awslogs-stream" "tag")
 9-    fluentd_options=($common_options $common_options2 "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "tag")
10+    fluentd_options=($common_options $common_options2 "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "fluentd-sub-second-precision" "tag")
11     gcplogs_options=($common_options $common_options2 "gcp-log-cmd" "gcp-meta-id" "gcp-meta-name" "gcp-meta-zone" "gcp-project")
12     gelf_options=($common_options $common_options2 "gelf-address" "gelf-compression-level" "gelf-compression-type" "tag")
13     journald_options=($common_options $common_options2 "tag")
14@@ -745,6 +745,7 @@ __docker_container_subcommand() {
15                 "($help)--privileged[Give extended Linux capabilities to the command]" \
16                 "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
17                 "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \
18+                "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" \
19                 "($help -):containers:__docker_complete_running_containers" \
20                 "($help -)*::command:->anycommand" && ret=0
21             case $state in
22@@ -1393,7 +1394,7 @@ __docker_nodes() {
23     # Names
24     if [[ $type = (names|all) ]]; then
25         for line in $lines; do
26-            s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
27+            s="${line[${begin[HOSTNAME]},${end[HOSTNAME]}]%% ##}"
28             nodes=($nodes $s)
29         done
30     fi
31@@ -1955,6 +1956,7 @@ __docker_service_subcommand() {
32         "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)"
33         "($help)--health-timeout=[Maximum time to allow one check to run]:time: "
34         "($help)--hostname=[Service container hostname]:hostname: " \
35+        "($help)--isolation=[Service container isolation mode]:isolation:(default process hyperv)" \
36         "($help)*--label=[Service labels]:label: "
37         "($help)--limit-cpu=[Limit CPUs]:value: "
38         "($help)--limit-memory=[Limit Memory]:value: "
39@@ -2168,9 +2170,9 @@ __docker_stacks() {
40     end[${header[$i,$((j-1))]}]=-1
41     lines=(${lines[2,-1]})
42 
43-    # Service ID
44+    # Service NAME
45     for line in $lines; do
46-        s="${line[${begin[ID]},${end[ID]}]%% ##}"
47+        s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
48         stacks=($stacks $s)
49     done
50 
51@@ -2631,7 +2633,6 @@ __docker_subcommand() {
52                 "($help)--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: " \
53                 "($help)--default-shm-size=[Default shm size for containers]:size:" \
54                 "($help)*--default-ulimit=[Default ulimits for containers]:ulimit: " \
55-                "($help)--disable-legacy-registry[Disable contacting legacy registries (default true)]" \
56                 "($help)*--dns=[DNS server to use]:DNS: " \
57                 "($help)*--dns-opt=[DNS options to use]:DNS option: " \
58                 "($help)*--dns-search=[DNS search domains to use]:DNS search: " \
59@@ -3023,4 +3024,4 @@ _docker "$@"
60 # indent-tabs-mode: nil
61 # sh-basic-offset: 4
62 # End:
63-# vim: ft=zsh sw=4 ts=4 et
64+# vim: ft=zsh sw=4 ts=4 et