From e76bb13edff4c3176353e96e519727c96cc87d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <flink@belfalas.eu>
Date: Tue, 8 Sep 2015 10:34:29 +0200
Subject: [PATCH 1/2] Use redis-cli from docker image

Instead of installing dependencies on the host, directly use the binary
shipped with the redis docker image. This will also prevent possible
problems when API change for example.
---
 commands     | 10 +++-------
 dependencies | 15 ---------------
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100755 dependencies

diff --git a/commands b/commands
index 0da81ea..c459a39 100755
--- a/commands
+++ b/commands
@@ -8,10 +8,6 @@ if [[ ! -d $PLUGIN_DATA_ROOT ]]; then
   dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install"
 fi
 
-if ! command -v redis-cli &>/dev/null; then
-  dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install-dependencies"
-fi
-
 case "$1" in
   $PLUGIN_COMMAND_PREFIX:alias)
     [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
@@ -155,10 +151,10 @@ case "$1" in
     [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
     verify_service_name "$2"
     SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+    SERVICE_NAME=$(get_service_name "$SERVICE")
 
-    ID=$(cat "$SERVICE_ROOT/ID")
-    IP=$(get_container_ip "$ID")
-    redis-cli -h "$IP" -p 6379
+    # shellcheck disable=SC2016
+    docker run -it --link "$SERVICE_NAME:redis" --rm "$PLUGIN_IMAGE" sh -c 'exec redis-cli -h "$REDIS_PORT_6379_TCP_ADDR" -p "$REDIS_PORT_6379_TCP_PORT"'
     ;;
 
   $PLUGIN_COMMAND_PREFIX:info)
diff --git a/dependencies b/dependencies
deleted file mode 100755
index 4df3e70..0000000
--- a/dependencies
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$(dirname "$0")/config"
-
-case "$DOKKU_DISTRO" in
-  ubuntu)
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes -qq -y redis-tools
-    ;;
-
-  opensuse)
-    zypper -q in -y redis-tools
-    ;;
-esac

From 9c64894ba62d9900e3b00c7a7a9d78826391a70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <flink@belfalas.eu>
Date: Tue, 8 Sep 2015 11:10:47 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Don=E2=80=99t=20display=20a=20warning=20whe?=
 =?UTF-8?q?n=20exposing=20ports?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 functions | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/functions b/functions
index 60ba792..6f95977 100755
--- a/functions
+++ b/functions
@@ -127,7 +127,7 @@ service_status() {
 }
 
 service_port_expose() {
-  service_start "$1"
+  service_start "$1" "true"
   service_port_unpause "$1" "true" "${@:2}"
 }
 
@@ -196,10 +196,14 @@ docker_ports_options() {
 
 service_start() {
   local SERVICE="$1"
+  local QUIET="$2"
   local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
   local SERVICE_NAME=$(get_service_name "$SERVICE")
   local ID=$(docker ps -f status=running | grep "$SERVICE_NAME" | awk '{print $1}') || true
-  [[ -n $ID ]] && dokku_log_warn "Service is already started" && return 0
+  if [[ -n $ID ]]; then
+    [[ -z $QUIET ]] && dokku_log_warn "Service is already started"
+    return 0
+  fi
 
   dokku_log_info1_quiet "Starting container"
   local PREVIOUS_ID=$(docker ps -f status=exited | grep "$SERVICE_NAME" | awk '{print $1}') || true