fix: keep the git source-image property in sync with failed deploys
The source-image property was written before the deploy lock was taken and was not restored when a deploy failed, so after a rejected git:from-image or git:load-image it named an image that was not deployed, and later builds extracted app.json, Procfile, and CHECKS from it. Deploys from other sources also built while the old image was still set. Entry points now pass the desired value via DOKKU_GIT_SOURCE_IMAGE and git_receive_app applies it while holding the deploy lock, restoring the previous value on failure. git:sync clears the property under the lock when it fetches new code. Closes #9117
This commit is contained in:
9 files changed
+383
-24
No files matched your search
+19
-5
@@ -88,12 +88,12 @@ cmd-git-hook() {
|
||||
# Only run this script for the master branch. You can remove this
|
||||
# if block if you wish to run it for others as well.
|
||||
if [[ $refname == "refs/heads/${DOKKU_DEPLOY_BRANCH}" ]] || [[ $refname == "refs/tags/${DOKKU_DEPLOY_BRANCH}" ]]; then
|
||||
git_receive_app "$APP" "$newrev"
|
||||
DOKKU_GIT_SOURCE_IMAGE="" git_receive_app "$APP" "$newrev"
|
||||
plugn trigger deploy-source-set "$APP" "git-push" "$newrev"
|
||||
else
|
||||
# broken out into plugin so we might support other methods to receive an app
|
||||
if [[ $(find "$PLUGIN_PATH"/enabled/*/receive-branch 2>/dev/null | wc -l) != 1 ]]; then
|
||||
plugn trigger receive-branch "$APP" "$newrev" "$refname"
|
||||
DOKKU_GIT_SOURCE_IMAGE="" plugn trigger receive-branch "$APP" "$newrev" "$refname"
|
||||
plugn trigger deploy-source-set "$APP" "git-push" "$newrev"
|
||||
elif [[ -z "$(fn-git-computed-deploy-branch "$APP" "")" ]]; then
|
||||
local deploy_branch="${refname/refs\/heads\//}"
|
||||
@@ -101,7 +101,7 @@ cmd-git-hook() {
|
||||
|
||||
echo $'\e[1G\e[K'"-----> Set ${deploy_branch} as deploy-branch"
|
||||
fn-plugin-property-write "git" "$APP" "deploy-branch" "${deploy_branch}"
|
||||
git_receive_app "$APP" "$newrev"
|
||||
DOKKU_GIT_SOURCE_IMAGE="" git_receive_app "$APP" "$newrev"
|
||||
plugn trigger deploy-source-set "$APP" "git-push" "$newrev"
|
||||
else
|
||||
echo $'\e[1G\e[K'"-----> WARNING: deploy did not complete, you must push to ${DOKKU_DEPLOY_BRANCH}."
|
||||
@@ -150,9 +150,23 @@ git_receive_app() {
|
||||
if [[ ! -d "$DOKKU_ROOT/$APP/refs" ]]; then
|
||||
true
|
||||
else
|
||||
local exit_code=0
|
||||
local exit_code=0 has_source_image=false source_image previous_source_image
|
||||
acquire_app_deploy_lock "$APP" "exclusive"
|
||||
git_build "$APP" "$REV" || exit_code="$?"
|
||||
|
||||
# DOKKU_GIT_SOURCE_IMAGE is only applied while the deploy lock is held. An
|
||||
# empty value clears the property, while an unset variable leaves it as-is.
|
||||
if [[ -n "${DOKKU_GIT_SOURCE_IMAGE+x}" ]]; then
|
||||
has_source_image=true
|
||||
source_image="$DOKKU_GIT_SOURCE_IMAGE"
|
||||
unset DOKKU_GIT_SOURCE_IMAGE
|
||||
previous_source_image="$(fn-git-source-image "$APP")"
|
||||
fn-plugin-property-write "git" "$APP" "source-image" "$source_image"
|
||||
fi
|
||||
|
||||
(git_build "$APP" "$REV") || exit_code="$?"
|
||||
if [[ "$exit_code" -ne 0 ]] && [[ "$has_source_image" == "true" ]]; then
|
||||
fn-plugin-property-write "git" "$APP" "source-image" "$previous_source_image"
|
||||
fi
|
||||
release_app_deploy_lock "$APP" "$exit_code"
|
||||
return "$exit_code"
|
||||
fi
|
||||
|
||||
@@ -51,7 +51,7 @@ trigger-git-git-from-archive() {
|
||||
popd &>/dev/null || pushd "/tmp" >/dev/null
|
||||
fi
|
||||
|
||||
plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
|
||||
DOKKU_GIT_SOURCE_IMAGE="" plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
|
||||
}
|
||||
|
||||
trigger-git-git-from-archive "$@"
|
||||
@@ -60,7 +60,8 @@ trigger-git-git-from-directory() {
|
||||
fi
|
||||
|
||||
rm -rf "$TMP_WORK_DIR" "$TMP_WORK_DIR_2" >/dev/null
|
||||
if git_receive_app "$APP" "$REV"; then
|
||||
# run in a subshell so a failure to acquire the deploy lock still reaches the rollback
|
||||
if (git_receive_app "$APP" "$REV"); then
|
||||
return
|
||||
else
|
||||
local exit_code=$?
|
||||
|
||||
@@ -44,8 +44,7 @@ trigger-git-git-from-image() {
|
||||
dokku_log_info1 "Image exists on host, skipping pull"
|
||||
fi
|
||||
|
||||
fn-plugin-property-write "git" "$APP" "source-image" "$DOCKER_IMAGE"
|
||||
plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
|
||||
DOKKU_GIT_SOURCE_IMAGE="$DOCKER_IMAGE" plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
|
||||
}
|
||||
|
||||
trigger-git-git-from-image "$@"
|
||||
@@ -279,33 +279,59 @@ cmd-git-sync() {
|
||||
fi
|
||||
|
||||
local APP_ROOT="$DOKKU_ROOT/$APP"
|
||||
DOKKU_DEPLOY_BRANCH="$(fn-git-computed-deploy-branch "$APP")"
|
||||
CURRENT_REF="$(fn-git-cmd "$APP_ROOT" rev-parse "$DOKKU_DEPLOY_BRANCH" 2>/dev/null || true)"
|
||||
local APP_DEPLOY_LOCK_FILE="$DOKKU_LIB_ROOT/data/apps/$APP/.deploy.lock"
|
||||
local fetch_exit_code=0
|
||||
|
||||
dokku_setup_build_capture "$APP" "git:sync"
|
||||
|
||||
if ! fn-git-cmd "$APP_ROOT" rev-parse "$DOKKU_DEPLOY_BRANCH" &>/dev/null; then
|
||||
dokku_log_info1_quiet "Cloning $APP from $GIT_REMOTE#$GIT_REF"
|
||||
fn-git-clone "$APP" "$GIT_REMOTE" "$GIT_REF" "$SKIP_DEPLOY_BRANCH"
|
||||
else
|
||||
dokku_log_verbose "Fetching remote code for $APP from $GIT_REMOTE#$GIT_REF"
|
||||
fn-git-fetch "$APP" "$GIT_REMOTE" "$GIT_REF"
|
||||
# acquire_app_deploy_lock is not used as releasing it would finalize the
|
||||
# build record before the build starts
|
||||
acquire_advisory_lock "$APP_DEPLOY_LOCK_FILE" "exclusive" "$APP currently has a deploy lock in place. Waiting..." "$APP currently has a deploy lock in place. Exiting..."
|
||||
|
||||
DOKKU_DEPLOY_BRANCH="$(fn-git-computed-deploy-branch "$APP")"
|
||||
CURRENT_REF="$(fn-git-cmd "$APP_ROOT" rev-parse "$DOKKU_DEPLOY_BRANCH" 2>/dev/null || true)"
|
||||
|
||||
# the subshell keeps set -e active and ensures the lock is released on failure
|
||||
set +e
|
||||
(
|
||||
set -e
|
||||
if ! fn-git-cmd "$APP_ROOT" rev-parse "$DOKKU_DEPLOY_BRANCH" &>/dev/null; then
|
||||
dokku_log_info1_quiet "Cloning $APP from $GIT_REMOTE#$GIT_REF"
|
||||
fn-git-clone "$APP" "$GIT_REMOTE" "$GIT_REF" "$SKIP_DEPLOY_BRANCH"
|
||||
else
|
||||
dokku_log_verbose "Fetching remote code for $APP from $GIT_REMOTE#$GIT_REF"
|
||||
fn-git-fetch "$APP" "$GIT_REMOTE" "$GIT_REF"
|
||||
fi
|
||||
)
|
||||
fetch_exit_code="$?"
|
||||
set -e
|
||||
|
||||
if [[ "$fetch_exit_code" -ne 0 ]]; then
|
||||
release_advisory_lock "$APP_DEPLOY_LOCK_FILE"
|
||||
return "$fetch_exit_code"
|
||||
fi
|
||||
|
||||
UPDATED_REF="$(fn-git-cmd "$APP_ROOT" rev-parse "$DOKKU_DEPLOY_BRANCH" 2>/dev/null || true)"
|
||||
local SHOULD_BUILD=false
|
||||
if [[ "$FLAG" == "--build" ]]; then
|
||||
SHOULD_BUILD=true
|
||||
elif [[ "$FLAG" == "--build-if-changes" ]]; then
|
||||
if [[ "$CURRENT_REF" == "$UPDATED_REF" ]]; then
|
||||
dokku_log_verbose "Skipping build as no changes were detected"
|
||||
dokku_discard_build_capture "$APP"
|
||||
return
|
||||
fi
|
||||
|
||||
elif [[ "$FLAG" == "--build-if-changes" ]] && [[ "$CURRENT_REF" != "$UPDATED_REF" ]]; then
|
||||
SHOULD_BUILD=true
|
||||
fi
|
||||
|
||||
# the synced code is kept even if the build fails, so the source-image is
|
||||
# cleared rather than restored on failure
|
||||
if [[ "$CURRENT_REF" != "$UPDATED_REF" ]] || [[ "$SHOULD_BUILD" == "true" ]]; then
|
||||
fn-plugin-property-write "git" "$APP" "source-image"
|
||||
fi
|
||||
release_advisory_lock "$APP_DEPLOY_LOCK_FILE"
|
||||
|
||||
if [[ "$FLAG" == "--build-if-changes" ]] && [[ "$SHOULD_BUILD" == "false" ]]; then
|
||||
dokku_log_verbose "Skipping build as no changes were detected"
|
||||
dokku_discard_build_capture "$APP"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ "$SHOULD_BUILD" == "true" ]]; then
|
||||
if [[ -n "$GIT_REF" ]]; then
|
||||
GIT_REF="$(fn-git-cmd "$APP_ROOT" rev-parse "$GIT_REF")"
|
||||
|
||||
Reference in new issue
Block a user