From d09d7cedf08837364c2d3392caf175edb39b8641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <flink@belfalas.eu>
Date: Thu, 8 Oct 2015 22:44:39 +0200
Subject: [PATCH] Fix the `destroy` command

Checking for container with its service name instead of ID.
Doing a chmod 777 on `/data` before removing data from the service.
---
 commands | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/commands b/commands
index 8495ae8..eb36613 100755
--- a/commands
+++ b/commands
@@ -68,25 +68,20 @@ case "$1" in
     fi
 
     dokku_log_info1 "Deleting $SERVICE"
-    if [[ -f "$SERVICE_ROOT/ID" ]] && docker ps -aq --no-trunc | grep -q "$(cat "$SERVICE_ROOT/ID")"; then
-      ID=$(cat "$SERVICE_ROOT/ID")
-
+    if [[ -n $(docker ps -aq -f name="$SERVICE_NAME") ]]; then
       dokku_log_verbose_quiet "Deleting container data"
-      service_start "$SERVICE"
-      docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" dokkupaas/wait > /dev/null
-      docker exec -it "$ID" chmod -R 777 /var/lib/mysql
-
       service_stop "$SERVICE"
       sleep 1
 
       dokku_log_verbose_quiet "Removing container"
-      docker rm -v "$ID" > /dev/null
+      docker rm -v "$SERVICE_NAME" > /dev/null
       sleep 1
     else
       dokku_log_verbose_quiet "No container exists for $SERVICE"
     fi
 
     dokku_log_verbose_quiet "Removing data"
+    docker run --rm -v "$SERVICE_ROOT/data:/data" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" chmod 777 -R /data
     rm -rf "$SERVICE_ROOT"
 
     dokku_log_info2 "$PLUGIN_SERVICE container deleted: $SERVICE"