From 21725faf3eb1d28f137c9c30a0139f3f794b634e Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 22 Feb 2026 05:54:21 +0000
Subject: [PATCH 1/4] Show git commit SHA and branch next to deployment time on
 About page

Captures git info (commit SHA, branch, commit message) at app startup
and displays it alongside the deployment time in the preferences/about
page. The commit SHA links to the GitHub commit page and hovering shows
the commit message.

https://claude.ai/code/session_016jtUbw7EGXX2hxDvvgBgQ8
---
 media/apps.py                          | 24 ++++++++++++++++++++++++
 media/templates/admin/preferences.html |  9 +++++++++
 media/views.py                         |  3 ++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/media/apps.py b/media/apps.py
index acab66c..0883817 100644
--- a/media/apps.py
+++ b/media/apps.py
@@ -1,3 +1,5 @@
+import subprocess
+
 from django.apps import AppConfig
 from django.utils import timezone
 
@@ -5,6 +7,28 @@
 DEPLOY_TIME = timezone.now()
 
 
+def _get_git_info():
+    """Capture git info at startup for display on the About page."""
+    info = {'commit_sha': '', 'commit_sha_short': '', 'commit_message': '', 'branch': ''}
+    try:
+        info['commit_sha'] = subprocess.check_output(
+            ['git', 'rev-parse', 'HEAD'], stderr=subprocess.DEVNULL, text=True
+        ).strip()
+        info['commit_sha_short'] = info['commit_sha'][:7]
+        info['commit_message'] = subprocess.check_output(
+            ['git', 'log', '-1', '--pretty=%s'], stderr=subprocess.DEVNULL, text=True
+        ).strip()
+        info['branch'] = subprocess.check_output(
+            ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], stderr=subprocess.DEVNULL, text=True
+        ).strip()
+    except Exception:
+        pass
+    return info
+
+
+GIT_INFO = _get_git_info()
+
+
 class MediaConfig(AppConfig):
     name = 'media'
     default_auto_field = 'django.db.models.BigAutoField'
diff --git a/media/templates/admin/preferences.html b/media/templates/admin/preferences.html
index 5eca12f..bdabeec 100644
--- a/media/templates/admin/preferences.html
+++ b/media/templates/admin/preferences.html
@@ -244,6 +244,15 @@ <h2>{% trans "About" %}</h2>
                 <span id="deploy-time" data-utc="{{ deploy_time|date:'c' }}">
                     {{ deploy_time|timesince }} {% trans "ago" %} ({{ deploy_time }})
                 </span>
