Merge pull request 'fix: auto-set Wagtail site hostname on startup' (#16) from fix/prod-site-hostname into main

deploy/deploy.sh

@@ -6,8 +6,6 @@ set -euo pipefail
 SITE_DIR=/srv/sum/nohype
 APP_DIR=${SITE_DIR}/app
 
-cd "${SITE_DIR}"
-
 echo "==> Pulling latest code"
 git -C "${APP_DIR}" pull origin main
 
@@ -17,8 +15,11 @@ cp "${APP_DIR}/docker-compose.prod.yml" "${SITE_DIR}/docker-compose.prod.yml"
 echo "==> Ensuring static/media directories exist"
 mkdir -p "${SITE_DIR}/static" "${SITE_DIR}/media"
 
-echo "==> Rebuilding and recreating web container"
+echo "==> Building image"
-docker compose -f "${SITE_DIR}/docker-compose.prod.yml" up -d --no-deps --build --force-recreate web
+docker compose -f "${SITE_DIR}/docker-compose.prod.yml" build --no-cache
+
+echo "==> Restarting service"
+sudo systemctl restart sum-nohype
 
 echo "==> Waiting for health check"
 for i in $(seq 1 30); do
@@ -29,5 +30,5 @@ for i in $(seq 1 30); do
   sleep 3
 done
 echo "ERROR: site did not come up after 90s" >&2
-docker compose -f "${SITE_DIR}/docker-compose.prod.yml" logs --tail=50 web
+sudo journalctl -u sum-nohype --no-pager -n 50
 exit 1

deploy/sum-nohype.service

@@ -13,7 +13,7 @@ ExecStartPre=docker compose -f docker-compose.prod.yml pull --ignore-pull-failur
 ExecStart=docker compose -f docker-compose.prod.yml up --build
 ExecStop=docker compose -f docker-compose.prod.yml down
 
-Restart=always
+Restart=on-failure
 RestartSec=10
 TimeoutStartSec=300
 TimeoutStopSec=30