From b7230f1bc86d1cc672aac404ae9714fc626320d1 Mon Sep 17 00:00:00 2001 From: lekss361 Date: Sun, 26 Apr 2026 14:26:57 +0300 Subject: [PATCH] deploy.yml: sync compose+Caddyfile from git, reload caddy after up --- .github/workflows/deploy.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5d16591f..d93ae8cc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -72,9 +72,21 @@ jobs: script: | set -euo pipefail cd /opt/gendesign + + # Sync compose / Caddyfile / init scripts from the repo. + # --ff-only refuses if there are local commits on the VM (we don't expect any). + git fetch origin main + git reset --hard origin/main + export IMAGE_TAG="$IMAGE_TAG" docker compose -f docker-compose.prod.yml pull docker compose -f docker-compose.prod.yml up -d + + # Caddyfile is bind-mounted; up -d won't re-read it. Reload explicitly. + # `|| true` so a temporary Caddy hiccup doesn't fail the whole deploy. + docker compose -f docker-compose.prod.yml exec -T caddy \ + caddy reload --config /etc/caddy/Caddyfile || true + docker image prune -f sleep 8 curl -fsS http://localhost:8000/health | head -c 200 || true