From 1b1f2d3b3af1645defc3c4b63a4c50705068e647 Mon Sep 17 00:00:00 2001
From: Sirius DevOps <lance@siriusdevops.com>
Date: Fri, 28 Aug 2026 18:29:06 -0400
Subject: [PATCH] fix: merge alembic heads so the dashboard stops crash-looping

005_phase2 and 005_news_items both revised 004_camera_enum. Entrypoint
`alembic upgrade head` then failed and the app never bound :8000 (502
over Tailscale). Merge revision + `upgrade heads`.
---
 alembic/versions/006_merge_phase2_news.py | 24 +++++++++++++++++++++++
 app/docker-entrypoint.sh                  |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 alembic/versions/006_merge_phase2_news.py

diff --git a/alembic/versions/006_merge_phase2_news.py b/alembic/versions/006_merge_phase2_news.py
new file mode 100644
index 0000000..0018728
--- /dev/null
+++ b/alembic/versions/006_merge_phase2_news.py
@@ -0,0 +1,24 @@
+"""merge 005_phase2 and 005_news_items
+
+Revision ID: 006_merge_heads
+Revises: 005_phase2, 005_news_items
+Create Date: 2026-08-28
+
+Two PRs both parented 004_camera_enum (phase2 geofences + news_items).
+`alembic upgrade head` then fails and crash-loops the dashboard.
+"""
+
+from alembic import op  # noqa: F401
+
+revision = "006_merge_heads"
+down_revision = ("005_phase2", "005_news_items")
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass
diff --git a/app/docker-entrypoint.sh b/app/docker-entrypoint.sh
index d424e23..e81ab44 100644
--- a/app/docker-entrypoint.sh
+++ b/app/docker-entrypoint.sh
@@ -4,7 +4,9 @@ set -e
 
 cd /app
 echo "[entrypoint] running migrations..."
-alembic upgrade head
+# `heads` (plural): parallel PRs can fork the chain (005_phase2 + 005_news_items).
+# `upgrade head` then exits 255 and crash-loops the container.
+alembic upgrade heads
 
 echo "[entrypoint] starting uvicorn..."
 exec uvicorn app.main:app --host 0.0.0.0 --port 8000