From 7ec040d10cee78a702829723144b9c616d3ab692 Mon Sep 17 00:00:00 2001
From: Pierre Chaussalet <pierre.chaussalet@in-tact.fr>
Date: Thu, 7 Aug 2014 18:10:11 +0200
Subject: [PATCH] [docker plugin] Add support for containers names and stopped
 containers

---
 plugins/docker/_docker | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 28568a6e5..190ebe14a 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -8,10 +8,19 @@
 
 # ----- Helper functions
 # Output a selectable list of all running docker containers
+__docker_containers_running() {
+    declare -a cont_r_cmd
+    cont_r_cmd=($(docker inspect -f='{{.Id | printf "%12s"}} {{.Name}} {{.Config.Image}} {{.Path}}' $(docker ps -q) |awk '{ printf "%s:[%s(%s)%s]\n", substr($2, 2), substr($1,1,12), $3, $4}'))
+    cont_r_cmd+=($(docker inspect -f='{{.Id | printf "%12s"}} {{.Name}} {{.Config.Image}} {{.Path}}' $(docker ps -q) |awk '{ printf "%s:[%s(%s)%s]\n", substr($1,1,12), substr($2, 2), $3, $4}'))
+    _describe 'containers' cont_r_cmd
+}
+
+# Output a selectable list of all docker containers
 __docker_containers() {
     declare -a cont_cmd
-    cont_cmd=($(docker ps | awk 'NR>1{print $1":[CON("$1")"$2"("$3")]"}'))
-    _describe 'containers' cont_cmd
+    cont_r_cmd=($(docker inspect -f='{{.Id | printf "%12s"}} {{.Name}} {{.Config.Image}} {{.Path}}' $(docker ps -q -a) |awk '{ printf "%s:[%s(%s)%s]\n", substr($2, 2), substr($1,1,12), $3, $4}'))
+    cont_r_cmd+=($(docker inspect -f='{{.Id | printf "%12s"}} {{.Name}} {{.Config.Image}} {{.Path}}' $(docker ps -q -a) |awk '{ printf "%s:[%s(%s)%s]\n", substr($1,1,12), substr($2, 2), $3, $4}'))
+    _describe 'containers' cont_r_cmd
 }
 
 # output a selectable list of all docker images
@@ -28,7 +37,7 @@ __attach() {
     _arguments \
         '--no-stdin[Do not attach stdin]' \
         '--sig-proxy[Proxify all received signal to the process (even in non-tty mode)]'
-    __docker_containers
+    __docker_containers_running
 }
 
 __build() {
@@ -101,7 +110,7 @@ __inspect() {
 }
 
 __kill() {
-    __docker_containers
+    __docker_containers_running
 }
 
 __load() {
@@ -122,11 +131,11 @@ __logs() {
 }
 
 __port() {
-    __docker_containers
+    __docker_containers_running
 }
 
 __top() {
-    __docker_containers
+    __docker_containers_running
 }
 
 __ps() {
@@ -153,7 +162,7 @@ __push() {
 __restart() {
     _arguments \
         '(-t,--time=)'{-t,--time=}'[Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default=10]'
-    __docker_containers
+    __docker_containers_running
 }
 
 __rm() {
@@ -221,7 +230,7 @@ __start() {
 __stop() {
     _arguments \
         '(-t,--time=)'{-t,--time=}'[Number of seconds to wait for the container to stop before killing it.]'
-    __docker_containers
+    __docker_containers_running
 }
 
 __tag() {
@@ -235,7 +244,7 @@ __version() {
 }
 
 __wait() {
-    __docker_containers
+    __docker_containers_running
 }
 
 # end commands ---------