From faf363c01b40aaae1f7029a34fc2ad44ea386106 Mon Sep 17 00:00:00 2001 From: Steve Durrheimer Date: Tue, 19 Jan 2016 21:25:21 +0100 Subject: [PATCH 1/3] Add zsh completion for 'docker network connect --alias' and 'docker {create, run} --net-alias' Signed-off-by: Steve Durrheimer Upstream-commit: 898b53fafab4859189e68d1e67780e5c4f1fdb29 Component: engine --- components/engine/contrib/completion/zsh/_docker | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/components/engine/contrib/completion/zsh/_docker b/components/engine/contrib/completion/zsh/_docker index 80a2e84646..905ae512af 100644 --- a/components/engine/contrib/completion/zsh/_docker +++ b/components/engine/contrib/completion/zsh/_docker @@ -291,9 +291,10 @@ __docker_network_subcommand() { opts_help=("(: -)--help[Print usage]") case "$words[1]" in - (connect|disconnect) + (connect) _arguments $(__docker_arguments) \ $opts_help \ + "($help)*--alias=[Add network-scoped alias for the container]:alias: " \ "($help -)1:network:__docker_networks" \ "($help -)2:containers:__docker_containers" && ret=0 ;; @@ -311,6 +312,12 @@ __docker_network_subcommand() { "($help)*--subnet=[Subnet in CIDR format that represents a network segment]:IP/mask: " \ "($help -)1:Network Name: " && ret=0 ;; + (disconnect) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -)1:network:__docker_networks" \ + "($help -)2:containers:__docker_containers" && ret=0 + ;; (inspect) _arguments $(__docker_arguments) \ $opts_help \ @@ -495,6 +502,7 @@ __docker_subcommand() { "($help)--mac-address=[Container MAC address]:MAC address: " "($help)--name=[Container name]:name: " "($help)--net=[Connect a container to a network]:network mode:(bridge none container host)" + "($help)*--net-alias=[Add network-scoped alias for the container]:alias: " "($help)--oom-kill-disable[Disable OOM Killer]" "($help)--oom-score-adj[Tune the host's OOM preferences for containers (accepts -1000 to 1000)]" "($help -P --publish-all)"{-P,--publish-all}"[Publish all exposed ports]" From 7dd65e8f4cd0156ad895e405cabb7a2c965242dc Mon Sep 17 00:00:00 2001 From: Steve Durrheimer Date: Tue, 19 Jan 2016 21:28:49 +0100 Subject: [PATCH 2/3] Add zsh completion for 'docker {network connect, create, run} --ip --ip6' Signed-off-by: Steve Durrheimer Upstream-commit: 5284e037ffd301ee9ed6a23cd130f62787a93f86 Component: engine --- components/engine/contrib/completion/zsh/_docker | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/contrib/completion/zsh/_docker b/components/engine/contrib/completion/zsh/_docker index 905ae512af..c1f0000e6f 100644 --- a/components/engine/contrib/completion/zsh/_docker +++ b/components/engine/contrib/completion/zsh/_docker @@ -295,6 +295,8 @@ __docker_network_subcommand() { _arguments $(__docker_arguments) \ $opts_help \ "($help)*--alias=[Add network-scoped alias for the container]:alias: " \ + "($help)--ip=[Container IPv4 address]:IPv4: " \ + "($help)--ip6=[Container IPv6 address]:IPv6: " \ "($help -)1:network:__docker_networks" \ "($help -)2:containers:__docker_containers" && ret=0 ;; @@ -494,6 +496,8 @@ __docker_subcommand() { "($help)*--group-add=[Add additional groups to run as]:group:_groups" "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts" "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" + "($help)--ip=[Container IPv4 address]:IPv4: " + "($help)--ip6=[Container IPv6 address]:IPv6: " "($help)--ipc=[IPC namespace to use]:IPC namespace: " "($help)*--link=[Add link to another container]:link:->link" "($help)*"{-l=,--label=}"[Set meta data on a container]:label: " From 30908002a54918c8f995af9145e898d2b8d51944 Mon Sep 17 00:00:00 2001 From: Steve Durrheimer Date: Tue, 19 Jan 2016 21:32:38 +0100 Subject: [PATCH 3/3] Add zsh completion for 'docker network connect --link' Signed-off-by: Steve Durrheimer Upstream-commit: fe8a6a5b679ee75587036c823890b4a39c9db031 Component: engine --- components/engine/contrib/completion/zsh/_docker | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/components/engine/contrib/completion/zsh/_docker b/components/engine/contrib/completion/zsh/_docker index c1f0000e6f..9e14e4e75b 100644 --- a/components/engine/contrib/completion/zsh/_docker +++ b/components/engine/contrib/completion/zsh/_docker @@ -297,8 +297,19 @@ __docker_network_subcommand() { "($help)*--alias=[Add network-scoped alias for the container]:alias: " \ "($help)--ip=[Container IPv4 address]:IPv4: " \ "($help)--ip6=[Container IPv6 address]:IPv6: " \ + "($help)*--link=[Add a link to another container]:link:->link" \ "($help -)1:network:__docker_networks" \ "($help -)2:containers:__docker_containers" && ret=0 + + case $state in + (link) + if compset -P "*:"; then + _wanted alias expl "Alias" compadd -E "" && ret=0 + else + __docker_runningcontainers -qS ":" && ret=0 + fi + ;; + esac ;; (create) _arguments $(__docker_arguments) -A '-*' \