From e75786c672af09980cd78b27fa29b78a2c7399f0 Mon Sep 17 00:00:00 2001
From: sneak <sneak@sneak.berlin>
Date: Tue, 29 Sep 2026 09:42:11 +0000
Subject: [PATCH] Stamp the git commit into images built from the Dockerfile
 (closes #236)

.dockerignore left out .git, so `make build` in the image found no git
metadata and stamped `dev`. It now sends .git, and no longer leaves out
tracked files (LICENSE, README.md, ...), which git would see as deleted
and mark the version -dirty. The footer, startup log and /health already
read the same version; the README says to build from a git clone.

Model: opus-5-5
---
 .dockerignore | 9 +++------
 Dockerfile    | 1 +
 README.md     | 4 ++++
 TODO.md       | 5 +++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index de5ff91..5b2701b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,11 +1,8 @@
-.git
+# .git is sent so that `make build` in the Dockerfile can stamp the commit into
+# upaas. List no tracked file here: git would see it as deleted in the build and
+# the version would end in -dirty.
 .env
 bin/
-.editorconfig
 .vscode/
 .idea/
 *.test
-LICENSE
-CONVENTIONS.md
-REPO_POLICIES.md
-README.md
diff --git a/Dockerfile b/Dockerfile
index 1a996e8..572ef99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,7 @@ RUN go mod download
 COPY . .
 
 RUN make test
+# Takes the version from `git describe` on the .git copied in above.
 RUN make build
 
 # Runtime stage
diff --git a/README.md b/README.md
index c7bce0f..785aab2 100644
--- a/README.md
+++ b/README.md
@@ -226,6 +226,10 @@ This recipe serves plain HTTP, so `UPAAS_PLAINTEXT_HTTP=true` is required for
 setup and every other form to pass the CSRF origin check. Behind a
 TLS-terminating reverse proxy, drop that line.
 
+The image shows the commit it was built from (the `git describe` output) in the
+page footer, the startup log and `/health`. Build it from a git clone: without
+the `.git` directory it shows `dev`.
+
 ### Deploying with Docker Compose
 
 [`docker-compose.yml`](docker-compose.yml) builds the image from this repo and
diff --git a/TODO.md b/TODO.md
index ff43640..5657433 100644
--- a/TODO.md
+++ b/TODO.md
@@ -20,6 +20,11 @@ regress.
 
 # Completed Steps
 
+- 2026-09-29: An image built from the `Dockerfile` now shows the commit it was
+  built from (the `git describe` output) in the footer, the startup log and
+  `/health` instead of `dev`: `.dockerignore` no longer leaves out `.git`, nor
+  any tracked file, which git would count as deleted and mark `-dirty` (#236).
+
 - 2026-09-29: `docker-compose.yml` now sets `UPAAS_PORT` to 8080 as well as
   `PORT`, since upaas reads `UPAAS_PORT` first and a `UPAAS_PORT` in `.env` made
   it listen away from the port mapping and healthcheck; the README's Compose