From 026d04a65fc128201c7bec44b889e69b9de76aaa Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 12 Aug 2019 16:08:31 -0400 Subject: [PATCH] feat: pass SOURCECODE_WORK_DIR to build-buildpack triggers This will allow those triggers to insert and extract files from the sourcecode work directory. Note that changes are not committed to this directory, nor will they be reflected in the committed codebase. --- docs/development/plugin-triggers.md | 4 ++-- plugins/builder-herokuish/builder-build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md index e63fff4ef..cf86711fb 100644 --- a/docs/development/plugin-triggers.md +++ b/docs/development/plugin-triggers.md @@ -745,7 +745,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x - Description: Allows you to run commands after the build image is create for a given app. Only applies to apps using buildpacks. - Invoked by: `internal function dokku_build() (build phase)` -- Arguments: `$APP` +- Arguments: `$APP` `$SOURCECODE_WORK_DIR` - Example: ```shell @@ -1005,7 +1005,7 @@ dokku config:set --no-restart $APP MANUALLY_STOPPED=1 - Description: Allows you to run commands before the build image is created for a given app. For instance, this can be useful to add env vars to your container. Only applies to apps using buildpacks. - Invoked by: `internal function dokku_build() (build phase)` -- Arguments: `$APP` +- Arguments: `$APP` `$SOURCECODE_WORK_DIR` - Example: ```shell diff --git a/plugins/builder-herokuish/builder-build b/plugins/builder-herokuish/builder-build index 61194b8a6..d7d231927 100755 --- a/plugins/builder-herokuish/builder-build +++ b/plugins/builder-herokuish/builder-build @@ -33,7 +33,7 @@ trigger-builder-build-builder-herokuish() { "$DOCKER_BIN" commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null [[ -d $DOKKU_APP_CACHE_DIR ]] || mkdir -p "$DOKKU_APP_CACHE_DIR" - plugn trigger pre-build-buildpack "$APP" + plugn trigger pre-build-buildpack "$APP" "$SOURCECODE_WORK_DIR" local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$BUILDER_TYPE") [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true " @@ -48,7 +48,7 @@ trigger-builder-build-builder-herokuish() { "$DOCKER_BIN" commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null - plugn trigger post-build-buildpack "$APP" + plugn trigger post-build-buildpack "$APP" "$SOURCECODE_WORK_DIR" } trigger-builder-build-builder-herokuish "$@"