Update update.sh
This commit is contained in:
@@ -33,7 +33,7 @@ deploy_local_broker() {
|
||||
[[ -f .env ]] || fail ".env was not found in ${SCRIPT_DIR}"
|
||||
|
||||
printf 'Building broker image...\n'
|
||||
docker compose build broker
|
||||
docker compose build --quiet broker
|
||||
|
||||
printf 'Applying pending database migrations...\n'
|
||||
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"
|
||||
|
||||
printf 'Checking %s against %s...\n' "$branch" "$upstream"
|
||||
git fetch --prune "$remote"
|
||||
git fetch --quiet --prune "$remote"
|
||||
|
||||
local_commit="$(git rev-parse HEAD)"
|
||||
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'
|
||||
elif git merge-base --is-ancestor "$local_commit" "$upstream_commit"; then
|
||||
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.
|
||||
if ((LOCAL_ONLY == 1)); then
|
||||
|
||||
Reference in New Issue
Block a user