From d6e474f451cf78741dca39af11fc4f8d90b01eea Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 12 Feb 2018 02:44:25 -0500 Subject: [PATCH] feat: move check-deploy to scheduler-docker-local plugin --- .../check-deploy | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) rename plugins/{checks => scheduler-docker-local}/check-deploy (94%) diff --git a/plugins/checks/check-deploy b/plugins/scheduler-docker-local/check-deploy similarity index 94% rename from plugins/checks/check-deploy rename to plugins/scheduler-docker-local/check-deploy index 7afe7a56b..cae18ef5a 100755 --- a/plugins/checks/check-deploy +++ b/plugins/scheduler-docker-local/check-deploy @@ -38,10 +38,16 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions" source "$PLUGIN_AVAILABLE_PATH/checks/functions" source "$PLUGIN_AVAILABLE_PATH/config/functions" -checks_check_deploy() { - declare desc="checks check-deploy plugin trigger" - local trigger="checks_check_deploy" +scheduler-docker-local-check-deploy() { + declare desc="scheduler-docker-local check-deploy plugin trigger" + local trigger="scheduler-docker-local-check-deploy" local APP="$1"; local DOKKU_APP_CONTAINER_ID="$2"; local DOKKU_APP_CONTAINER_TYPE="$3"; local DOKKU_APP_LISTEN_PORT="$4"; local DOKKU_APP_LISTEN_IP="$5" + + local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local") + if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then + return + fi + if [[ -z "$DOKKU_APP_LISTEN_PORT" ]] && [[ -f "$DOKKU_ROOT/$APP/PORT" ]]; then local DOKKU_APP_LISTEN_PORT=$(< "$DOKKU_ROOT/$APP/PORT") fi @@ -107,7 +113,7 @@ checks_check_deploy() { dokku_log_info1 "Waiting for $DOKKU_DEFAULT_CHECKS_WAIT seconds ..." sleep "$DOKKU_DEFAULT_CHECKS_WAIT" - ! (is_container_running "$DOKKU_APP_CONTAINER_ID") && dokku_log_fail "App container failed to start!!" + ! (is_container_status "$DOKKU_APP_CONTAINER_ID" "Running") && dokku_log_fail "App container failed to start!!" local container_restarts="$(docker inspect -f "{{ .RestartCount }}" "$DOKKU_APP_CONTAINER_ID")" if [[ $container_restarts -ne 0 ]]; then docker stop "$DOKKU_APP_CONTAINER_ID" || true @@ -236,4 +242,4 @@ checks_check_deploy() { dokku_log_info1 "All checks successful!" } -checks_check_deploy "$@" +scheduler-docker-local-check-deploy "$@"