Ensure container exists before attempting to kill it

This commit is contained in:
Jose Diaz-Gonzalez
2015-08-25 17:21:26 -04:00
parent 1c33231773
commit 697ee11472

View File

@@ -87,7 +87,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 "Deleting container data" dokku_log_verbose_quiet "Deleting container data"
@@ -101,6 +101,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"