+                {% if git_info.commit_sha_short %}
+                &mdash;
+                <a href="https://github.com/jonocodes/stashcast/commit/{{ git_info.commit_sha }}" target="_blank" rel="noopener" title="{{ git_info.commit_message }}">
+                    <code>{{ git_info.commit_sha_short }}</code>
+                </a>
+                {% if git_info.branch %}
+                    on <code>{{ git_info.branch }}</code>
+                {% endif %}
+                {% endif %}
                 <script>
                     (function() {
                         var el = document.getElementById('deploy-time');
diff --git a/media/views.py b/media/views.py
index a96341d..3700d84 100644
--- a/media/views.py
+++ b/media/views.py
@@ -978,7 +978,7 @@ def preferences_view(request):
     # Episode limit
     max_episodes = settings.STASHCAST_MAX_EPISODES
 
-    from media.apps import DEPLOY_TIME
+    from media.apps import DEPLOY_TIME, GIT_INFO
 
     context = {
         **admin.site.each_context(request),
@@ -992,6 +992,7 @@ def preferences_view(request):
         'total_storage_bytes': total_storage_bytes,
         'max_episodes': max_episodes,
         'deploy_time': DEPLOY_TIME,
+        'git_info': GIT_INFO,
     }
 
     return render(request, 'admin/preferences.html', context)

From b7b07eb660af88ef009014758f4a47642fae2d5c Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 22 Feb 2026 13:57:36 +0000
Subject: [PATCH 2/4] Fix git info display in Docker/Coolify deployments

Use a multi-stage Docker build to extract git info at build time:
- Stage 1 (alpine + git + jq) reads .git and writes /git_info.json
- Stage 2 copies the JSON to /etc/git_info.json (survives volume mounts)
- apps.py checks /etc/git_info.json first, then falls back to live git

Also un-ignores .git in .dockerignore so the first build stage can
access it, and adds git_info.json to .gitignore.

https://claude.ai/code/session_016jtUbw7EGXX2hxDvvgBgQ8
---
 .dockerignore |  3 ++-
 .gitignore    |  3 +++
 Dockerfile    | 25 ++++++++++++++++++++-----
 media/apps.py | 25 ++++++++++++++++++++++++-
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 3a8127a..617e1d6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -27,7 +27,8 @@ data_docker/
 # Environment
 # .env
 # .env.local
-.git
+# .git is needed by the git-info build stage in the Dockerfile
+# .git
 
 # IDE
 .vscode/
diff --git a/.gitignore b/.gitignore
index 4ee58f0..c9ca684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,9 @@ ENV/
 output/
 .coverage
 
+# Build artifacts
+git_info.json
+
 # Django
 *.log
 # db.sqlite3
diff --git a/Dockerfile b/Dockerfile
index 77f6d41..30094ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,16 @@
-# Use the official Python runtime image
+# Stage 1: Extract git info (lightweight, only used at build time)
+FROM alpine:3.21 AS git-info
+RUN apk add --no-cache git jq
+WORKDIR /src
+COPY .git .git
+RUN jq -n \
+    --arg sha "$(git rev-parse HEAD 2>/dev/null)" \
+    --arg msg "$(git log -1 --pretty=%s 2>/dev/null)" \
+    '{commit_sha: $sha, commit_message: $msg, branch: ""}' \
+    > /git_info.json 2>/dev/null || \
+    echo '{"commit_sha": "", "commit_message": "", "branch": ""}' > /git_info.json
+
+# Stage 2: Main application image
 FROM python:3.13-slim
 
 # Create the app directory
@@ -7,11 +19,11 @@ RUN mkdir /app
 # Set the working directory inside the container
 WORKDIR /app
 
-# Set environment variables 
+# Set environment variables
 # Prevents Python from writing pyc files to disk
 ENV PYTHONDONTWRITEBYTECODE=1
 #Prevents Python from buffering stdout and stderr
-ENV PYTHONUNBUFFERED=1 
+ENV PYTHONUNBUFFERED=1
 
 # Install system dependencies
 RUN apt-get update && \
@@ -19,17 +31,20 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Upgrade pip
-RUN pip install --upgrade pip 
+RUN pip install --upgrade pip
 
 # Copy the Django project  and install dependencies
 COPY requirements.txt  /app/
 
-# run this command to install all dependencies 
+# run this command to install all dependencies
 RUN pip install --no-cache-dir -r requirements.txt
 
 # Copy the Django project to the container
 COPY . /app/
 
+# Copy git info from the first stage (outside /app so volume mounts don't hide it)
+COPY --from=git-info /git_info.json /etc/git_info.json
+
 # Expose the Django port
 EXPOSE 8000
 
diff --git a/media/apps.py b/media/apps.py
index 0883817..6b204f6 100644
--- a/media/apps.py
+++ b/media/apps.py
@@ -1,4 +1,6 @@
+import json
 import subprocess
+from pathlib import Path
 
 from django.apps import AppConfig
 from django.utils import timezone
@@ -8,8 +10,29 @@
 
 
 def _get_git_info():
-    """Capture git info at startup for display on the About page."""
+    """Capture git info at startup for display on the About page.
+
+    Tries two sources in order:
+    1. git_info.json written during Docker build (for container deploys)
+    2. Live git commands (for local development)
+    """
     info = {'commit_sha': '', 'commit_sha_short': '', 'commit_message': '', 'branch': ''}
+
+    # Try reading from the build-time JSON file (Docker deployments)
+    # Check /etc first (survives volume mounts), then app dir (local builds)
+    for json_path in [Path('/etc/git_info.json'), Path(__file__).resolve().parent.parent / 'git_info.json']:
+        try:
+            data = json.loads(json_path.read_text())
+            if data.get('commit_sha'):
+                info['commit_sha'] = data['commit_sha']
+                info['commit_sha_short'] = data['commit_sha'][:7]
+                info['commit_message'] = data.get('commit_message', '')
+                info['branch'] = data.get('branch', '')
+                return info
+        except Exception:
+            pass
+
+    # Fall back to live git commands (local development)
     try:
         info['commit_sha'] = subprocess.check_output(
             ['git', 'rev-parse', 'HEAD'], stderr=subprocess.DEVNULL, text=True

From 1773e92fe82c903654cea011eaa190c9a4ec9992 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 22 Feb 2026 13:58:15 +0000
Subject: [PATCH 3/4] Log git commit info on server startup

Prints the commit SHA, branch, and commit message to the server log
when the Django app starts, making it easy to identify which version
is running.

https://claude.ai/code/session_016jtUbw7EGXX2hxDvvgBgQ8
---
 media/apps.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/media/apps.py b/media/apps.py
index 6b204f6..105d7ab 100644
--- a/media/apps.py
+++ b/media/apps.py
@@ -1,10 +1,13 @@
 import json
+import logging
 import subprocess
 from pathlib import Path
 
 from django.apps import AppConfig
 from django.utils import timezone
 
+logger = logging.getLogger(__name__)
+
 
 DEPLOY_TIME = timezone.now()
 
@@ -58,3 +61,12 @@ class MediaConfig(AppConfig):
 
     def ready(self):
         """Import signals when the app is ready"""
+        if GIT_INFO['commit_sha_short']:
+            logger.info(
+                "StashCast commit=%s branch=%s message=%s",
+                GIT_INFO['commit_sha_short'],
+                GIT_INFO.get('branch', ''),
+                GIT_INFO.get('commit_message', ''),
+            )
+        else:
+            logger.info("StashCast git info not available")

From d10467d9b50b6f1e977df5894e140a437e2ac4fc Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 22 Feb 2026 15:16:21 +0000
Subject: [PATCH 4/4] Fix Coolify deploy: replace .git COPY with build args

Coolify doesn't include .git in the build context, causing
"/.git: not found" during docker build. Replace the multi-stage
git-info approach with build args (GIT_COMMIT_SHA, GIT_COMMIT_MSG,
GIT_BRANCH) and add .git to .dockerignore since it's no longer needed.

https://claude.ai/code/session_016jtUbw7EGXX2hxDvvgBgQ8
---
 .dockerignore              |  3 +--
 Dockerfile                 | 23 ++++++++---------------
 docker-compose.coolify.yml | 14 ++++++++++++--
 docker-compose.yml         | 14 ++++++++++++--
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 617e1d6..3a8127a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -27,8 +27,7 @@ data_docker/
 # Environment
 # .env
 # .env.local
-# .git is needed by the git-info build stage in the Dockerfile
-# .git
+.git
 
 # IDE
 .vscode/
diff --git a/Dockerfile b/Dockerfile
index 30094ab..96dc576 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,10 @@
-# Stage 1: Extract git info (lightweight, only used at build time)
-FROM alpine:3.21 AS git-info
-RUN apk add --no-cache git jq
-WORKDIR /src
-COPY .git .git
-RUN jq -n \
-    --arg sha "$(git rev-parse HEAD 2>/dev/null)" \
-    --arg msg "$(git log -1 --pretty=%s 2>/dev/null)" \
-    '{commit_sha: $sha, commit_message: $msg, branch: ""}' \
-    > /git_info.json 2>/dev/null || \
-    echo '{"commit_sha": "", "commit_message": "", "branch": ""}' > /git_info.json
-
-# Stage 2: Main application image
 FROM python:3.13-slim
 
+# Git info passed as build args (no .git directory needed)
+ARG GIT_COMMIT_SHA=""
+ARG GIT_COMMIT_MSG=""
+ARG GIT_BRANCH=""
+
 # Create the app directory
 RUN mkdir /app
 
@@ -42,8 +34,9 @@ RUN pip install --no-cache-dir -r requirements.txt
 # Copy the Django project to the container
 COPY . /app/
 
-# Copy git info from the first stage (outside /app so volume mounts don't hide it)
-COPY --from=git-info /git_info.json /etc/git_info.json
+# Write git info (outside /app so volume mounts don't hide it)
+RUN printf '{"commit_sha": "%s", "commit_message": "%s", "branch": "%s"}\n' \
+    "$GIT_COMMIT_SHA" "$GIT_COMMIT_MSG" "$GIT_BRANCH" > /etc/git_info.json
 
 # Expose the Django port
 EXPOSE 8000
diff --git a/docker-compose.coolify.yml b/docker-compose.coolify.yml
index adf8b81..8949868 100644
--- a/docker-compose.coolify.yml
+++ b/docker-compose.coolify.yml
@@ -12,7 +12,12 @@ services:
       - web
 
   web:
-    build: .
+    build:
+      context: .
+      args:
+        GIT_COMMIT_SHA: ${GIT_COMMIT_SHA:-}
+        GIT_COMMIT_MSG: ${GIT_COMMIT_MSG:-}
+        GIT_BRANCH: ${GIT_BRANCH:-}
     container_name: stashcast_web
     environment:
       STASHCAST_DATA_DIR: /app/data_docker
@@ -23,7 +28,12 @@ services:
       - ./data_docker:/app/data_docker
 
   worker:
-    build: .
+    build:
+      context: .
+      args:
+        GIT_COMMIT_SHA: ${GIT_COMMIT_SHA:-}
+        GIT_COMMIT_MSG: ${GIT_COMMIT_MSG:-}
+        GIT_BRANCH: ${GIT_BRANCH:-}
     container_name: stashcast_worker
     command: python manage.py run_huey
     hostname: worker
diff --git a/docker-compose.yml b/docker-compose.yml
index 553c85a..0079a30 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,12 @@ services:
       - web
 
   web:
-    build: .
+    build:
+      context: .
+      args:
+        GIT_COMMIT_SHA: ${GIT_COMMIT_SHA:-}
+        GIT_COMMIT_MSG: ${GIT_COMMIT_MSG:-}
+        GIT_BRANCH: ${GIT_BRANCH:-}
     container_name: stashcast_web
     environment:
       STASHCAST_DATA_DIR: /app/data_docker
@@ -23,7 +28,12 @@ services:
       - ./data_docker:/app/data_docker
 
   worker:
-    build: .
+    build:
+      context: .
+      args:
+        GIT_COMMIT_SHA: ${GIT_COMMIT_SHA:-}
+        GIT_COMMIT_MSG: ${GIT_COMMIT_MSG:-}
+        GIT_BRANCH: ${GIT_BRANCH:-}
     container_name: stashcast_worker
     command: python manage.py run_huey
     depends_on: