diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md index 11a2c0c63..a7e52baf7 100644 --- a/docs/development/plugin-triggers.md +++ b/docs/development/plugin-triggers.md @@ -311,6 +311,24 @@ verify_app_name "$APP" # TODO ``` +### `docker-args-process-build` + +- Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker deploy options. +- Invoked by: `dokku ps:rebuild` +- Arguments: `$APP $IMAGE_TAG $IMAGE_SOURCE_TYPE` +- Example: + +```shell +#!/usr/bin/env bash + +set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x +source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions" +APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG) +verify_app_name "$APP" + +# TODO +``` + ### `docker-args-process-deploy` - Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker deploy options. @@ -333,7 +351,7 @@ verify_app_name "$APP" - Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker run options. - Invoked by: `dokku run` -- Arguments: `$APP $IMAGE_TAG $IMAGE_SOURCE_TYPE [$PROC_TYPE $CONTAINER_INDEX]` +- Arguments: `$APP $IMAGE_TAG $IMAGE_SOURCE_TYPE` - Example: ```shell diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions index 46feb92d1..1d2dc2341 100755 --- a/plugins/app-json/internal-functions +++ b/plugins/app-json/internal-functions @@ -85,7 +85,7 @@ execute_script() { local IMAGE_SOURCE_TYPE="dockerfile" is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish" - DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY") + DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE") # eval args as array to respect escapes declare -a ARG_ARRAY diff --git a/plugins/common/functions b/plugins/common/functions index 8c3f59296..1aa97ffde 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -535,7 +535,7 @@ dokku_build() { local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE") [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true " local IMAGE_SOURCE_TYPE="herokuish" - DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY") + DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE") declare -a ARG_ARRAY eval "ARG_ARRAY=($DOCKER_ARGS)" @@ -563,7 +563,7 @@ dokku_build() { [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache" local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE") local IMAGE_SOURCE_TYPE="dockerfile" - DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY") + DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE") # strip --volume and -v args from DOCKER_ARGS local DOCKER_ARGS=$(sed -e "s/--volume=[[:graph:]]\+[[:blank:]]\?//g" -e "s/-v[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS") diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run index 22a374204..c93fa23b3 100755 --- a/plugins/scheduler-docker-local/scheduler-run +++ b/plugins/scheduler-docker-local/scheduler-run @@ -29,7 +29,7 @@ scheduler-docker-local-scheduler-run() { local IMAGE_SOURCE_TYPE="dockerfile" is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish" - DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY") + DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE") declare -a ARG_ARRAY eval "ARG_ARRAY=($DOCKER_ARGS)"