TAI/TA-Deployment-Broker
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update update.sh

Browse Source
This commit is contained in:
voltron
2026-07-25 19:01:42 -05:00
parent ec57321577
commit 371eaa3e05
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update.sh
+3 -3
View File
@@ -33,7 +33,7 @@ deploy_local_broker() {
[[ -f .env ]] || fail ".env was not found in ${SCRIPT_DIR}" [[ -f .env ]] || fail ".env was not found in ${SCRIPT_DIR}"
printf 'Building broker image...\n' printf 'Building broker image...\n'
docker compose build broker docker compose build --quiet broker
printf 'Applying pending database migrations...\n' printf 'Applying pending database migrations...\n'
docker compose run --rm migrate docker compose run --rm migrate
@@ -141,7 +141,7 @@ if ((POST_PULL == 0)); then
fail "tracked local changes must be committed or stashed before updating" fail "tracked local changes must be committed or stashed before updating"
printf 'Checking %s against %s...\n' "$branch" "$upstream" printf 'Checking %s against %s...\n' "$branch" "$upstream"
git fetch --prune "$remote" git fetch --quiet --prune "$remote"
local_commit="$(git rev-parse HEAD)" local_commit="$(git rev-parse HEAD)"
upstream_commit="$(git rev-parse '@{upstream}')" upstream_commit="$(git rev-parse '@{upstream}')"
@@ -149,7 +149,7 @@ if ((POST_PULL == 0)); then
printf 'Local TAPM Deployment Broker is already up to date.\n' printf 'Local TAPM Deployment Broker is already up to date.\n'
elif git merge-base --is-ancestor "$local_commit" "$upstream_commit"; then elif git merge-base --is-ancestor "$local_commit" "$upstream_commit"; then
printf 'Updating TAPM Deployment Broker from %s...\n' "$upstream" printf 'Updating TAPM Deployment Broker from %s...\n' "$upstream"
git merge --ff-only "$upstream_commit" git merge --quiet --ff-only "$upstream_commit"
# Restart from the newly pulled script so updates to this file take effect. # Restart from the newly pulled script so updates to this file take effect.
if ((LOCAL_ONLY == 1)); then if ((LOCAL_ONLY == 1)); then