From cbb44b1a1462cefe3a1e02c75e36d527af3ff245 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andree88@gmail.com>
Date: Sat, 26 Mar 2016 21:41:32 -0700
Subject: [PATCH 01/13] fix broken zsh autocomplete for version 2
docker-compose files
This has the added benefit of making autocompletion work when the
docker-compose config file is in a parent directory.
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 0da217dcb..f75d412d8 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -19,26 +19,13 @@
# * @felixr docker zsh completion script : https://github.com/felixr/docker-zsh-completion
# -------------------------------------------------------------------------
-# For compatibility reasons, Compose and therefore its completion supports several
-# stack compositon files as listed here, in descending priority.
-# Support for these filenames might be dropped in some future version.
-__docker-compose_compose_file() {
- local file
- for file in docker-compose.y{,a}ml ; do
- [ -e $file ] && {
- echo $file
- return
- }
- done
- echo docker-compose.yml
-}
-
# Extracts all service names from docker-compose.yml.
___docker-compose_all_services_in_compose_file() {
local already_selected
local -a services
already_selected=$(echo $words | tr " " "|")
- awk -F: '/^[a-zA-Z0-9]/{print $1}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | grep -Ev "$already_selected"
+ docker-compose config --services 2>/dev/null \
+ | grep -Ev "$already_selected"
}
# All services, even those without an existing container
@@ -57,7 +44,12 @@ ___docker-compose_services_with_key() {
local -a buildable
already_selected=$(echo $words | tr " " "|")
# flatten sections to one line, then filter lines containing the key and return section name.
- awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' 2>/dev/null | grep -Ev "$already_selected"
+ docker-compose config 2>/dev/null \
+ | sed -n -e '/^services:/,/^[^ ]/p' \
+ | sed -n 's/^ //p' \
+ | awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
+ | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' \
+ | grep -Ev "$already_selected"
}
# All services that are defined by a Dockerfile reference
From b3d9652cc303e20a991267cc7cea4b553739df17 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:45:55 -0700
Subject: [PATCH 02/13] zsh autocomplete: add missing docker-compose base flags
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index f75d412d8..1286b21ce 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -358,10 +358,17 @@ _docker-compose() {
_arguments -C \
'(- :)'{-h,--help}'[Get help]' \
- '--verbose[Show more output]' \
- '(- :)'{-v,--version}'[Print version and exit]' \
'(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
'(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
+ '--verbose[Show more output]' \
+ '(- :)'{-v,--version}'[Print version and exit]' \
+ '(-H --host)'{-H,--host}'[Daemon socket to connect to]:host:' \
+ '--tls[Use TLS; implied by --tlsverify]' \
+ '--tlscacert=[Trust certs signed only by this CA]:ca path:' \
+ '--tlscert=[Path to TLS certificate file]:client cert path:' \
+ '--tlskey=[Path to TLS key file]:tls key path:' \
+ '--tlsverify[Use TLS and verify the remote]' \
+ "--skip-hostname-check[Don't check the daemon's hostname against the name specified in the client certificate (for example if your docker host is an IP address)]" \
'(-): :->command' \
'(-)*:: :->option-or-argument' && ret=0
From 73a1b60ced0ae7974aa86484032c7122e0aa708f Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:47:40 -0700
Subject: [PATCH 03/13] zsh autocomplete: add missing 'remove-orphans' flag for
'up' and 'down'
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 1286b21ce..b5e447622 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -207,7 +207,8 @@ __docker-compose_subcommand() {
_arguments \
$opts_help \
"--rmi[Remove images, type may be one of: 'all' to remove all images, or 'local' to remove only images that don't have an custom name set by the 'image' field]:type:(all local)" \
- '(-v --volumes)'{-v,--volumes}"[Remove data volumes]" && ret=0
+ '(-v --volumes)'{-v,--volumes}"[Remove data volumes]" \
+ '--remove-orphans[Remove containers for services not defined in the Compose file]' && ret=0
;;
(events)
_arguments \
@@ -329,6 +330,7 @@ __docker-compose_subcommand() {
"--no-build[Don't build an image, even if it's missing]" \
"(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
'(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+ "--remove-orphans[Remove containers for services not defined in the Compose file]" \
'*:services:__docker-compose_services_all' && ret=0
;;
(version)
From eb10f41d13affd1f901fb37230a6868ef58f3610 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:49:48 -0700
Subject: [PATCH 04/13] zsh autocomplete: fix incorrect flag exclusions for
'create' and 'up'
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index b5e447622..2b82d4eb0 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -198,9 +198,9 @@ __docker-compose_subcommand() {
(create)
_arguments \
$opts_help \
- "(--no-recreate --no-build)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
- "(--force-recreate)--no-build[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
- "(--force-recreate)--no-recreate[Don't build an image, even if it's missing]" \
+ "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
+ "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
+ "--no-build[Don't build an image, even if it's missing.]" \
'*:services:__docker-compose_services_all' && ret=0
;;
(down)
@@ -325,9 +325,9 @@ __docker-compose_subcommand() {
'--build[Build images before starting containers.]' \
'--no-color[Produce monochrome output.]' \
"--no-deps[Don't start linked services.]" \
- "--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
- "--no-recreate[If containers already exist, don't recreate them.]" \
- "--no-build[Don't build an image, even if it's missing]" \
+ "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
+ "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
+ "--no-build[Don't build an image, even if it's missing.]" \
"(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
'(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
"--remove-orphans[Remove containers for services not defined in the Compose file]" \
From 8d2fbe3a555c21c427ffd31b5a85fa77b926853f Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:53:50 -0700
Subject: [PATCH 05/13] zsh autocomplete: add 'build' flag for 'create' and
'up'
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 2b82d4eb0..b6cdb0a65 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -200,7 +200,8 @@ __docker-compose_subcommand() {
$opts_help \
"(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
"(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
- "--no-build[Don't build an image, even if it's missing.]" \
+ "(--build)--no-build[Don't build an image, even if it's missing.]" \
+ "(--no-build)--build[Build images before creating containers.]" \
'*:services:__docker-compose_services_all' && ret=0
;;
(down)
@@ -322,12 +323,12 @@ __docker-compose_subcommand() {
_arguments \
$opts_help \
'(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names.]' \
- '--build[Build images before starting containers.]' \
'--no-color[Produce monochrome output.]' \
"--no-deps[Don't start linked services.]" \
"(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
"(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
- "--no-build[Don't build an image, even if it's missing.]" \
+ "(--build)--no-build[Don't build an image, even if it's missing.]" \
+ "(--no-build)--build[Build images before starting containers.]" \
"(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
'(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
"--remove-orphans[Remove containers for services not defined in the Compose file]" \
From 1b5a94f4e413bd59312795302602ca98da69ce31 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 26 Apr 2016 07:56:51 -0700
Subject: [PATCH 06/13] zsh autocomplete: bring flag help texts up to date
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 28 +++++++++++++-------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index b6cdb0a65..54bea10ef 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -185,7 +185,7 @@ __docker-compose_subcommand() {
_arguments \
$opts_help \
'--force-rm[Always remove intermediate containers.]' \
- '--no-cache[Do not use cache when building the image]' \
+ '--no-cache[Do not use cache when building the image.]' \
'--pull[Always attempt to pull a newer version of the image.]' \
'*:services:__docker-compose_services_from_build' && ret=0
;;
@@ -207,14 +207,14 @@ __docker-compose_subcommand() {
(down)
_arguments \
$opts_help \
- "--rmi[Remove images, type may be one of: 'all' to remove all images, or 'local' to remove only images that don't have an custom name set by the 'image' field]:type:(all local)" \
- '(-v --volumes)'{-v,--volumes}"[Remove data volumes]" \
+ "--rmi[Remove images. Type must be one of: 'all': Remove all images used by any service. 'local': Remove only images that don't have a custom tag set by the \`image\` field.]:type:(all local)" \
+ '(-v --volumes)'{-v,--volumes}"[Remove named volumes declared in the \`volumes\` section of the Compose file and anonymous volumes attached to containers.]" \
'--remove-orphans[Remove containers for services not defined in the Compose file]' && ret=0
;;
(events)
_arguments \
$opts_help \
- '--json[Output events as a stream of json objects.]' \
+ '--json[Output events as a stream of json objects]' \
'*:services:__docker-compose_services_all' && ret=0
;;
(exec)
@@ -224,7 +224,7 @@ __docker-compose_subcommand() {
'--privileged[Give extended privileges to the process.]' \
'--user=[Run the command as this user.]:username:_users' \
'-T[Disable pseudo-tty allocation. By default `docker-compose exec` allocates a TTY.]' \
- '--index=[Index of the container if there are multiple instances of a service (default: 1)]:index: ' \
+ '--index=[Index of the container if there are multiple instances of a service \[default: 1\]]:index: ' \
'(-):running services:__docker-compose_runningservices' \
'(-):command: _command_names -e' \
'*::arguments: _normal' && ret=0
@@ -255,8 +255,8 @@ __docker-compose_subcommand() {
(port)
_arguments \
$opts_help \
- '--protocol=-[tcp or udap (defaults to tcp)]:protocol:(tcp udp)' \
- '--index=-[index of the container if there are mutiple instances of a service (defaults to 1)]:index: ' \
+ '--protocol=[tcp or udp \[default: tcp\]]:protocol:(tcp udp)' \
+ '--index=[index of the container if there are multiple instances of a service \[default: 1\]]:index: ' \
'1:running services:__docker-compose_runningservices' \
'2:port:_ports' && ret=0
;;
@@ -276,7 +276,7 @@ __docker-compose_subcommand() {
_arguments \
$opts_help \
'(-f --force)'{-f,--force}"[Don't ask to confirm removal]" \
- '-v[Remove volumes associated with containers]' \
+ '-v[Remove any anonymous volumes attached to containers]' \
'*:stopped services:__docker-compose_stoppedservices' && ret=0
;;
(run)
@@ -285,14 +285,14 @@ __docker-compose_subcommand() {
'-d[Detached mode: Run container in the background, print new container name.]' \
'*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
'--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
- '--name[Assign a name to the container]:name: ' \
+ '--name=[Assign a name to the container]:name: ' \
"--no-deps[Don't start linked services.]" \
- '(-p --publish)'{-p,--publish=-}"[Run command with manually mapped container's port(s) to the host.]" \
+ '(-p --publish)'{-p,--publish=}"[Publish a container's port(s) to the host]" \
'--rm[Remove container after run. Ignored in detached mode.]' \
"--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
'-T[Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.]' \
- '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \
- '(-w --workdir)'{-w=,--workdir=}'[Working directory inside the container]:workdir: ' \
+ '(-u --user)'{-u,--user=}'[Run as specified username or uid]:username or uid:_users' \
+ '(-w --workdir)'{-w,--workdir=}'[Working directory inside the container]:workdir: ' \
'(-):services:__docker-compose_services' \
'(-):command: _command_names -e' \
'*::arguments: _normal' && ret=0
@@ -322,7 +322,7 @@ __docker-compose_subcommand() {
(up)
_arguments \
$opts_help \
- '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names.]' \
+ '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names. Incompatible with --abort-on-container-exit.]' \
'--no-color[Produce monochrome output.]' \
"--no-deps[Don't start linked services.]" \
"(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
@@ -330,7 +330,7 @@ __docker-compose_subcommand() {
"(--build)--no-build[Don't build an image, even if it's missing.]" \
"(--no-build)--build[Build images before starting containers.]" \
"(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
- '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+ '(-t --timeout)'{-t,--timeout}"[Use this timeout in seconds for container shutdown when attached or when containers are already running. (default: 10)]:seconds: " \
"--remove-orphans[Remove containers for services not defined in the Compose file]" \
'*:services:__docker-compose_services_all' && ret=0
;;
From 97ba14c82adecef3a9538e434d85c1e213ab2e38 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andree88@gmail.com>
Date: Sat, 26 Mar 2016 23:17:00 -0700
Subject: [PATCH 07/13] zsh autocomplete: use two underscores for all function
names
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 54bea10ef..e6990b77e 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -20,7 +20,7 @@
# -------------------------------------------------------------------------
# Extracts all service names from docker-compose.yml.
-___docker-compose_all_services_in_compose_file() {
+__docker-compose_all_services_in_compose_file() {
local already_selected
local -a services
already_selected=$(echo $words | tr " " "|")
@@ -32,14 +32,14 @@ ___docker-compose_all_services_in_compose_file() {
__docker-compose_services_all() {
[[ $PREFIX = -* ]] && return 1
integer ret=1
- services=$(___docker-compose_all_services_in_compose_file)
+ services=$(__docker-compose_all_services_in_compose_file)
_alternative "args:services:($services)" && ret=0
return ret
}
# All services that have an entry with the given key in their docker-compose.yml section
-___docker-compose_services_with_key() {
+__docker-compose_services_with_key() {
local already_selected
local -a buildable
already_selected=$(echo $words | tr " " "|")
@@ -56,7 +56,7 @@ ___docker-compose_services_with_key() {
__docker-compose_services_from_build() {
[[ $PREFIX = -* ]] && return 1
integer ret=1
- buildable=$(___docker-compose_services_with_key build)
+ buildable=$(__docker-compose_services_with_key build)
_alternative "args:buildable services:($buildable)" && ret=0
return ret
@@ -66,7 +66,7 @@ __docker-compose_services_from_build() {
__docker-compose_services_from_image() {
[[ $PREFIX = -* ]] && return 1
integer ret=1
- pullable=$(___docker-compose_services_with_key image)
+ pullable=$(__docker-compose_services_with_key image)
_alternative "args:pullable services:($pullable)" && ret=0
return ret
From d990f7899c921260876d93ec42444bc8fcb08e37 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andree88@gmail.com>
Date: Sun, 27 Mar 2016 02:33:16 -0700
Subject: [PATCH 08/13] zsh autocomplete: pass all relevant flags to
docker-compose/docker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
For autocomplete to work properly, we need to pass along some flags when
calling docker (--host, --tls, …) and docker-compose (--file, --tls, …).
Previously flags would only be passed to docker-compose, and the only
flags passed were --file and --project-name.
This commit makes sure that all relevant flags are passed to both
docker-compose and docker.
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 50 ++++++++++++++++++++++----
1 file changed, 44 insertions(+), 6 deletions(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index e6990b77e..eeed07a66 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -19,12 +19,16 @@
# * @felixr docker zsh completion script : https://github.com/felixr/docker-zsh-completion
# -------------------------------------------------------------------------
+__docker-compose_q() {
+ docker-compose 2>/dev/null $compose_options "$@"
+}
+
# Extracts all service names from docker-compose.yml.
__docker-compose_all_services_in_compose_file() {
local already_selected
local -a services
already_selected=$(echo $words | tr " " "|")
- docker-compose config --services 2>/dev/null \
+ __docker-compose_q config --services \
| grep -Ev "$already_selected"
}
@@ -44,7 +48,7 @@ __docker-compose_services_with_key() {
local -a buildable
already_selected=$(echo $words | tr " " "|")
# flatten sections to one line, then filter lines containing the key and return section name.
- docker-compose config 2>/dev/null \
+ __docker-compose_q config \
| sed -n -e '/^services:/,/^[^ ]/p' \
| sed -n 's/^ //p' \
| awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
@@ -88,7 +92,7 @@ __docker-compose_get_services() {
shift
[[ $kind =~ (stopped|all) ]] && args=($args -a)
- lines=(${(f)"$(_call_program commands docker ps $args)"})
+ lines=(${(f)"$(_call_program commands docker $docker_options ps $args)"})
services=(${(f)"$(_call_program commands docker-compose 2>/dev/null $compose_options ps -q)"})
# Parse header line to find columns
@@ -375,9 +379,43 @@ _docker-compose() {
'(-): :->command' \
'(-)*:: :->option-or-argument' && ret=0
- local compose_file=${opt_args[-f]}${opt_args[--file]}
- local compose_project=${opt_args[-p]}${opt_args[--project-name]}
- local compose_options="${compose_file:+--file $compose_file} ${compose_project:+--project-name $compose_project}"
+ local -a relevant_compose_flags relevant_docker_flags compose_options docker_options
+
+ relevant_compose_flags=(
+ "--file" "-f"
+ "--host" "-H"
+ "--project-name" "-p"
+ "--tls"
+ "--tlscacert"
+ "--tlscert"
+ "--tlskey"
+ "--tlsverify"
+ "--skip-hostname-check"
+ )
+
+ relevant_docker_flags=(
+ "--host" "-H"
+ "--tls"
+ "--tlscacert"
+ "--tlscert"
+ "--tlskey"
+ "--tlsverify"
+ )
+
+ for k in "${(@k)opt_args}"; do
+ if [[ -n "${relevant_docker_flags[(r)$k]}" ]]; then
+ docker_options+=$k
+ if [[ -n "$opt_args[$k]" ]]; then
+ docker_options+=$opt_args[$k]
+ fi
+ fi
+ if [[ -n "${relevant_compose_flags[(r)$k]}" ]]; then
+ compose_options+=$k
+ if [[ -n "$opt_args[$k]" ]]; then
+ compose_options+=$opt_args[$k]
+ fi
+ fi
+ done
case $state in
(command)
From 048408af4835134734bcb565a8c07991a8818530 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Sun, 27 Mar 2016 23:21:58 -0700
Subject: [PATCH 09/13] zsh autocomplete: fix missing services issue for
build/pull commands
Previously, the autocomplete for the build/pull commands would only add
services for which build/image were the _first_ keys, respectively, in
the docker-compose file.
This commit fixes this, so the appropriate services are listed
regardless of the order in which they appear
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index eeed07a66..7fc692cf7 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -52,7 +52,8 @@ __docker-compose_services_with_key() {
| sed -n -e '/^services:/,/^[^ ]/p' \
| sed -n 's/^ //p' \
| awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
- | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' \
+ | grep " \+$1:" \
+ | sed "s/:.*//g" \
| grep -Ev "$already_selected"
}
From 612d263d7481edfdcfe7c82835177e17284adb55 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Tue, 29 Mar 2016 21:31:06 -0700
Subject: [PATCH 10/13] zsh autocomplete: fix issue when filtering on already
selected services
Previously, the filtering on already selected services would break when
one service was a substring of another.
This commit fixes that.
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 7fc692cf7..27b17b075 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -29,7 +29,7 @@ __docker-compose_all_services_in_compose_file() {
local -a services
already_selected=$(echo $words | tr " " "|")
__docker-compose_q config --services \
- | grep -Ev "$already_selected"
+ | grep -Ev "^(${already_selected})$"
}
# All services, even those without an existing container
@@ -54,7 +54,7 @@ __docker-compose_services_with_key() {
| awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
| grep " \+$1:" \
| sed "s/:.*//g" \
- | grep -Ev "$already_selected"
+ | grep -Ev "^(${already_selected})$"
}
# All services that are defined by a Dockerfile reference
From 0058b4ba0ce8f76341bedc0988be09cde6ee8441 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Thu, 28 Apr 2016 19:24:44 -0700
Subject: [PATCH 11/13] zsh autocomplete: replace use of sed with cut
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 27b17b075..c7df4b446 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -53,7 +53,7 @@ __docker-compose_services_with_key() {
| sed -n 's/^ //p' \
| awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
| grep " \+$1:" \
- | sed "s/:.*//g" \
+ | cut -d: -f1 \
| grep -Ev "^(${already_selected})$"
}
From b3d4e9c9d7c0a9a85aa2e1958a78ee6910d98e08 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <aepubemail@gmail.com>
Date: Thu, 28 Apr 2016 19:47:41 -0700
Subject: [PATCH 12/13] zsh autocomplete: break out duplicated flag messages
into variables
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 40 ++++++++++++++++----------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index c7df4b446..77348d5c4 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -182,7 +182,17 @@ __docker-compose_commands() {
}
__docker-compose_subcommand() {
- local opts_help='(: -)--help[Print usage]'
+ local opts_help opts_force_recreate opts_no_recreate opts_no_build opts_remove_orphans opts_timeout opts_no_color opts_no_deps
+
+ opts_help='(: -)--help[Print usage]'
+ opts_force_recreate="(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]"
+ opts_no_recreate="(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]"
+ opts_no_build="(--build)--no-build[Don't build an image, even if it's missing.]"
+ opts_remove_orphans="--remove-orphans[Remove containers for services not defined in the Compose file]"
+ opts_timeout=('(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: ")
+ opts_no_color='--no-color[Produce monochrome output.]'
+ opts_no_deps="--no-deps[Don't start linked services.]"
+
integer ret=1
case "$words[1]" in
@@ -203,9 +213,9 @@ __docker-compose_subcommand() {
(create)
_arguments \
$opts_help \
- "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
- "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
- "(--build)--no-build[Don't build an image, even if it's missing.]" \
+ $opts_force_recreate \
+ $opts_no_recreate \
+ $opts_no_build \
"(--no-build)--build[Build images before creating containers.]" \
'*:services:__docker-compose_services_all' && ret=0
;;
@@ -214,7 +224,7 @@ __docker-compose_subcommand() {
$opts_help \
"--rmi[Remove images. Type must be one of: 'all': Remove all images used by any service. 'local': Remove only images that don't have a custom tag set by the \`image\` field.]:type:(all local)" \
'(-v --volumes)'{-v,--volumes}"[Remove named volumes declared in the \`volumes\` section of the Compose file and anonymous volumes attached to containers.]" \
- '--remove-orphans[Remove containers for services not defined in the Compose file]' && ret=0
+ $opts_remove_orphans && ret=0
;;
(events)
_arguments \
@@ -247,7 +257,7 @@ __docker-compose_subcommand() {
_arguments \
$opts_help \
'(-f --follow)'{-f,--follow}'[Follow log output]' \
- '--no-color[Produce monochrome output.]' \
+ $opts_no_color \
'--tail=[Number of lines to show from the end of the logs for each container.]:number of lines: ' \
'(-t --timestamps)'{-t,--timestamps}'[Show timestamps]' \
'*:services:__docker-compose_services_all' && ret=0
@@ -291,7 +301,7 @@ __docker-compose_subcommand() {
'*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
'--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
'--name=[Assign a name to the container]:name: ' \
- "--no-deps[Don't start linked services.]" \
+ $opts_no_deps \
'(-p --publish)'{-p,--publish=}"[Publish a container's port(s) to the host]" \
'--rm[Remove container after run. Ignored in detached mode.]' \
"--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
@@ -305,7 +315,7 @@ __docker-compose_subcommand() {
(scale)
_arguments \
$opts_help \
- '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+ $opts_timeout \
'*:running services:__docker-compose_runningservices' && ret=0
;;
(start)
@@ -316,7 +326,7 @@ __docker-compose_subcommand() {
(stop|restart)
_arguments \
$opts_help \
- '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+ $opts_timeout \
'*:running services:__docker-compose_runningservices' && ret=0
;;
(unpause)
@@ -328,15 +338,15 @@ __docker-compose_subcommand() {
_arguments \
$opts_help \
'(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names. Incompatible with --abort-on-container-exit.]' \
- '--no-color[Produce monochrome output.]' \
- "--no-deps[Don't start linked services.]" \
- "(--no-recreate)--force-recreate[Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.]" \
- "(--force-recreate)--no-recreate[If containers already exist, don't recreate them. Incompatible with --force-recreate.]" \
- "(--build)--no-build[Don't build an image, even if it's missing.]" \
+ $opts_no_color \
+ $opts_no_deps \
+ $opts_force_recreate \
+ $opts_no_recreate \
+ $opts_no_build \
"(--no-build)--build[Build images before starting containers.]" \
"(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
'(-t --timeout)'{-t,--timeout}"[Use this timeout in seconds for container shutdown when attached or when containers are already running. (default: 10)]:seconds: " \
- "--remove-orphans[Remove containers for services not defined in the Compose file]" \
+ $opts_remove_orphans \
'*:services:__docker-compose_services_all' && ret=0
;;
(version)
From c3247e7af8edcca113018b9e39af0282a649d6f7 Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andre@tcell.io>
Date: Mon, 27 Jun 2016 10:57:35 -0700
Subject: [PATCH 13/13] zsh autocomplete: update misleading comment
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
---
contrib/completion/zsh/_docker-compose | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/zsh/_docker-compose b/contrib/completion/zsh/_docker-compose
index 77348d5c4..a59abe290 100644
--- a/contrib/completion/zsh/_docker-compose
+++ b/contrib/completion/zsh/_docker-compose
@@ -23,7 +23,7 @@ __docker-compose_q() {
docker-compose 2>/dev/null $compose_options "$@"
}
-# Extracts all service names from docker-compose.yml.
+# All services defined in docker-compose.yml
__docker-compose_all_services_in_compose_file() {
local already_selected
local -a services