twooeyandClaude Sonnet 5
b43852e733
- Replace the bare-repo post-receive hook with deploy/poll-deploy.sh: Gitea
and the Docker hosts are separate machines, so each box polls its branch
via host crontab instead of needing an exposed webhook receiver.
- Add Blocksy theme + Blocksy Companion auto-install to deploy.sh (free
tier; the paid Book Store starter site still needs a manual license step).
- Fix deploy.sh/backup.sh/restore.sh sourcing .env files as bash: a bcrypt
hash's `$2a$14$...` shape breaks under `set -u`. Replaced with
deploy/lib/env.sh, a literal (non-executing) KEY=VALUE reader.
- Fix docker compose itself mangling the same kind of value: both
`environment: ${VAR}` and `env_file:` run values through Compose's
interpolation, which silently blanks `$identifier`-shaped substrings.
The staging basic-auth hash is now rendered directly into the Caddyfile
by deploy.sh, bypassing Compose's variable system entirely.
- Fix dev/staging/production silently sharing one Compose project (and
therefore one db_data volume) by pinning an explicit -p per environment.
- cron and wordpress now share one environment anchor so they can't drift
apart again (cron was silently missing WORDPRESS_CONFIG_EXTRA before).
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
34 lines
1.2 KiB
Bash
Executable File
34 lines
1.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Meant to run via the HOST's system crontab on each environment's box (not
|
|
# inside a container) — Gitea lives on a separate machine, so rather than
|
|
# exposing an inbound webhook receiver on staging/production, each box just
|
|
# polls its branch and redeploys when it moves. Silent when there's nothing
|
|
# new, so it's safe to run every couple of minutes from cron.
|
|
#
|
|
# Example crontab line (staging box):
|
|
# */2 * * * * /srv/bookstore/deploy/poll-deploy.sh staging >> /var/log/bookstore-deploy.log 2>&1
|
|
set -euo pipefail
|
|
|
|
ENVIRONMENT="${1:?Usage: poll-deploy.sh <staging|production>}"
|
|
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
cd "$REPO_ROOT"
|
|
|
|
case "$ENVIRONMENT" in
|
|
staging) BRANCH=staging ;;
|
|
production) BRANCH=main ;;
|
|
*) echo "environment must be 'staging' or 'production'" >&2; exit 1 ;;
|
|
esac
|
|
|
|
BEFORE="$(git rev-parse HEAD)"
|
|
git fetch origin "$BRANCH" --quiet
|
|
AFTER="$(git rev-parse "origin/${BRANCH}")"
|
|
|
|
if [[ "$BEFORE" == "$AFTER" ]]; then
|
|
exit 0
|
|
fi
|
|
|
|
echo "$(date -Is) deploying ${ENVIRONMENT} (${BRANCH}): ${BEFORE:0:7} -> ${AFTER:0:7}"
|
|
git checkout -f "$BRANCH"
|
|
git reset --hard "origin/${BRANCH}"
|
|
"$REPO_ROOT/deploy/deploy.sh" "$ENVIRONMENT"
|