Ensure container exists before attempting to kill it

This commit is contained in:
Jose Diaz-Gonzalez
2015-08-25 17:21:27 -04:00
parent a732f509f8
commit c474ac0018

View File

@@ -93,7 +93,7 @@ case "$1" in
fi fi
dokku_log_info1 "Deleting $SERVICE" 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") ID=$(cat "$SERVICE_ROOT/ID")
dokku_log_verbose_quiet "Stopping container" dokku_log_verbose_quiet "Stopping container"
@@ -104,6 +104,8 @@ case "$1" in
dokku_log_verbose_quiet "Removing container" dokku_log_verbose_quiet "Removing container"
docker rm -v "$ID" > /dev/null docker rm -v "$ID" > /dev/null
sleep 1 sleep 1
else
dokku_log_verbose_quiet "No container exists for $SERVICE"
fi fi
dokku_log_verbose_quiet "Removing data" dokku_log_verbose_quiet "Removing data"