Merge pull request #1399 from basicer/fix-multi-receive-app
Make dokku play nice when we have multiple receive-app hooks
This commit is contained in:
@@ -37,7 +37,7 @@ case "$1" in
|
|||||||
# if block if you wish to run it for others as well.
|
# if block if you wish to run it for others as well.
|
||||||
if [[ $refname = "refs/heads/master" ]] ; then
|
if [[ $refname = "refs/heads/master" ]] ; then
|
||||||
# broken out into pluginhook so we might support other methods to receive an app
|
# broken out into pluginhook so we might support other methods to receive an app
|
||||||
pluginhook receive-app $APP $newrev
|
pluginhook -p receive-app $APP $newrev
|
||||||
else
|
else
|
||||||
if test -f "$PLUGIN_PATH"/enabled/*/receive-branch; then
|
if test -f "$PLUGIN_PATH"/enabled/*/receive-branch; then
|
||||||
pluginhook receive-branch $APP $newrev $refname
|
pluginhook receive-branch $APP $newrev $refname
|
||||||
|
|||||||
@@ -4,4 +4,9 @@ source "$(dirname $0)/../common/functions"
|
|||||||
|
|
||||||
APP="$1"; REV="$2"
|
APP="$1"; REV="$2"
|
||||||
|
|
||||||
dokku git-build $APP $REV
|
# Don't trigger git build if there is no git repository.
|
||||||
|
if [ ! -d "$DOKKU_ROOT/$APP/refs" ]; then
|
||||||
|
cat
|
||||||
|
else
|
||||||
|
dokku git-build $APP $REV
|
||||||
|
fi
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ case "$1" in
|
|||||||
verify_app_name "$2"
|
verify_app_name "$2"
|
||||||
APP="$2"
|
APP="$2"
|
||||||
|
|
||||||
pluginhook receive-app $APP
|
pluginhook -p receive-app $APP
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ps:rebuildall)
|
ps:rebuildall)
|
||||||
|
|||||||
Reference in New Issue
Block a user