From 81512504a745a046c29dd75cb685c188a07bae8a Mon Sep 17 00:00:00 2001 From: Femi Omojola Date: Tue, 8 Sep 2020 09:26:35 -0400 Subject: [PATCH] Added the container index to the network-compute-ports trigger: useful for alternative proxy implementations. Updated the documentation for the network-compute-ports trigger to clarify the arguments --- docs/development/plugin-triggers.md | 2 +- plugins/scheduler-docker-local/scheduler-deploy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md index 660b0696e..2e82717fa 100644 --- a/docs/development/plugin-triggers.md +++ b/docs/development/plugin-triggers.md @@ -738,7 +738,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x - Description: Computes the ports for a given app container - Invoked by: `internally triggered by proxy-build-config within proxy implementations` -- Arguments: `$APP` +- Arguments: `$APP $PROC_TYPE $IS_HEROKUISH_CONTAINER $CONTAINER_INDEX` - Example: ```shell diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy index 6f4c7c0f5..581a3f534 100755 --- a/plugins/scheduler-docker-local/scheduler-deploy +++ b/plugins/scheduler-docker-local/scheduler-deploy @@ -86,7 +86,7 @@ trigger-scheduler-docker-local-scheduler-deploy() { [[ -n "$DOKKU_START_CMD" ]] && START_CMD="$DOKKU_START_CMD" if [[ "$PROC_TYPE" == "web" ]]; then - ports=($(plugn trigger network-compute-ports "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH")) + ports=($(plugn trigger network-compute-ports "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH" "$CONTAINER_INDEX")) local DOKKU_DOCKER_PORT_ARGS="" local DOKKU_PORT="" for p in "${ports[@]}"; do