From 382443d9569919f72cb570e124148f59ea3fee79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <flink@belfalas.eu>
Date: Wed, 9 Sep 2015 09:31:36 +0200
Subject: [PATCH] Use mysql tools from docker image

---
 commands     | 18 ++++--------------
 dependencies | 15 ---------------
 2 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100755 dependencies

diff --git a/commands b/commands
index 712433c..02d4690 100755
--- a/commands
+++ b/commands
@@ -8,14 +8,6 @@ if [[ ! -d $PLUGIN_DATA_ROOT ]]; then
   dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install"
 fi
 
-if ! command -v mysql &>/dev/null; then
-  dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install-dependencies"
-fi
-
-if ! command -v mysqldump &>/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"
@@ -121,11 +113,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")"
     PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
-    IP=$(get_container_ip "$ID")
 
-    mysqldump --host="$IP" --port=3306 --user=mysql --password="$PASSWORD" --databases "$SERVICE"
+    docker exec "$SERVICE_NAME" mysqldump --host=localhost --user=mysql --password="$PASSWORD" --databases "$SERVICE"
     ;;
 
   $PLUGIN_COMMAND_PREFIX:import)
@@ -166,11 +157,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")
     PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
-    mysql --host="$IP" --port=3306 --user=mysql --password="$PASSWORD" --database="$SERVICE"
+    docker exec -it "$SERVICE_NAME" mysql --host=localhost --user=mysql --password="$PASSWORD" --database="$SERVICE"
     ;;
 
   $PLUGIN_COMMAND_PREFIX:info)
diff --git a/dependencies b/dependencies
deleted file mode 100755
index 28cc808..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 mysql-client-5.5
-    ;;
-
-  opensuse)
-    zypper -q in -y mysql-client
-    ;;
-esac