docker: a plain docker build . stamps the git version (closes #210)

A plain `docker build .`, which is how upaas builds, stamped `dev`:
`.dockerignore` left out `.git` and the builder declared
`ARG VERSION=dev`. `.dockerignore` now sends `.git` and lists no tracked
file, which git in the build would count as deleted and mark `-dirty`.
`ARG VERSION` has no default. The Makefile takes `VERSION` from the
environment with `?=`, so a build arg still wins (`script/docker` keeps
passing one); otherwise `git describe` runs in the builder. A new
`make version` prints the version, and the builder fails when the
context carries `.git` and it comes out empty, `dev` or `unknown`.

Model: opus-5-5

.dockerignore

@@ -1,9 +1,6 @@
-.git/
+# .git is sent: the builder stage derives the version it stamps into the
+# binary from it. No tracked file may be listed here: git in the build
+# would see it as deleted and mark the version -dirty, and an excluded .md
+# would silently drop out of the prettier check in Dockerfile.fmt.
 bin/
 node_modules/
-# No .md may be excluded: Dockerfile.fmt checks every document with
-# prettier, and an exclusion here would drop a file from that check while
-# prettier still reports every file it was handed clean.
-LICENSE
-.editorconfig
-.gitignore

Dockerfile

@@ -36,11 +36,25 @@ COPY . .
 # Run the tests - build fails if any test fails
 RUN make test
 
-# Build the binary. .dockerignore leaves out .git, so `git describe` in
-# the Makefile cannot find the version here: script/docker passes it as
-# --build-arg VERSION, and a build that passes none reports `dev`.
-ARG VERSION=dev
-RUN make build VERSION="${VERSION}"
+# Version stamped into the binary: the VERSION build arg when one is
+# given (script/docker passes one), otherwise what `git describe` says of
+# the .git in the build context, so a plain `docker build .` of a clone
+# stamps its tag or short commit. The build arg reaches make through the
+# environment.
+ARG VERSION
+
+# A context that carries .git must yield a real version: one that is
+# empty, `dev` or `unknown` cannot be traced back to a commit.
+RUN version="$(make version)"; \
+    if [ -d .git ]; then \
+        case "$version" in \
+            "" | dev | unknown) \
+                echo "version is \"$version\" although the build context carries .git" >&2; \
+                exit 1 ;; \
+        esac; \
+    fi
+
+RUN make build
 
 # Runtime stage
 # alpine 3.21, 2026-02-28

Dockerfile.fmt

@@ -30,9 +30,8 @@ COPY . .
 # --config, not discovery: a .prettierrc that failed to arrive would
 # otherwise leave prettier on its defaults, where proseWrap is "preserve"
 # and every wrap this check exists to enforce passes. Missing the file is
-# a hard error instead. --no-editorconfig for the same reason in reverse:
-# .editorconfig is not in the build context, so honouring it here and on
-# a developer's machine would be two different answers.
+# a hard error instead. --no-editorconfig so that .prettierrc alone sets
+# the style.
 RUN prettier --config .prettierrc --no-editorconfig --check "**/*.md"
 
 # Write path. Not a check: script/fmt builds this and takes the files.

Makefile

@@ -1,9 +1,10 @@
-.PHONY: all bootstrap setup build lint fmt fmt-check test check clean hooks docker
+.PHONY: all bootstrap setup build version lint fmt fmt-check test check clean hooks docker
 
 BINARY := dnswatcher
-# `make build VERSION=...` overrides this; the Dockerfile does so, as the
-# image has no .git to describe.
-VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
+# VERSION given on the command line (`make build VERSION=...`) or in the
+# environment, which is how the Dockerfile's VERSION build arg arrives,
+# wins over what `git describe` says of this checkout.
+VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
 LDFLAGS := -X main.Version=$(VERSION)
 
 # Standard targets are thin shims; the implementations live in script/
@@ -21,6 +22,10 @@ setup:
 build:
 	go build -ldflags "$(LDFLAGS)" -o bin/$(BINARY) ./cmd/dnswatcher
 
+# Prints the version `make build` stamps; the Dockerfile checks it.
+version:
+	@echo "$(VERSION)"
+
 test:
 	@script/test
 

README.md

@@ -567,6 +567,7 @@ provide:
 
 ```sh
 make build      # Build binary to bin/dnswatcher
+make version    # Print the version make build stamps
 make test       # Run tests with race detector
 make lint       # Run golangci-lint in Docker (requires docker)
 make fmt        # Format code and Markdown (requires docker)
@@ -577,13 +578,19 @@ make clean      # Remove build artifacts
 ### Build-Time Variables
 
 `make build` sets the version with `-ldflags "-X main.Version=..."`, taking it
-from `git describe --tags --always --dirty`, or from `VERSION` when given on the
-command line (`make build VERSION=1.2.3`). The version appears in the startup
-log and in the health check response.
+from `VERSION` when given on the command line (`make build VERSION=1.2.3`) or in
+the environment, otherwise from `git describe --tags --always --dirty`, and
+`dev` without git metadata. The version appears in the startup log and in the
+health check response.
 
-The Docker image has no `.git`, so the `Dockerfile` takes the version as
-`--build-arg VERSION`. `make docker` passes it; a plain `docker build` passes
-none, and that image reports `dev`.
+The image takes it the same way, from the `.git` the build context carries, so a
+plain `docker build .` of a clone stamps the commit it was built from; a clone
+without tags, such as a shallow one, stamps the short commit. A
+`--build-arg VERSION=...` takes precedence; `make docker` passes the version
+`git describe` gives on the host. The build fails when the context carries
+`.git` and the version comes out empty, `dev` or `unknown`. `.dockerignore` must
+list no tracked file: git in the build would see it as deleted and mark the
+version `-dirty`.
 
 ---
 

TODO.md

@@ -19,6 +19,8 @@ trial run of the finished image: https://git.eeqj.de/sneak/dnswatcher/issues/149
 
 # Completed Steps
 
+- 2026-10-02: a plain `docker build .` of a clone stamps its tag or short
+  commit, not `dev`: the build context now carries `.git` (closes #210).
 - 2026-10-02: a name listed more than once in `DNSWATCHER_TARGETS`, in any
   letter case or with a trailing dot, is watched once (closes #207).
 - 2026-10-01: README checked against the code and corrected: metrics, CORS,

script/docker

@@ -14,8 +14,8 @@ main() {
     cd "$ROOT"
     # Own line: a failing command substitution inside an argument does
     # not trip `set -e`, so the inline form degrades silently to an
-    # empty constant. VERSION is computed here because .dockerignore
-    # excludes .git, so `git describe` in a build stage cannot find it.
+    # empty constant. The VERSION build arg takes precedence over what
+    # the build would derive from the .git in its context.
     version="$(git describe --tags --always --dirty 2>/dev/null || true)"
     [ -n "$version" ] || version="unknown"
     docker build --no-cache-filter=lint,builder \