Merge branch 'dev' into stage

# Conflicts: # komodo/resources.toml
fix(compose): pass BACKUP_KEY through to the server container
2026-06-29 15:57:10 +02:00 · 2026-06-29 15:56:39 +02:00 · 2026-06-29 15:27:31 +02:00 · 2026-06-29 15:19:35 +02:00 · 2026-06-29 13:12:27 +02:00
2 changed files with 8 additions and 4 deletions
@@ -24,6 +24,10 @@ services:
      # Dedicated ledger-signing key. Falls back to JWT_SECRET (with a warning) if empty;
      # set a distinct one in prod. See apps/server/.env.example + local-jwt-auth.
      EVENT_SIGNING_KEY: ${EVENT_SIGNING_KEY:-}
      # Dedicated backup-ENCRYPTION key (separate from the signing key). Empty = backups stay
      # off (the in-UI target + retention do nothing without it). Per-booth + unique; escrow it
      # offsite. See apps/server/.env.example + wiki/concepts/backup-recovery.md.
      BACKUP_KEY: ${BACKUP_KEY:-}
      # CRITICAL on the plain-HTTP booth LAN: cookies are Secure (HTTPS-only) by DEFAULT,
      # so without COOKIE_SECURE=0 the auth cookie is never sent over http and operators
      # CANNOT LOG IN. Leave unset only behind TLS. See disk-os-hardening "deploy-time runbook".
@@ -46,10 +46,10 @@ registry_provider = "git.infra.msai.al"
 registry_account = "komodo"
 environment = """
 REGISTRY=git.infra.msai.al/mca/parking_solution
-# Staging booth: pin an immutable stage-<sha> per deploy. PLACEHOLDER below — after merging
+# Staging booth: pinned immutable stage-<sha>. After each promotion (merge dev → stage, CI builds
-# dev → stage and CI builds :stage-<sha>, set this to that exact sha (or override TAG in Core at
+# :stage-<sha>), bump this to the new sha and re-sync/deploy from Core. The moving `:stage` tag
-# deploy). The moving `:stage` tag exists as the pointer; we deploy the sha, not the mover.
+# exists as the pointer; we deploy the sha, not the mover.
-TAG=stage-REPLACE_WITH_BUILT_SHA
+TAG=stage-39c778f
 COOKIE_SECURE=0
 VISION_ENABLED=1
 WS_ALLOWED_ORIGINS=
Author	SHA1	Message	Date
julian	d0b609e375	Merge branch 'dev' into stage Build & push images / images (push) Successful in 2m46s Details # Conflicts: # komodo/resources.toml	2026-06-29 15:57:10 +02:00
julian	8f32d90d28	fix(compose): pass BACKUP_KEY through to the server container Build & push images / images (push) Successful in 2m47s Details CI / check (push) Successful in 38s Details The server's compose environment: block is an allowlist — it only forwards the vars it names. BACKUP_KEY was never added when the backup feature landed, so even though Komodo wrote BACKUP_KEY into the Stack .env, compose dropped it and the container came up without it (docker inspect showed JWT/SIGN present, BACKUP_KEY absent — not empty, absent). The Backup screen correctly reported 'BACKUP_KEY missing'. Add BACKUP_KEY: ${BACKUP_KEY:-} next to EVENT_SIGNING_KEY (optional, empty default — backups stay off until it's set). The prod overlay only merges VISION_URL, so the base addition flows through to prod. Claude-Session: https://claude.ai/code/session_01Xcm6ikLgGoCxxHrxtjkk5V	2026-06-29 15:56:39 +02:00
julian	07295f8063	deploy(park-buzi): pin TAG=stage-39c778f Build & push images / images (push) Successful in 2m48s Details CI / check (push) Successful in 38s Details The first :stage image is built and in the registry (stage-39c778f). Pin it in the IaC so git matches Core's Stack env and a ResourceSync won't revert TAG to the placeholder. Bump this on each promotion. Claude-Session: https://claude.ai/code/session_01Xcm6ikLgGoCxxHrxtjkk5V	2026-06-29 15:27:31 +02:00
julian	652d6599d3	ci(build-images): trigger on komodo/ too Build & push images / images (push) Successful in 2m44s Details CI / check (push) Successful in 41s Details A push only builds if it touches a path in the filter. The first stage commit was komodo-only, so no :stage image was ever built. Add komodo/ so IaC/Stack changes (and a komodo-only push to stage) also build+check — a deploy-config change gets the same sanity pass before it reaches a booth. This commit itself touches the workflow file (already filtered), so it triggers the build that produces the first :stage image. Claude-Session: https://claude.ai/code/session_01Xcm6ikLgGoCxxHrxtjkk5V	2026-06-29 15:19:35 +02:00
julian	e16bccc2f5	chore(deploy): park-buzi TAG is a placeholder, pinned at deploy time Build & push images / images (push) Successful in 2m51s Details CI / check (push) Successful in 40s Details A committed stage-<sha> can never match the commit that introduces it (the pin commit changes HEAD), so a hardcoded sha here is always stale by one. Make it an explicit placeholder (stage-REPLACE_WITH_BUILT_SHA); the real immutable sha is set when you deploy from Komodo Core after CI builds :stage-<sha>. No moving tag on a booth still holds. Claude-Session: https://claude.ai/code/session_01Xcm6ikLgGoCxxHrxtjkk5V	2026-06-29 13:12:27 +02:00