diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 93bc0c9..0838c3a 100755 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -15,11 +15,8 @@ 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 "==> Building image" -docker compose -f "${SITE_DIR}/docker-compose.prod.yml" build --no-cache - -echo "==> Restarting service" -sudo systemctl restart sum-nohype +echo "==> Rebuilding and recreating web container" +docker compose -f "${SITE_DIR}/docker-compose.prod.yml" up -d --no-deps --build --force-recreate web echo "==> Waiting for health check" for i in $(seq 1 30); do @@ -30,5 +27,5 @@ for i in $(seq 1 30); do sleep 3 done echo "ERROR: site did not come up after 90s" >&2 -sudo journalctl -u sum-nohype --no-pager -n 50 +docker compose -f "${SITE_DIR}/docker-compose.prod.yml" logs --tail=50 web exit 1 diff --git a/deploy/sum-nohype.service b/deploy/sum-nohype.service index 81aef8d..eb30401 100644 --- a/deploy/sum-nohype.service +++ b/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=on-failure +Restart=always RestartSec=10 TimeoutStartSec=300 TimeoutStopSec=30