From f13cdb52da2c60ef3d2933c310e2854d73798b52 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <myaccounts@savant.be>
Date: Tue, 25 Aug 2015 17:21:29 -0400
Subject: [PATCH] Ensure container exists before attempting to kill it

---
 commands | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/commands b/commands
index a169dae..e758e1e 100755
--- a/commands
+++ b/commands
@@ -80,7 +80,7 @@ case "$1" in
     fi
 
     dokku_log_info1 "Deleting $SERVICE"
-    if [[ -f "$SERVICE_ROOT/ID" ]]; then
+    if [[ -f "$SERVICE_ROOT/ID" ]] && docker ps -aq --no-trunc | grep $(cat "$SERVICE_ROOT/ID"); then
       ID=$(cat "$SERVICE_ROOT/ID")
 
       dokku_log_verbose_quiet "Deleting container data"
@@ -94,6 +94,8 @@ case "$1" in
       dokku_log_verbose_quiet "Removing container"
       docker rm -v "$ID" > /dev/null
       sleep 1
+    else
+      dokku_log_verbose_quiet "No container exists for $SERVICE"
     fi
 
     dokku_log_verbose_quiet "Removing data"