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
This commit is contained in:
1 parent
10f6d00e04
commit
7bf61b401f
1 file changed
+1
-1
@@ -657,6 +657,7 @@ cmd-deploy() {
|
|||||||
|
|
||||||
verify_app_name "$APP"
|
verify_app_name "$APP"
|
||||||
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
|
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
|
||||||
|
plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
|
||||||
plugn trigger scheduler-deploy "$DOKKU_SCHEDULER" "$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"}
|
local DOKKU_SKIP_DEPLOY=${DOKKU_APP_SKIP_DEPLOY:="$DOKKU_GLOBAL_SKIP_DEPLOY"}
|
||||||
|
|
||||||
dokku_log_info1 "Releasing $APP..."
|
dokku_log_info1 "Releasing $APP..."
|
||||||
plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
|
|
||||||
dokku_release "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG"
|
dokku_release "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG"
|
||||||
|
|
||||||
if [[ "$DOKKU_SKIP_DEPLOY" != "true" ]]; then
|
if [[ "$DOKKU_SKIP_DEPLOY" != "true" ]]; then
|
||||||
|
|||||||
Reference in new issue
Block a user