From b2dbd036fcc2bedbb85b19cde433bc44c014f8fc 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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/commands b/commands
index 9eb13d5..17e5527 100755
--- a/commands
+++ b/commands
@@ -50,6 +50,7 @@ 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"; LINKS_FILE="$SERVICE_ROOT/LINKS"
+    SERVICE_NAME=$(get_service_name "$SERVICE")
 
     [[ -s "$LINKS_FILE" ]] && dokku_log_fail "Cannot delete linked service"
 
@@ -68,20 +69,19 @@ 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
       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"