From c418c9f69c28ba2815fec830e906e67aff58f381 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 28 Aug 2016 02:04:51 -0400
Subject: [PATCH] Make install hook quiet when there is nothing to do

---
 install          | 19 +++++++++----------
 tests/bin/docker |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/install b/install
index c59ac06..7a38c52 100755
--- a/install
+++ b/install
@@ -2,17 +2,16 @@
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q "$PLUGIN_IMAGE_VERSION" ; then
-  docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION"
-fi
+pull-docker-image() {
+  declare IMAGE="$1"
+  if [[ "$(docker images -q "${IMAGE}" 2> /dev/null)" == "" ]]; then
+    docker pull "${IMAGE}"
+  fi
+}
 
-if ! docker images | grep -q -e "^svendowideit/ambassador "; then
-  docker pull svendowideit/ambassador:latest
-fi
-
-if ! docker images | grep -q -e "^dokkupaas/wait "; then
-  docker pull dokkupaas/wait:latest
-fi
+pull-docker-image "${PLUGIN_IMAGE}:${PLUGIN_IMAGE_VERSION}"
+pull-docker-image "svendowideit/ambassador:latest"
+pull-docker-image "dokkupaas/wait:0.2"
 
 mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE directory"
 chown dokku:dokku "$PLUGIN_DATA_ROOT"
diff --git a/tests/bin/docker b/tests/bin/docker
index 9b4d7c0..f68a834 100755
--- a/tests/bin/docker
+++ b/tests/bin/docker
@@ -41,7 +41,7 @@ case "$1" in
       echo '7f899b723c08        postgres:9.5.4                             "/docker-entrypoint."      11 seconds ago       Up 10 seconds       5432/tcp                                   dokku.postgres.l'
       echo '5e50a462661e        rabbitmq:3.6.5-management                  "/docker-entrypoint."      11 seconds ago       Up 10 seconds       5672/tcp, 15672/tcp                        dokku.rabbitmq.l'
       echo 'c39ca00fa3c6        redis:3.2.3                                "/entrypoint.sh redi"      11 seconds ago       Up 10 seconds       6379/tcp                                   dokku.redis.l'
-      echo 'dc98c2939a80        rethinkdb:2.3.5                            "rethinkdb --bind al"      11 seconds ago       Up 10 seconds       8080/tcp, 28015/tcp, 29015/tcp             dokku.rethinkdb.l'
+      echo 'dc98c2939a80        rethinkdb:2.3.4                            "rethinkdb --bind al"      11 seconds ago       Up 10 seconds       8080/tcp, 28015/tcp, 29015/tcp             dokku.rethinkdb.l'
     fi
     ;;
   exec)
@@ -83,7 +83,7 @@ case "$1" in
     echo "postgres                             9.5.4               6412eb70175e        2 days ago          265.7 MB"
     echo "rabbitmq                             3.6.5-management    327b803301e9        2 days ago          143.5 MB"
     echo "redis                                3.2.3               9216d5a4eec8        2 days ago          109.3 MB"
-    echo "rethinkdb                            2.3.5               f27010a550ec        2 days ago          196.3 MB"
+    echo "rethinkdb                            2.3.4               f27010a550ec        2 days ago          196.3 MB"
     echo "svendowideit/ambassador              latest              0d2200edc53e        2 days ago          7.241 MB"
     ;;
   pull)