diff --git a/plugins/apps/functions b/plugins/apps/functions index b891675b9..abd9521b1 100755 --- a/plugins/apps/functions +++ b/plugins/apps/functions @@ -34,7 +34,7 @@ apps_destroy() { fi fi - echo "Destroying $APP (including all add-ons)" + dokku_log_info1 "Destroying $APP (including all add-ons)" plugn trigger pre-delete "$APP" "$IMAGE_TAG" local DOKKU_SCHEDULER=$(get_app_scheduler "$APP") diff --git a/plugins/common/functions b/plugins/common/functions index 65daac823..66cf890ae 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -538,7 +538,7 @@ is_app_running() { dokku_log_warn "Deprecated: ps#fn-is-app-running" verify_app_name "$APP" - local APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP") + local APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP" 2>/dev/null) if [[ -n "$APP_RUNNING_CONTAINER_IDS" ]]; then return 0 diff --git a/plugins/ps/subcommands/default b/plugins/ps/subcommands/default index cd34876e1..3f136c8d1 100755 --- a/plugins/ps/subcommands/default +++ b/plugins/ps/subcommands/default @@ -14,7 +14,7 @@ ps_main_cmd() { verify_app_name "$APP" ! (is_deployed "$APP") && dokku_log_warn "App $APP has not been deployed" && exit 0 - local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP") + local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP" 2>/dev/null) local CID for CID in $DOKKU_APP_RUNNING_CONTAINER_IDS; do diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy index f0e8cbe2d..6138f081f 100755 --- a/plugins/scheduler-docker-local/scheduler-deploy +++ b/plugins/scheduler-docker-local/scheduler-deploy @@ -50,7 +50,7 @@ scheduler-docker-local-scheduler-deploy() { if [[ "$(is_app_proctype_checks_disabled "$APP" "$PROC_TYPE")" == "true" ]]; then dokku_log_info1 "zero downtime is disabled for app ($APP.$PROC_TYPE). stopping currently running containers" - local cid proctype_oldids="$(get_app_running_container_ids "$APP" "$PROC_TYPE")" + local cid proctype_oldids="$(get_app_running_container_ids "$APP" "$PROC_TYPE" 2>/dev/null)" for cid in $proctype_oldids; do dokku_log_info2 "stopping $APP.$PROC_TYPE ($cid)" diff --git a/plugins/scheduler-docker-local/scheduler-stop b/plugins/scheduler-docker-local/scheduler-stop index f696509a0..f5a8787ca 100755 --- a/plugins/scheduler-docker-local/scheduler-stop +++ b/plugins/scheduler-docker-local/scheduler-stop @@ -13,7 +13,7 @@ scheduler-docker-local-scheduler-stop() { return fi - local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP") + local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP" 2>/dev/null) local DOKKU_DOCKER_STOP_TIMEOUT="$(config_get "$APP" DOKKU_DOCKER_STOP_TIMEOUT || true)" [[ -n "$DOKKU_DOCKER_STOP_TIMEOUT" ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"