From 455033703a264f5803f58d43c200c621dff3bd45 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Thu, 5 Nov 2015 17:18:44 -0800 Subject: [PATCH 1/2] add $REV to pre-receive-app call --- plugins/git/commands | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/git/commands b/plugins/git/commands index 783813f12..71b22b377 100755 --- a/plugins/git/commands +++ b/plugins/git/commands @@ -21,10 +21,10 @@ git_build_app_repo() { find -name .git -prune -exec rm -rf {} \; > /dev/null if [[ -f Dockerfile ]] && [[ "$([[ -f .env ]] && grep -q BUILDPACK_URL .env; echo $?)" != "0" ]] && [[ ! -f ".buildpacks" ]]; then - plugn trigger pre-receive-app "$APP" "dockerfile" "$TMP_WORK_DIR" + plugn trigger pre-receive-app "$APP" "dockerfile" "$TMP_WORK_DIR" "$REV" dokku receive "$APP" "dockerfile" "$TMP_WORK_DIR" | sed -u "s/^/"$'\e[1G'"/" else - plugn trigger pre-receive-app "$APP" "herokuish" "$TMP_WORK_DIR" + plugn trigger pre-receive-app "$APP" "herokuish" "$TMP_WORK_DIR" "$REV" dokku receive "$APP" "herokuish" "$TMP_WORK_DIR" | sed -u "s/^/"$'\e[1G'"/" fi } From 95a7a93cb9b1928c99dd38514b10ca95ef3238f4 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Thu, 5 Nov 2015 18:46:18 -0800 Subject: [PATCH 2/2] [ci skip] update docs --- docs/development/plugin-triggers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md index d3d0aa019..f0b90ad8d 100644 --- a/docs/development/plugin-triggers.md +++ b/docs/development/plugin-triggers.md @@ -610,7 +610,7 @@ nginx -t - Description: Allows you to customize the contents of an application directory before they are processed for deployment. The `IMAGE_SOURCE_TYPE` can be any of `[herokuish, dockerfile]` - Invoked by: `dokku git-hook`, `dokku tar-build-locked` -- Arguments: `$APP $IMAGE_SOURCE_TYPE $TMP_WORK_DIR` +- Arguments: `$APP $IMAGE_SOURCE_TYPE $TMP_WORK_DIR $REV` - Example: ```shell @@ -620,7 +620,7 @@ nginx -t set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x -APP="$1"; IMAGE_SOURCE_TYPE="$2"; TMP_WORK_DIR="$3" +APP="$1"; IMAGE_SOURCE_TYPE="$2"; TMP_WORK_DIR="$3"; REV="$4" echo "$APP" > "$TMP_WORK_DIR/dokku-is-awesome" ```