diff --git a/.gitea/workflows/nightly.yml b/.gitea/workflows/nightly.yml index 86564f9c..ccc691a3 100644 --- a/.gitea/workflows/nightly.yml +++ b/.gitea/workflows/nightly.yml @@ -74,6 +74,13 @@ jobs: MAIL_STARTTLS_ENABLE=false APP_MAIL_FROM=noreply@staging.raddatz.cloud IMPORT_HOST_DIR=/srv/familienarchiv-staging/import + POSTGRES_USER=archiv + PORT_GRAFANA=3003 + PORT_GLITCHTIP=3002 + PORT_PROMETHEUS=9090 + GRAFANA_ADMIN_PASSWORD=${{ secrets.GRAFANA_ADMIN_PASSWORD }} + GLITCHTIP_SECRET_KEY=${{ secrets.GLITCHTIP_SECRET_KEY }} + GLITCHTIP_DOMAIN=https://glitchtip.archiv.raddatz.cloud EOF - name: Verify backend /import:ro mount is wired @@ -120,6 +127,13 @@ jobs: --profile staging \ up -d --wait --remove-orphans + - name: Start observability stack + run: | + docker compose \ + -f docker-compose.observability.yml \ + --env-file .env.staging \ + up -d + - name: Reload Caddy # Apply any committed Caddyfile changes before smoke-testing the # public surface. Without this step, a Caddyfile edit lands in the diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index d980ca10..9ef65d14 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -72,6 +72,13 @@ jobs: MAIL_STARTTLS_ENABLE=true APP_MAIL_FROM=noreply@raddatz.cloud IMPORT_HOST_DIR=/srv/familienarchiv-production/import + POSTGRES_USER=archiv + PORT_GRAFANA=3003 + PORT_GLITCHTIP=3002 + PORT_PROMETHEUS=9090 + GRAFANA_ADMIN_PASSWORD=${{ secrets.GRAFANA_ADMIN_PASSWORD }} + GLITCHTIP_SECRET_KEY=${{ secrets.GLITCHTIP_SECRET_KEY }} + GLITCHTIP_DOMAIN=https://glitchtip.archiv.raddatz.cloud EOF - name: Build images @@ -93,6 +100,13 @@ jobs: --env-file .env.production \ up -d --wait --remove-orphans + - name: Start observability stack + run: | + docker compose \ + -f docker-compose.observability.yml \ + --env-file .env.production \ + up -d + - name: Reload Caddy # See nightly.yml — same rationale and mechanism: DooD job containers # cannot call systemctl directly; nsenter via a privileged sibling diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e8687d45..73139252 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -39,6 +39,7 @@ networks: archiv-net: driver: bridge + name: archiv-net volumes: postgres-data: