From b409af602a11bd2e32c81ebfbd73b089044aa78b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 22 Apr 2017 20:35:25 -0600 Subject: [PATCH] fix: call network-get-ipaddr correctly --- plugins/checks/subcommands/run | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/checks/subcommands/run b/plugins/checks/subcommands/run index a97758043..5be88e38f 100755 --- a/plugins/checks/subcommands/run +++ b/plugins/checks/subcommands/run @@ -45,16 +45,20 @@ check_process_type() { check_process() { local APP="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3" - local DOKKU_CONTAINER_ID_FILE="$DOKKU_ROOT/$APP/CONTAINER.$PROC_TYPE.$CONTAINER_INDEX" + local CONTAINER_ID DOKKU_CONTAINER_ID_FILE IMAGE IP IS_HEROKUISH_CONTAINER PORT + DOKKU_CONTAINER_ID_FILE="$DOKKU_ROOT/$APP/CONTAINER.$PROC_TYPE.$CONTAINER_INDEX" if [[ ! -f "$DOKKU_CONTAINER_ID_FILE" ]]; then dokku_log_fail "Invalid container index specified ($APP.$PROC_TYPE.$CONTAINER_INDEX)" fi + IMAGE=$(get_app_image_name "$APP") + is_image_herokuish_based "$IMAGE" && IS_HEROKUISH_CONTAINER=true + dokku_log_info1 "Running checks for app ($APP.$PROC_TYPE.$CONTAINER_INDEX)" - local CONTAINER_ID=$(< "$DOKKU_CONTAINER_ID_FILE") - local IP="$(plugn trigger network-get-ipaddr "$APP" "PROC_TYPE" "$CONTAINER_ID")" - local PORT="$(plugn trigger network-get-port "$APP" "PROC_TYPE" "$CONTAINER_ID")" + CONTAINER_ID=$(< "$DOKKU_CONTAINER_ID_FILE") + IP="$(plugn trigger network-get-ipaddr "$APP" "$PROC_TYPE" "$IS_HEROKUISH_CONTAINER" "$CONTAINER_ID")" + PORT="$(plugn trigger network-get-port "$APP" "$PROC_TYPE" "$IS_HEROKUISH_CONTAINER" "$CONTAINER_ID")" plugn trigger check-deploy "$APP" "$CONTAINER_ID" "$PROC_TYPE" "$PORT" "$IP" }