From 7bf61b401fc4d8b49f01a920e1459e3a1015964b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 12 Aug 2021 17:34:57 -0400 Subject: [PATCH] fix: call pre-deploy before deploy but after release The dokku_release command adds more "stuff" by virtue of calling builder-release (the herokuish builder injects env vars). This more closely matches previous order of operations. Closes #4737 --- plugins/common/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/common/functions b/plugins/common/functions index b7fe733cf..bb6bd1d7f 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -657,6 +657,7 @@ cmd-deploy() { verify_app_name "$APP" local DOKKU_SCHEDULER=$(get_app_scheduler "$APP") + plugn trigger pre-deploy "$APP" "$IMAGE_TAG" plugn trigger scheduler-deploy "$DOKKU_SCHEDULER" "$APP" "$IMAGE_TAG" } @@ -687,7 +688,6 @@ release_and_deploy() { local DOKKU_SKIP_DEPLOY=${DOKKU_APP_SKIP_DEPLOY:="$DOKKU_GLOBAL_SKIP_DEPLOY"} dokku_log_info1 "Releasing $APP..." - plugn trigger pre-deploy "$APP" "$IMAGE_TAG" dokku_release "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG" if [[ "$DOKKU_SKIP_DEPLOY" != "true" ]]; then