fix: respect pre-deploy task image manipulation

This requires a bc-incompatible break in terms of what triggers the pre-deploy hook (dokku internals vs schedulers).
This commit is contained in:
Jose Diaz-Gonzalez committed 2021-08-05 04:17:21 -04:00
1 parent d727dd76ce
commit 30a15aaa7a
7 files changed
+7 -13

No files matched your search

+1 -1
View File
@@ -65,7 +65,7 @@ scheduler-docker-local-pre-deploy-chown-app() {
scheduler-docker-local-pre-deploy-precheck() {
declare desc="Outputs the checks messages if necessary"
declare APP="$1" IMAGE_TAG="$2"
local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
local CHECKS_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
trap "rm -rf '$CHECKS_FILE' >/dev/null" RETURN INT TERM EXIT
copy_from_image "$IMAGE" "CHECKS" "$CHECKS_FILE" 2>/dev/null || true
@@ -22,7 +22,6 @@ trigger-scheduler-docker-local-scheduler-deploy() {
DOKKU_HEROKUISH=false
DOKKU_CNB=false
IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
is_image_cnb_based "$IMAGE" && DOKKU_CNB=true
is_image_herokuish_based "$IMAGE" "$APP" && DOKKU_HEROKUISH=true