From 21a5d29581ce2b8d74f80bba65084e4babc1e1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <flink@belfalas.eu>
Date: Tue, 15 Sep 2015 23:49:51 +0200
Subject: [PATCH] Display image & version in `list`

---
 functions               | 8 +++++++-
 tests/bin/docker        | 5 +++++
 tests/service_list.bats | 4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/functions b/functions
index 019a4e7..0c21a90 100755
--- a/functions
+++ b/functions
@@ -56,7 +56,7 @@ service_list() {
   else
     dokku_log_info1_quiet "$PLUGIN_SERVICE services:"
     for SERVICE in $SERVICES; do
-      dokku_log_verbose "$SERVICE $(service_status "$SERVICE")$(service_exposed_ports "$SERVICE")"
+      dokku_log_verbose "$SERVICE, $(service_version "$SERVICE") $(service_status "$SERVICE")$(service_exposed_ports "$SERVICE")"
     done
   fi
 }
@@ -270,3 +270,9 @@ get_service_name() {
   local SERVICE="$1"
   echo "dokku.${PLUGIN_COMMAND_PREFIX}.$SERVICE"
 }
+
+service_version() {
+  local SERVICE="$1"
+  local SERVICE_NAME="$(get_service_name "$SERVICE")"
+  docker inspect -f '{{.Config.Image}}' "$SERVICE_NAME"
+}
diff --git a/tests/bin/docker b/tests/bin/docker
index 5d416c0..32846d6 100755
--- a/tests/bin/docker
+++ b/tests/bin/docker
@@ -51,6 +51,11 @@ case "$1" in
       exit 0
     fi
 
+    if [[ $@ =~ \{\{.Config.Image\}\} ]]; then
+      echo "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION"
+      exit 0
+    fi
+
     if [[ $@ =~ \{\{\.State\..*\}\} ]]; then
       if [[ $@ =~ \{\{\.State\.Running\}\} ]]; then
         echo "true"
diff --git a/tests/service_list.bats b/tests/service_list.bats
index 0b07541..1f659ec 100755
--- a/tests/service_list.bats
+++ b/tests/service_list.bats
@@ -11,13 +11,13 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:list) with no exposed ports" {
   run dokku "$PLUGIN_COMMAND_PREFIX:list"
-  assert_contains "${lines[*]}" "l (running)"
+  assert_contains "${lines[*]}" "l, mysql:5.6.26 (running)"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:list) with exposed ports" {
   dokku "$PLUGIN_COMMAND_PREFIX:expose" l 4242
   run dokku "$PLUGIN_COMMAND_PREFIX:list"
-  assert_contains "${lines[*]}" "l (running), exposed port(s): 3306->4242"
+  assert_contains "${lines[*]}" "l, mysql:5.6.26 (running), exposed port(s): 3306->4242"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:list) when there are no services" {