Commit d2218984 authored by Alexey Pristavkin's avatar Alexey Pristavkin Committed by Robby Russell
Browse files

Update of docker completion (#6542)

parent f6a4e37e
...@@ -226,7 +226,7 @@ __docker_get_log_options() { ...@@ -226,7 +226,7 @@ __docker_get_log_options() {
common_options=("max-buffer-size" "mode") common_options=("max-buffer-size" "mode")
common_options2=("env" "env-regex" "labels") common_options2=("env" "env-regex" "labels")
awslogs_options=($common_options "awslogs-create-group" "awslogs-datetime-format" "awslogs-group" "awslogs-multiline-pattern" "awslogs-region" "awslogs-stream" "tag") awslogs_options=($common_options "awslogs-create-group" "awslogs-datetime-format" "awslogs-group" "awslogs-multiline-pattern" "awslogs-region" "awslogs-stream" "tag")
fluentd_options=($common_options $common_options2 "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "tag") 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")
gcplogs_options=($common_options $common_options2 "gcp-log-cmd" "gcp-meta-id" "gcp-meta-name" "gcp-meta-zone" "gcp-project") gcplogs_options=($common_options $common_options2 "gcp-log-cmd" "gcp-meta-id" "gcp-meta-name" "gcp-meta-zone" "gcp-project")
gelf_options=($common_options $common_options2 "gelf-address" "gelf-compression-level" "gelf-compression-type" "tag") gelf_options=($common_options $common_options2 "gelf-address" "gelf-compression-level" "gelf-compression-type" "tag")
journald_options=($common_options $common_options2 "tag") journald_options=($common_options $common_options2 "tag")
...@@ -745,6 +745,7 @@ __docker_container_subcommand() { ...@@ -745,6 +745,7 @@ __docker_container_subcommand() {
"($help)--privileged[Give extended Linux capabilities to the command]" \ "($help)--privileged[Give extended Linux capabilities to the command]" \
"($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \ "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
"($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \ "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \
"($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" \
"($help -):containers:__docker_complete_running_containers" \ "($help -):containers:__docker_complete_running_containers" \
"($help -)*::command:->anycommand" && ret=0 "($help -)*::command:->anycommand" && ret=0
case $state in case $state in
...@@ -1393,7 +1394,7 @@ __docker_nodes() { ...@@ -1393,7 +1394,7 @@ __docker_nodes() {
# Names # Names
if [[ $type = (names|all) ]]; then if [[ $type = (names|all) ]]; then
for line in $lines; do for line in $lines; do
s="${line[${begin[NAME]},${end[NAME]}]%% ##}" s="${line[${begin[HOSTNAME]},${end[HOSTNAME]}]%% ##}"
nodes=($nodes $s) nodes=($nodes $s)
done done
fi fi
...@@ -1955,6 +1956,7 @@ __docker_service_subcommand() { ...@@ -1955,6 +1956,7 @@ __docker_service_subcommand() {
"($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)" "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)"
"($help)--health-timeout=[Maximum time to allow one check to run]:time: " "($help)--health-timeout=[Maximum time to allow one check to run]:time: "
"($help)--hostname=[Service container hostname]:hostname: " \ "($help)--hostname=[Service container hostname]:hostname: " \
"($help)--isolation=[Service container isolation mode]:isolation:(default process hyperv)" \
"($help)*--label=[Service labels]:label: " "($help)*--label=[Service labels]:label: "
"($help)--limit-cpu=[Limit CPUs]:value: " "($help)--limit-cpu=[Limit CPUs]:value: "
"($help)--limit-memory=[Limit Memory]:value: " "($help)--limit-memory=[Limit Memory]:value: "
...@@ -2168,9 +2170,9 @@ __docker_stacks() { ...@@ -2168,9 +2170,9 @@ __docker_stacks() {
end[${header[$i,$((j-1))]}]=-1 end[${header[$i,$((j-1))]}]=-1
lines=(${lines[2,-1]}) lines=(${lines[2,-1]})
# Service ID # Service NAME
for line in $lines; do for line in $lines; do
s="${line[${begin[ID]},${end[ID]}]%% ##}" s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
stacks=($stacks $s) stacks=($stacks $s)
done done
...@@ -2631,7 +2633,6 @@ __docker_subcommand() { ...@@ -2631,7 +2633,6 @@ __docker_subcommand() {
"($help)--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: " \ "($help)--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: " \
"($help)--default-shm-size=[Default shm size for containers]:size:" \ "($help)--default-shm-size=[Default shm size for containers]:size:" \
"($help)*--default-ulimit=[Default ulimits for containers]:ulimit: " \ "($help)*--default-ulimit=[Default ulimits for containers]:ulimit: " \
"($help)--disable-legacy-registry[Disable contacting legacy registries (default true)]" \
"($help)*--dns=[DNS server to use]:DNS: " \ "($help)*--dns=[DNS server to use]:DNS: " \
"($help)*--dns-opt=[DNS options to use]:DNS option: " \ "($help)*--dns-opt=[DNS options to use]:DNS option: " \
"($help)*--dns-search=[DNS search domains to use]:DNS search: " \ "($help)*--dns-search=[DNS search domains to use]:DNS search: " \
...@@ -3023,4 +3024,4 @@ _docker "$@" ...@@ -3023,4 +3024,4 @@ _docker "$@"
# indent-tabs-mode: nil # indent-tabs-mode: nil
# sh-basic-offset: 4 # sh-basic-offset: 4
# End: # End:
# vim: ft=zsh sw=4 ts=4 et # vim: ft=zsh sw=4 ts=4 et
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment