diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md index 6a29e92b7..0fba2a33a 100644 --- a/docs/development/plugin-triggers.md +++ b/docs/development/plugin-triggers.md @@ -408,7 +408,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x - Description: Return the port for a given app container - Invoked by: `internally triggered by a deploy` -- Arguments: `$APP $PROC_TYPE $CONTAINER_ID` +- Arguments: `$APP $PROC_TYPE $CONTAINER_ID $IS_HEROKUISH_CONTAINER` - Example: ```shell diff --git a/plugins/common/functions b/plugins/common/functions index e0d020c3c..5a8b5ed28 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -611,7 +611,7 @@ dokku_deploy_cmd() { fi ipaddr=$(plugn trigger network-get-ipaddr "$APP" "$PROC_TYPE" "$id") - port=$(plugn trigger network-get-port "$APP" "$PROC_TYPE" "$id") + port=$(plugn trigger network-get-port "$APP" "$PROC_TYPE" "$id" "$DOKKU_HEROKUISH") kill_new() { declare desc="wrapper function to kill newly started app container" diff --git a/plugins/network/functions b/plugins/network/functions index ba46fd5ad..ee195b774 100755 --- a/plugins/network/functions +++ b/plugins/network/functions @@ -111,7 +111,7 @@ network-get-container-listeners() { network-get-container-port() { declare desc="Return the port for a given app container" - declare APP="$1" PROC_TYPE="$2" CONTAINER_ID="$3" DOKKU_HEROKUISH="$4" + declare APP="$1" PROC_TYPE="$2" CONTAINER_ID="$3" IS_HEROKUISH_CONTAINER="$4" local DOKKU_IS_APP_PROXY_ENABLED local PORT=5000 @@ -119,7 +119,7 @@ network-get-container-port() { return fi - if [[ -z "$DOKKU_HEROKUISH" ]]; then + if [[ -z "$IS_HEROKUISH_CONTAINER" ]]; then local DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || true)) fi