Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e6a782edf | ||
|
|
cc6a5a00e7 | ||
|
|
0620416869 | ||
|
|
3a218497b8 | ||
|
|
fd78aeb003 | ||
|
|
d173e69f85 | ||
|
|
51c394552e |
+4
-18
@@ -2,7 +2,7 @@
|
||||
# moby/patternmatcher: filepath.Match plus `**`, so `*` does not cross
|
||||
# `/` and an unprefixed pattern is anchored at the context root. Every
|
||||
# depth-independent pattern therefore needs `**/`, or `config/.env` and
|
||||
# `certs/server.key` still ship while this file reads as solved. Only
|
||||
# `certs/server.key` still ship while the file reads as solved. Only
|
||||
# genuinely root-anchored entries go unprefixed. Never transplant these
|
||||
# into .gitignore, where `**/` is wrong.
|
||||
#
|
||||
@@ -13,21 +13,9 @@
|
||||
# `/myapp`, never `**/myapp`, which also matches `cmd/myapp/` and
|
||||
# deletes the package directory from the context.
|
||||
|
||||
# .git is sent without its config. Without a VERSION build argument the
|
||||
# stage that compiles runs `git describe --tags --always` on .git, which
|
||||
# does not need .git/config; that file can hold a credential, such as a
|
||||
# password in a remote URL or the token the CI checkout step stores there.
|
||||
# Each submodule keeps a config with the same exposure in its git directory
|
||||
# under .git/modules/, nested again for a submodule's own submodules, or in
|
||||
# its own .git directory when it keeps one.
|
||||
# KNOWN GAP: a submodule whose name has a `config` segment (`config`,
|
||||
# `deploy/config`, `config/lib`) loses its whole git directory, because
|
||||
# `**/.git/modules/**/config` also matches that segment's directory
|
||||
# under .git/modules/. Go's version stamping then fails the build;
|
||||
# nothing leaks. Name such a submodule without that segment:
|
||||
# `git submodule add --name`.
|
||||
**/.git/config
|
||||
**/.git/modules/**/config
|
||||
# Excluding .git means `git describe` cannot run in any build stage and
|
||||
# fails quietly there; pass the version in with --build-arg VERSION.
|
||||
.git
|
||||
|
||||
# Agent scratch: one full checkout of the repo per in-flight agent.
|
||||
# Anchored because it occurs once where agents run at the repo root.
|
||||
@@ -51,9 +39,7 @@
|
||||
**/[iI][dD]_[rR][sS][aA]
|
||||
**/[iI][dD]_[dD][sS][aA]
|
||||
**/[iI][dD]_[eE][cC][dD][sS][aA]
|
||||
**/[iI][dD]_[eE][cC][dD][sS][aA]_[sS][kK]
|
||||
**/[iI][dD]_[eE][dD]25519
|
||||
**/[iI][dD]_[eE][dD]25519_[sS][kK]
|
||||
|
||||
# Dependencies: restored inside the image, never copied in.
|
||||
**/node_modules
|
||||
|
||||
+5
-25
@@ -20,28 +20,8 @@ Thumbs.db
|
||||
# Node
|
||||
node_modules/
|
||||
|
||||
# Secrets. Unanchored like every entry above, so each matches at every
|
||||
# depth. Matching is case-sensitive on Linux, so names use character
|
||||
# ranges rather than a lowercase form that misses `Server.Key`.
|
||||
|
||||
# Environment files. `*.env` covers bare `.env` and the `prod.env`
|
||||
# convention. Only the templates `example.env` and `sample.env` are
|
||||
# re-included below. A repository that commits any other template adds
|
||||
# its own negation after these lines, for example `!.env.example`.
|
||||
*.[eE][nN][vV]
|
||||
.[eE][nN][vV].*
|
||||
.[eE][nN][vV][rR][cC]
|
||||
!example.env
|
||||
!sample.env
|
||||
|
||||
# Private keys and the bundles carrying them.
|
||||
*.[pP][eE][mM]
|
||||
*.[kK][eE][yY]
|
||||
*.[pP]12
|
||||
*.[pP][fF][xX]
|
||||
[iI][dD]_[rR][sS][aA]
|
||||
[iI][dD]_[dD][sS][aA]
|
||||
[iI][dD]_[eE][cC][dD][sS][aA]
|
||||
[iI][dD]_[eE][cC][dD][sS][aA]_[sS][kK]
|
||||
[iI][dD]_[eE][dD]25519
|
||||
[iI][dD]_[eE][dD]25519_[sS][kK]
|
||||
# Environment / secrets
|
||||
.env
|
||||
.env.*
|
||||
*.pem
|
||||
*.key
|
||||
|
||||
+2
-67
@@ -10,21 +10,14 @@ run:
|
||||
|
||||
linters:
|
||||
default: all
|
||||
enable:
|
||||
# Successor to the deprecated gomodguard. Named explicitly, rather than
|
||||
# left to `default: all`, because it carries the module policy below.
|
||||
- gomodguard_v2
|
||||
disable:
|
||||
# Genuinely incompatible with project patterns
|
||||
- exhaustruct # Requires all struct fields
|
||||
- exhaustruct_v5 # Requires all struct fields (successor to exhaustruct)
|
||||
- depguard # Dependency allow/block lists
|
||||
- godot # Requires comments to end with periods
|
||||
- wsl # Deprecated, replaced by wsl_v5
|
||||
- wrapcheck # Too verbose for internal packages
|
||||
- varnamelen # Short names like db, id are idiomatic Go
|
||||
# Deprecated: the warning is attached to the old name, so it is
|
||||
# silenced by disabling that name, not by enabling the successor.
|
||||
- wsl # Deprecated, replaced by wsl_v5
|
||||
- gomodguard # Deprecated, replaced by gomodguard_v2
|
||||
settings:
|
||||
lll:
|
||||
line-length: 88
|
||||
@@ -35,64 +28,6 @@ linters:
|
||||
max-complexity: 15
|
||||
dupl:
|
||||
threshold: 100
|
||||
depguard:
|
||||
# Test-support code must not be compiled into the shipped binary. A
|
||||
# test-support package exists to hand a test privileges the program
|
||||
# itself must never have, so a file that is not a test must not import
|
||||
# one. Test files, and the files inside a package whose directory name
|
||||
# ends in `test`, are where that code belongs, and are exempt.
|
||||
#
|
||||
# The deny list below is the one part of this file a repository is
|
||||
# expected to extend, and the only part it may. depguard matches an
|
||||
# import path against a list of prefixes, so it cannot be told "any path
|
||||
# whose last segment ends in test"; a repository's own test-support
|
||||
# packages have to be named here one at a time, by full import path,
|
||||
# under a module path that differs from repository to repository. Add
|
||||
# them; change nothing else.
|
||||
rules:
|
||||
test-support:
|
||||
list-mode: lax
|
||||
files:
|
||||
- "$all"
|
||||
- "!$test"
|
||||
- "!**/*test/**"
|
||||
deny:
|
||||
- pkg: net/http/httptest
|
||||
desc: >-
|
||||
Test-support code belongs in test files and in packages whose
|
||||
directory name ends in test, not in the shipped binary.
|
||||
# Only decisions already recorded in the Go package defaults are
|
||||
# listed here. Every entry matches the module path exactly.
|
||||
gomodguard_v2:
|
||||
blocked:
|
||||
- module: github.com/rs/zerolog
|
||||
recommendations:
|
||||
- log/slog
|
||||
reason: "Structured logging is stdlib log/slog."
|
||||
# One entry per pre-fork module path, because the later releases
|
||||
# are separate paths. A prefix match would be shorter but would
|
||||
# also reach github.com/go-redis/redismock, the test double for
|
||||
# the successor these entries recommend.
|
||||
- module: github.com/go-redis/redis
|
||||
recommendations:
|
||||
- github.com/redis/go-redis/v9
|
||||
reason: "Pre-fork module; use the maintained go-redis v9."
|
||||
- module: github.com/go-redis/redis/v7
|
||||
recommendations:
|
||||
- github.com/redis/go-redis/v9
|
||||
reason: "Pre-fork module; use the maintained go-redis v9."
|
||||
- module: github.com/go-redis/redis/v8
|
||||
recommendations:
|
||||
- github.com/redis/go-redis/v9
|
||||
reason: "Pre-fork module; use the maintained go-redis v9."
|
||||
- module: github.com/sergi/go-diff
|
||||
recommendations:
|
||||
- github.com/aymanbagabas/go-udiff
|
||||
reason: "No unified diff output; use go-udiff."
|
||||
- module: github.com/hexops/gotextdiff
|
||||
recommendations:
|
||||
- github.com/aymanbagabas/go-udiff
|
||||
reason: "Unmaintained fork; use go-udiff."
|
||||
|
||||
issues:
|
||||
max-issues-per-linter: 0
|
||||
|
||||
+14
-45
@@ -1,48 +1,11 @@
|
||||
# Lint phase. The linter is invoked directly rather than through `make
|
||||
# lint` or `script/lint`, which are themselves a docker build and would
|
||||
# recurse into a daemon that does not exist in a build step.
|
||||
#
|
||||
# node 22-alpine, 2026-02-22
|
||||
FROM node@sha256:e4bf2a82ad0a4037d28035ae71529873c069b13eb0455466ae0bc13363826e34 AS lint
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY script/ script/
|
||||
COPY package.json yarn.lock ./
|
||||
RUN script/bootstrap
|
||||
|
||||
COPY . .
|
||||
|
||||
RUN yarn run prettier --check '**/*.md' --tab-width 4 --prose-wrap always
|
||||
|
||||
# Test phase, same shape and for the same reason.
|
||||
#
|
||||
# node 22-alpine, 2026-02-22
|
||||
FROM node@sha256:e4bf2a82ad0a4037d28035ae71529873c069b13eb0455466ae0bc13363826e34 AS test
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY script/ script/
|
||||
COPY package.json yarn.lock ./
|
||||
RUN script/bootstrap
|
||||
|
||||
COPY . .
|
||||
|
||||
RUN echo "No tests defined."
|
||||
|
||||
# Development environment, and the last stage: a plain `docker build .`
|
||||
# names no target and so builds this one. Nothing is wanted from the two
|
||||
# phases above; the copies are what make BuildKit build them first, so
|
||||
# this image cannot be produced unless lint and test passed. A stage
|
||||
# appended after this one would drop all three out of a plain build.
|
||||
#
|
||||
# node 22-alpine, 2026-02-22
|
||||
FROM node@sha256:e4bf2a82ad0a4037d28035ae71529873c069b13eb0455466ae0bc13363826e34
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY --from=lint /app/package.json /dev/null
|
||||
COPY --from=test /app/package.json /dev/null
|
||||
# Makes script/lint run the linter directly rather than building
|
||||
# Dockerfile.lint, which would need a docker daemon here.
|
||||
ENV LINT_IN_CONTAINER=1
|
||||
|
||||
# script/bootstrap installs all prerequisites. Manifests are copied
|
||||
# first so that layer stays cached until dependencies change.
|
||||
@@ -52,8 +15,14 @@ RUN script/bootstrap
|
||||
|
||||
COPY . .
|
||||
|
||||
# Nothing here is compiled and a LABEL cannot run git, so the version is
|
||||
# the VERSION build argument that script/docker and script/cibuild pass;
|
||||
# a plain `docker build .` leaves it empty.
|
||||
ARG VERSION
|
||||
LABEL org.opencontainers.image.version="${VERSION}"
|
||||
# CHECK_EPOCH is a per-invocation nonce from script/cibuild and
|
||||
# script/docker; without it an unchanged tree serves this layer from
|
||||
# cache and the build reports a green it never ran. ARG is stage-scoped,
|
||||
# so declare it in every stage that runs checks. The guard fails a bare
|
||||
# `docker build .`, which would otherwise reuse the empty (and therefore
|
||||
# stable) cache key. The value is also expanded into the check command,
|
||||
# so the cache miss does not depend on BuildKit's handling of an
|
||||
# unreferenced ARG; keep both references.
|
||||
ARG CHECK_EPOCH
|
||||
RUN [ -n "$CHECK_EPOCH" ] || exit 1
|
||||
RUN echo "check epoch: ${CHECK_EPOCH}" && make check
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
# Lint-only image, built by script/lint when it is not already inside a
|
||||
# container. Linting is a build step, so a successful build is a clean
|
||||
# lint, and nothing is bind-mounted, which matters when the daemon is
|
||||
# remote.
|
||||
#
|
||||
# node 22-alpine, 2026-02-22
|
||||
FROM node@sha256:e4bf2a82ad0a4037d28035ae71529873c069b13eb0455466ae0bc13363826e34
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Makes script/lint run the linter directly instead of recursing into
|
||||
# another docker build, which has no daemon here.
|
||||
ENV LINT_IN_CONTAINER=1
|
||||
|
||||
COPY script/ script/
|
||||
COPY package.json yarn.lock ./
|
||||
RUN script/bootstrap
|
||||
|
||||
COPY . .
|
||||
|
||||
# ARG sits after the dependency layer so that layer stays cached and
|
||||
# only the lint re-runs. The guard fails a bare `docker build
|
||||
# -f Dockerfile.lint .`, which would otherwise reuse the empty (stable)
|
||||
# cache key and report a lint it never ran.
|
||||
ARG CHECK_EPOCH
|
||||
RUN [ -n "$CHECK_EPOCH" ] || exit 1
|
||||
RUN echo "lint epoch: ${CHECK_EPOCH}" && make lint
|
||||
@@ -116,23 +116,22 @@ alpine. We provide:
|
||||
`script/bootstrap`, then `script/install-precommit`
|
||||
- `script/projectname` — output the project name (our own extension); used by
|
||||
`script/docker` for the image tag
|
||||
- `script/test` — `docker build --no-cache --target test -t prompts-test .`,
|
||||
building the `test` phase of the `Dockerfile` (no tests defined here)
|
||||
- `script/lint` — `docker build --no-cache --target lint -t prompts-lint .`,
|
||||
building the `lint` phase, which runs prettier over the markdown files
|
||||
- `script/fmt` — format all markdown files with prettier (writes; native, not in
|
||||
a container)
|
||||
- `script/fmt-check` — check formatting (read-only; native)
|
||||
- `script/test` — run the test suite (no tests defined here)
|
||||
- `script/lint` — lint the markdown files with prettier. Inside a container
|
||||
(`LINT_IN_CONTAINER=1`, set by both Dockerfiles) it runs prettier directly; on
|
||||
a host it builds `Dockerfile.lint` so the linter still runs in a container
|
||||
- `script/fmt` — format all markdown files with prettier (writes)
|
||||
- `script/fmt-check` — check formatting (read-only)
|
||||
- `script/check` — run all checks: `test`, `lint`, `fmt-check` (our own
|
||||
extension); builds no image of its own
|
||||
- `script/docker` —
|
||||
`docker build --no-cache --build-arg VERSION="$version" -t prompts .`, the tag
|
||||
coming from `script/projectname` (byte-identical across repos)
|
||||
- `script/cibuild` — cd to the repo root, run `script/bootstrap`, run
|
||||
`script/check`, compute `version` from `git describe`, then
|
||||
`docker build --no-cache --build-arg VERSION="$version" -t prompts .` (what CI
|
||||
runs; it bootstraps because CI checks out and runs this alone while
|
||||
`script/fmt-check` is native)
|
||||
extension)
|
||||
- `script/docker` — build the Docker image, tagged via `script/projectname`
|
||||
(byte-identical across repos); passes the same `CHECK_EPOCH` nonce as
|
||||
`script/cibuild`
|
||||
- `script/cibuild` — cd to the repo root, assign `epoch="$(date +%s%N)$$"`, then
|
||||
`docker build --build-arg CHECK_EPOCH="$epoch" .` (what CI runs; the image
|
||||
build runs `script/check`, and the per-invocation `CHECK_EPOCH` nonce is what
|
||||
stops Docker serving that check from cache on an unchanged tree — a bare
|
||||
`docker build .` fails closed on purpose)
|
||||
- `script/precommit` — run by the git pre-commit hook (our own extension); calls
|
||||
`script/check`
|
||||
- `script/install-precommit` — installs the git pre-commit hook (our own
|
||||
|
||||
@@ -21,140 +21,117 @@ fmt-check, and commit.
|
||||
|
||||
# Completed Steps
|
||||
|
||||
- 2026-10-04: `REPO_POLICIES.md` now says which `Dockerfile` stages run
|
||||
`script/bootstrap` (issue 90). The gate phases and the build stage start from
|
||||
their pinned base images and install what those images lack either inline, as
|
||||
the canonical Go `Dockerfile` does for `git`, or by running
|
||||
`script/bootstrap`, as this repo's own `Dockerfile` does for its yarn
|
||||
packages. The development environment stage, the final stage of a non-server
|
||||
repo, runs `script/bootstrap`. The new repo checklist says the same.
|
||||
- 2026-10-04: The canonical `.dockerignore` now also keeps out the git `config`
|
||||
of a submodule that keeps its own `.git` directory, which still reached the
|
||||
image (issue 88): both git patterns now carry the `**/` prefix. A submodule
|
||||
whose name has a `config` segment (`config`, `deploy/config`, `config/lib`)
|
||||
still loses its whole git directory, so Go's version stamping fails the build;
|
||||
the file records this as a `KNOWN GAP:` with the remedy,
|
||||
`git submodule add --name`. Closing it would take a wildcard re-include, which
|
||||
makes BuildKit walk every excluded directory, such as `node_modules`, on every
|
||||
build. `REPO_POLICIES.md` and both checklists say so in the same words.
|
||||
- 2026-10-04: The note under the canonical Go `Dockerfile` example in
|
||||
`REPO_POLICIES.md` now installs lint-phase system libraries with `apt-get`
|
||||
under their Debian package names (issue 83). The `golangci/golangci-lint`
|
||||
image is Debian-based and has no `apk`, so the old `apk add` instruction
|
||||
failed as written. Nothing is pinned or unpinned; that is still open on
|
||||
issue 72.
|
||||
- 2026-10-04: Fixed the server lifecycle example in
|
||||
`prompts/GO_HTTP_SERVER_CONVENTIONS.md` (issue 86). Only fx handles SIGINT and
|
||||
SIGTERM, and `Run()` in `main` exits with the shutdown's exit code. A listen
|
||||
error asks fx to shut down with exit code 1 through `fx.Shutdowner`; a Sentry
|
||||
start failure is returned from the server's start hook instead of calling
|
||||
`os.Exit` from a goroutine, so the stop hooks of what had started still run.
|
||||
The server's stop hook shuts the HTTP server down within 5 seconds and fails
|
||||
when requests are still running. A new paragraph says who owns signals and the
|
||||
exit code.
|
||||
- 2026-10-04: `REPO_POLICIES.md` now says how a Go tool a repo needs on the host
|
||||
is pinned (issue 37): installed with `go install` pinned to a commit hash,
|
||||
never tracked as a `go.mod` tool dependency or through a `tools.go` file.
|
||||
golangci-lint is unaffected, since no repo installs it on the host.
|
||||
- 2026-10-04: The canonical `.gitignore` and `.dockerignore` now also keep out
|
||||
`id_ecdsa_sk` and `id_ed25519_sk`, the private key files `ssh-keygen` writes
|
||||
for keys backed by a hardware security key (issue 81). Their `.pub` halves
|
||||
stay trackable.
|
||||
- 2026-10-04: `package.json` now has `"license": "MIT"`, matching `LICENSE`, so
|
||||
yarn no longer prints "No license field" when `script/bootstrap` runs it
|
||||
inside the Docker phases (issue 76). That was the only yarn warning there.
|
||||
- 2026-10-04: `REPO_POLICIES.md` now states that guidance for coding agents
|
||||
lives in one `AGENTS.md` at the repository root, never under a file or
|
||||
directory named after one agent tool and never in separate memory files (issue
|
||||
31). This retires the rule, still present in older vendored copies, that kept
|
||||
agent memory as committed files under `.claude/memory/`. `AGENTS.md` joins the
|
||||
list of files allowed in the root, and both checklists say so.
|
||||
- 2026-10-04: Rewrote the note under the canonical Go `make test` example in
|
||||
`REPO_POLICIES.md` (issue 77), which still named the cache-busting build
|
||||
argument that `--no-cache` replaced. It now says where Go's test result cache
|
||||
can replay a pass: on a developer's machine, where the Makefile target runs,
|
||||
and not in the `test` phase of the `Dockerfile`, whose base image and earlier
|
||||
steps hold no result for the repo's tests.
|
||||
- 2026-10-04: The Makefile examples in the Go styleguide and the HTTP server
|
||||
conventions now fall back to `dev` when `git describe` prints nothing (outside
|
||||
a git checkout, or where git is missing or refuses the checkout), instead of
|
||||
stamping an empty version (issue 74). The canonical `Dockerfile` already fails
|
||||
on a `dev` version when `.git` is in the build context.
|
||||
- 2026-10-04: The canonical `.dockerignore` now also keeps out each submodule's
|
||||
`config` (issue 75). A submodule's git directory lives under `.git/modules/`,
|
||||
nested again for its own submodules, and its `config` can hold a credential
|
||||
just like `.git/config`. The pattern `.git/modules/**/config` covers every
|
||||
depth and leaves the top-level `.git` that `git describe` reads untouched.
|
||||
`REPO_POLICIES.md` and both checklists say so in the same words.
|
||||
- 2026-10-03: Fixed two defects in the canonical Go `Dockerfile` example (issue
|
||||
73). The test phase now uses the Debian Go image, since `-race` needs cgo and
|
||||
the alpine image has no C compiler, so the phase failed before running a test.
|
||||
The stage that compiles runs `git config --system --add safe.directory /src`,
|
||||
because a context sent as a tar stream keeps the sender's file owners and git
|
||||
refuses that checkout, leaving the version empty. Both checklists state that
|
||||
step in the same words.
|
||||
- 2026-10-03: Moved the canonical golangci-lint to v2.14.0, built with go1.27,
|
||||
because v2.12.2 refuses to lint a module whose `go` directive is 1.27 (issue
|
||||
65). Releases from v2.13.0 deprecate `exhaustruct` in favour of
|
||||
`exhaustruct_v5`, which `default: all` switches on, so the canonical
|
||||
`.golangci.yml` now disables `exhaustruct_v5` beside `exhaustruct`. v2.12.2
|
||||
rejects that file, so `REPO_POLICIES.md` and both repo checklists now say a
|
||||
repo sets the lint phase digest and re-vendors `.golangci.yml` in one commit.
|
||||
- 2026-10-03: Brought the canonical `.gitignore` level with `.dockerignore` on
|
||||
secrets (issue 38): it now also ignores `prod.env`-style `*.env` files,
|
||||
`.envrc`, `*.p12`, `*.pfx` and the extensionless SSH private keys, written to
|
||||
`.gitignore`'s own rules (no `**/` prefix) and case-folded with character
|
||||
ranges. `example.env` and `sample.env` stay trackable through negations.
|
||||
- 2026-10-02: The image version now comes from git inside the build (issues 69
|
||||
and 71), superseding the 2026-09-08 entry that excluded `.git`. The canonical
|
||||
`.dockerignore` sends `.git` but keeps out `.git/config`, which can hold a
|
||||
credential. The Dockerfile example in `REPO_POLICIES.md` installs `git`, takes
|
||||
the `VERSION` build argument when one is given and otherwise
|
||||
`git describe --tags --always`, and fails when `.git` exists but the version
|
||||
is empty, `dev` or `unknown`; a plain `docker build .` with no build arguments
|
||||
must succeed. This repo's `script/docker` and `script/cibuild` still pass
|
||||
`--build-arg VERSION`, since its own `Dockerfile` compiles nothing.
|
||||
- 2026-09-08: Moved linting and testing into Docker as phases of the main
|
||||
`Dockerfile`, per the owner ruling on issue 40. `script/lint` and
|
||||
`script/test` build one phase each by name with `--no-cache` — the same answer
|
||||
issue 26 got, so no separate cache-busting mechanism survives — and the final
|
||||
stage copies a harmless file from both, so the image cannot be built unless
|
||||
they pass. This also closes issue 30: a container has its own result cache and
|
||||
its own lock, so a lint verdict can no longer belong to another checkout. No
|
||||
separate lint Dockerfile, and no `golangci-lint config verify` step.
|
||||
`script/check` runs the gates and nothing else, and `script/cibuild`
|
||||
bootstraps first, since it is all CI runs and `script/fmt-check` is native.
|
||||
- 2026-09-08: Kept in-repo agent scratch out of the Docker build context and out
|
||||
of version control: `.claude/` is one full checkout of the repo per in-flight
|
||||
agent, and under `COPY . .` all of it was reaching the image. Also closed the
|
||||
consequence of excluding `.git` — `git describe` yields an empty version
|
||||
inside a build stage without failing, so `script/docker` and `script/cibuild`
|
||||
now compute the version on the host and pass `--build-arg VERSION`.
|
||||
- 2026-09-08: Closed the secret exposure in the canonical `.dockerignore`: a
|
||||
local `.env`, `*.pem` or `*.key` was reaching the build context under
|
||||
`COPY . .`, invisible to every git-based check. The patterns are now written
|
||||
to `.dockerignore`'s own semantics — `**/`-prefixed so they hold at every
|
||||
depth, case-folded with character ranges — and `REPO_POLICIES.md` requires
|
||||
verifying by enumerating the image rather than by reading the file.
|
||||
- 2026-09-08: Made a pinned tool in `script/bootstrap` actually reach the host.
|
||||
`REPO_POLICIES.md` now requires comparing the installed version against the
|
||||
pin rather than testing `PATH` presence, and re-resolving the binary through
|
||||
`PATH` after installing, so a version bump cannot be a silent no-op and a
|
||||
shadowed install cannot report success.
|
||||
- 2026-09-08: Closed the false green in the canonical CI gate: `script/cibuild`
|
||||
and `script/docker` now build with `--no-cache`, so the Dockerfile's check
|
||||
layers cannot be served from cache on an unchanged tree, and the text claiming
|
||||
a bare `docker build .` proves the checks ran is corrected in
|
||||
`REPO_POLICIES.md`, both checklists and the Go styleguide.
|
||||
- 2026-09-03: Added `-count=1` to both `go test` invocations in the canonical Go
|
||||
`make test` example in `REPO_POLICIES.md`, so the target cannot report a
|
||||
cached pass it did not earn, and documented that Go's test-result cache is a
|
||||
second, independent cache stacked below the Docker layer cache.
|
||||
- 2026-08-31: Migrated the canonical `.golangci.yml` from the deprecated
|
||||
`gomodguard` to `gomodguard_v2`: the old linter is disabled by name (which is
|
||||
what silences the deprecation warning), the successor is named explicitly in
|
||||
`linters.enable`, and it carries a `blocked` module list drawn only from
|
||||
decisions already recorded in the Go package defaults.
|
||||
- 2026-08-25: Carved capability-URL services out of "when in doubt, harden" in
|
||||
REPO_POLICIES.md: an unguessable per-entrypoint UUID URL is a complete
|
||||
credential and gets no second authentication factor.
|
||||
- 2026-08-10: Moved every lint run into a container. `script/lint` now runs the
|
||||
linter directly when `LINT_IN_CONTAINER=1` and otherwise builds
|
||||
`Dockerfile.lint`, so the linter never runs on a developer host — closing the
|
||||
content-keyed result cache that produced a confirmed false green, the
|
||||
host-global `$TMPDIR/golangci-lint.lock`, and host/container version skew.
|
||||
Detection is on that marker alone: a false negative inside a container fails
|
||||
loudly on the missing daemon, while a false positive on a host would silently
|
||||
restore host linting, so `/.dockerenv` is rejected outright — measured absent
|
||||
inside BuildKit `RUN` steps and present on hosts that are themselves
|
||||
containers. Everything else keeps its existing shape: `make check` still runs
|
||||
in the image, `script/cibuild` is still one build, and the Go multistage lint
|
||||
stage survives with `ENV LINT_IN_CONTAINER=1`. `Dockerfile.lint` carries the
|
||||
same `CHECK_EPOCH` guard, with the `ARG` below the dependency layer so only
|
||||
the lint re-runs. The `script/bootstrap` golangci-lint install and the
|
||||
per-checkout cache/lock/`.lint-cache` wrapper are deleted as superseded; a JS
|
||||
repo's `yarn install` stays, since the rule is about where a verdict comes
|
||||
from, not about which binaries exist. `golangci-lint config verify` was kept
|
||||
on measurement: a bogus config key passes `golangci-lint run` with `0 issues`
|
||||
and fails `config verify`, and every case reproduced byte-identically under
|
||||
`--network none`, so the schema is embedded and the line costs no network.
|
||||
Comment blocks across the touched files were cut hard in the same pass.
|
||||
- 2026-08-09: Made a golangci-lint result belong to the tree that asked for it.
|
||||
REPO_POLICIES.md now carries the canonical Go `script/lint`, which gives the
|
||||
linter per-checkout `GOLANGCI_LINT_CACHE` and per-checkout `TMPDIR`. The two
|
||||
are separate defects and the second is the one that gets dropped: the result
|
||||
cache is keyed on file content rather than location, so checkouts holding
|
||||
identical files serve each other's findings under the other's path, while the
|
||||
concurrency lock is `$TMPDIR/golangci-lint.lock` — host-global, independent of
|
||||
the cache, and unaffected by isolating it. Moving workers from worktrees to
|
||||
their own clones does not help either half; it only removes the foreign-path
|
||||
artefact that made the defect visible. The lock error is retried rather than
|
||||
surfaced, because it is not a result: it exits non-zero exactly as findings
|
||||
do, and reporting it as findings sends a correct branch back for rework.
|
||||
Detection is on the stderr stream and never on exit status, so a finding
|
||||
quoting the lock message in source cannot be retried away, and exhaustion
|
||||
exits 75 with a VOID message rather than passing or failing quietly.
|
||||
`--allow-serial-runners` (which keeps the guard and queues) covers the
|
||||
same-checkout overlap that `TMPDIR` scoping cannot; `--allow-parallel-runners`
|
||||
is rejected outright. The stdout and stderr capture files are per invocation
|
||||
rather than per checkout, because serialising the linter does not serialise
|
||||
the shell's redirections: two runs in one checkout — the overlap the flag
|
||||
exists to support — would otherwise truncate and read each other's output,
|
||||
which is the same defect one layer above where it was fixed. Both checklists
|
||||
gained the corresponding items, since a half-fix that sets only the cache
|
||||
reads as complete. `GOCACHE` was measured and does not need isolating.
|
||||
Verified with the snippet extracted from the committed document and executed
|
||||
as a consuming repo would adopt it, against paired controls: contamination
|
||||
reproduced on the pre-fix form and absent on the adopted one, retry engaged,
|
||||
exhaustion loud, a genuine finding still reported, and a held host lock
|
||||
failing the pre-fix script while leaving the adopted one untouched.
|
||||
- 2026-08-09: Kept in-repo agent scratch out of the Docker build context and out
|
||||
of version control. `.claude/` holds one worktree — an entire additional
|
||||
checkout of the repo — per in-flight agent, and under `COPY . .` all of it was
|
||||
reaching the image: another session's unreviewed, sometimes uncommitted work,
|
||||
inflating the context by a multiple of the repo and invalidating `COPY` for
|
||||
reasons unrelated to the repo's own content. The `.dockerignore` entry is
|
||||
root-anchored, because the directory occurs exactly once where agents run at
|
||||
the repo root and the `**/` form additionally deletes any nested directory of
|
||||
that name — with the residual gap that follows from anchoring (a monorepo
|
||||
running agents in subdirectories still ships `services/api/.claude/`) stated
|
||||
in the canonical `.dockerignore`, the policy and the existing-repo checklist,
|
||||
since consuming repos receive the files rather than the tracker; the
|
||||
`.gitignore` entry is unanchored, because `.gitignore` patterns already match
|
||||
at every depth, and each file is written to its own semantics rather than
|
||||
derived from the other. Also closed the consequence that ships broken
|
||||
silently: excluding `.git` means `git describe` cannot run in any build stage
|
||||
and yields an empty version without erroring, so `script/docker` and
|
||||
`script/cibuild` now compute the version on the host and pass
|
||||
`--build-arg VERSION`, and `REPO_POLICIES.md` states where `VERSION` comes
|
||||
from instead of leaving the reader to fill the gap with `git describe` inside
|
||||
the build. The two Go documents that carry the `GOLDFLAGS` pattern were
|
||||
corrected in the same pass, from `:=` to `?=`, since a `$(shell git describe)`
|
||||
evaluated inside a build stage is exactly the empty version this closes.
|
||||
Verified by enumerating a probe image before, after, and against the
|
||||
`**/`-prefixed form, with a positive control and the `CHECK_EPOCH` cache
|
||||
verification re-run under the changed build context.
|
||||
- 2026-08-09: Closed the secret exposure in the canonical `.dockerignore`: a
|
||||
developer's local `.env`, `*.pem` or `*.key` was reaching the Docker build
|
||||
context under `COPY . .`, invisible to every git-based check because
|
||||
`.gitignore` covers it. The patterns are written to `.dockerignore`'s own
|
||||
`moby/patternmatcher` semantics — `**/`-prefixed so they hold at every depth,
|
||||
which also fixes nested `node_modules` — rather than transplanted from
|
||||
`.gitignore`, whose unprefixed form protects only the repository root while
|
||||
reading as solved. Coverage extends past the `.env`/`.pem`/`.key` trio to the
|
||||
`prod.env` convention, `.envrc`, PKCS#12 bundles and extensionless SSH keys,
|
||||
every one of them case-folded with character ranges because matching is
|
||||
case-sensitive and an ALL-CAPS twin per pattern still misses `Server.Key`.
|
||||
`REPO_POLICIES.md` and both repo checklists now state that asymmetry and
|
||||
require verification by enumerating the image rather than by reading the
|
||||
patterns. Verified with a probe image before, against three naive forms
|
||||
(unprefixed, lowercase-only, ALL-CAPS-doubled), and after.
|
||||
- 2026-08-09: Made the pinned golangci-lint actually propagate: REPO_POLICIES.md
|
||||
now carries the canonical `script/bootstrap` snippet for Go repos, which
|
||||
installs when the installed version does not match the pin (the old
|
||||
`if missing` guard tested PATH presence only, so pins were inert on any
|
||||
provisioned machine and CI silently disagreed with local) and then re-resolves
|
||||
the binary through `PATH` and fails loudly, naming the shadowing path, when
|
||||
the install did not take effect — the failure mode the naive
|
||||
compare-then-install fix leaves behind while reporting success.
|
||||
- 2026-08-09: Fixed the false green in the canonical CI gate: `script/cibuild`
|
||||
and `script/docker` now pass a per-invocation `CHECK_EPOCH` nonce, and the
|
||||
`Dockerfile` (plus the Go multistage template in REPO_POLICIES.md, in both its
|
||||
lint and builder stages) declares `ARG CHECK_EPOCH` with a guard that makes a
|
||||
bare `docker build .` fail closed. Corrected the org-canonical text that
|
||||
asserted a successful build implies all checks pass, across every document
|
||||
carrying it: `REPO_POLICIES.md`, both repo checklists (which still told agents
|
||||
to write the pre-fix `script/cibuild` and ended on an acceptance item the
|
||||
guard makes unsatisfiable), and the Go styleguide.
|
||||
- 2026-08-07: Set the canonical `.golangci.yml` to the org-standard v2-schema
|
||||
config already deployed byte-identical across the org's Go repos (settings
|
||||
under `linters.settings` so thresholds like lll/funlen/cyclop/dupl actually
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"prettier": "3.8.1"
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Code Styleguide — Go
|
||||
last_modified: 2026-10-04
|
||||
last_modified: 2026-08-10
|
||||
---
|
||||
|
||||
1. Try to hard wrap long lines at 77 characters or less.
|
||||
@@ -24,8 +24,7 @@ last_modified: 2026-10-04
|
||||
1. Embed the git commit hash into the binary and include it in startup logs and
|
||||
in health check output. This is to make it easier to correlate running
|
||||
instances with their code. Do not include build time or build user, as these
|
||||
will make the build nondeterministic. The architecture is not passed in at
|
||||
build time; a program that reports it reads `runtime.GOARCH` at run time.
|
||||
will make the build nondeterministic.
|
||||
|
||||
Example relevant Makefile sections:
|
||||
|
||||
@@ -36,27 +35,38 @@ last_modified: 2026-10-04
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"runtime"
|
||||
)
|
||||
|
||||
var Version string
|
||||
var (
|
||||
Version string
|
||||
Buildarch string
|
||||
)
|
||||
|
||||
func main() {
|
||||
fmt.Printf("Version: %s\n", Version)
|
||||
fmt.Printf("Arch: %s\n", runtime.GOARCH)
|
||||
fmt.Printf("Buildarch: %s\n", Buildarch)
|
||||
}
|
||||
```
|
||||
|
||||
```make
|
||||
# ?= rather than := so that a `VERSION` build argument takes precedence:
|
||||
# where a build stage invokes make, `ARG VERSION` puts it in the
|
||||
# environment and `?=` defers to it. Otherwise `git describe` runs, in a
|
||||
# build stage on the `.git` the build context carries. When it prints
|
||||
# nothing (outside a git checkout, or where git is missing or refuses the
|
||||
# checkout), the version falls back to `dev`.
|
||||
VERSION ?= $(or $(shell git describe --tags --always 2>/dev/null),dev)
|
||||
# ?= rather than := because this `$(shell git describe ...)` is only
|
||||
# correct on the host. `.dockerignore` excludes `.git`, so evaluated
|
||||
# inside a build stage it expands to the empty string without failing
|
||||
# and the binary reports no version at all. The version is computed on
|
||||
# the host by `script/docker` / `script/cibuild` and passed with
|
||||
# `--build-arg VERSION=...`. If this repo's Dockerfile compiles by
|
||||
# invoking make (`RUN make build`), `ARG VERSION` in that stage puts the
|
||||
# value in the environment and `?=` defers to it. The canonical Go
|
||||
# template in REPO_POLICIES.md instead runs `go build` directly with
|
||||
# `-ldflags "... -X main.Version=${VERSION}"`, so there this Makefile is
|
||||
# a host-only path — but it is still `?=`, because a repo that later
|
||||
# moves the build behind make must not silently start shipping an empty
|
||||
# version. See the git-describe rule in REPO_POLICIES.md.
|
||||
VERSION ?= $(shell git describe --always --dirty)
|
||||
BUILDARCH := $(shell uname -m)
|
||||
|
||||
GOLDFLAGS += -X main.Version=$(VERSION)
|
||||
GOLDFLAGS += -X main.Buildarch=$(BUILDARCH)
|
||||
|
||||
# osx can't statically link apparently?!
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
@@ -102,18 +112,22 @@ last_modified: 2026-10-04
|
||||
1. For anything beyond a simple script or tool, or anything that is going to
|
||||
run in any sort of "production" anywhere, make sure it passes
|
||||
`golangci-lint`. Run it with `make lint`, never by invoking the binary: the
|
||||
linter runs as a phase of the `Dockerfile` and is not installed on the host
|
||||
by any repo. Invoked directly on a shared host it reads a result cache keyed
|
||||
on file content rather than location, and a host-global lock, so its answer
|
||||
may belong to another checkout entirely.
|
||||
linter always runs in a container, and `golangci-lint` is not installed on
|
||||
the host by any repo. Invoked directly on a shared host it reads a result
|
||||
cache keyed on file content rather than location, and a host-global lock, so
|
||||
its answer may belong to another checkout entirely.
|
||||
|
||||
1. Write a `Dockerfile` for every repo, even if it only runs the tests and
|
||||
linting. It carries the lint and test phases, and the final stage depends on
|
||||
both, so a build makes sure the code is in an able-to-be-compiled state,
|
||||
linted, and its tests run. Go through `script/cibuild` or `script/docker`
|
||||
rather than a bare `docker build .`: they pass `--no-cache`, without which
|
||||
an unchanged tree serves the gate layers from cache and the build reports a
|
||||
green it never ran.
|
||||
linting. `script/cibuild` and `script/docker` should always make sure that
|
||||
the code is in an able-to-be-compiled state, linted, and any tests run, and
|
||||
the build should fail if linting doesn't pass. That guarantee holds only
|
||||
because those scripts pass a per-invocation `CHECK_EPOCH` build arg that
|
||||
busts the check layers out of the Docker cache; without it an unchanged tree
|
||||
serves those layers from cache and the build reports a green it never ran. A
|
||||
bare `docker build .` fails closed by design, on the `[ -n "$CHECK_EPOCH" ]`
|
||||
guard — always go through `script/cibuild` or `script/docker`. See
|
||||
[Repository Policies](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/REPO_POLICIES.md)
|
||||
for the canonical form.
|
||||
|
||||
1. Every repo must have a `Makefile`. See
|
||||
[Repository Policies](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/REPO_POLICIES.md)
|
||||
@@ -134,15 +148,10 @@ last_modified: 2026-10-04
|
||||
|
||||
1. Keep the `main()` function as small as possible.
|
||||
|
||||
1. Keep the `main` package as small as possible. Each `cmd/<name>/` directory
|
||||
contains a single `main.go` whose body is one call into library code (for
|
||||
example `os.Exit(cli.Main())` calling `internal/cli`). All CLI logic — flag
|
||||
parsing, subcommand dispatch, argument handling, output formatting — lives
|
||||
in `internal/` or `pkg/`, not in `cmd/`. `main` is just an entrypoint to
|
||||
your code, not a place for implementations. Exception: single-file scripts.
|
||||
|
||||
1. No project logic outside `internal/` or `pkg/`. Anything in `cmd/` is a thin
|
||||
entrypoint only.
|
||||
1. Keep the `main` package as small as possible. Move as much code as is
|
||||
feasible to a library package, even if it's an internal one. `main` is just
|
||||
an entrypoint to your code, not a place for implementations. Exception:
|
||||
single-file scripts.
|
||||
|
||||
1. HTTP HandleFuncs should be returned from methods or functions that need to
|
||||
handle HTTP requests. Don't use methods or your top level functions as
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Existing Repo Checklist
|
||||
last_modified: 2026-10-04
|
||||
last_modified: 2026-08-10
|
||||
---
|
||||
|
||||
Use this checklist when beginning work in a repo that may not yet conform to our
|
||||
@@ -24,80 +24,71 @@ with your task.
|
||||
- [ ] `LICENSE` file exists and matches the README
|
||||
- [ ] `REPO_POLICIES.md` exists and version date is current — fetch from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/REPO_POLICIES.md`
|
||||
- [ ] Guidance for coding agents, if the repo has any, is one `AGENTS.md` at the
|
||||
root — never a file or directory named after one agent tool, such as
|
||||
`CLAUDE.md` or `.claude/`, and never separate memory files. Move what any
|
||||
such committed file says into `AGENTS.md` and delete it.
|
||||
- [ ] `.gitignore` is comprehensive (OS, editor, agent scratch, language
|
||||
artifacts, secrets) — fetch from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitignore` if missing.
|
||||
An existing repo usually has a hand-written one that is never re-fetched,
|
||||
so check the entries rather than the file's presence.
|
||||
so check the entries rather than the file's presence: `.claude/` in
|
||||
particular, unanchored, so agent worktrees cannot be committed by
|
||||
accident. Do not give it a `**/` prefix — that is a `.dockerignore` form
|
||||
and is wrong here.
|
||||
- [ ] `.editorconfig` exists — fetch from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.editorconfig`
|
||||
- [ ] `Dockerfile` and `.dockerignore` exist; the Dockerfile carries a `lint`
|
||||
phase and a `test` phase, and the final stage carries a `COPY --from=` of
|
||||
a harmless file from each — fetch `.dockerignore` from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.dockerignore`
|
||||
- [ ] Nothing has been appended after the final stage, and the gate phases are
|
||||
reachable from it. A stage nothing depends on is built only when
|
||||
`--target` names it, so a lost `COPY --from=` edge leaves `docker build .`
|
||||
passing while the gate never runs. Confirm by planting a violation, not by
|
||||
reading the file.
|
||||
- [ ] The gate phases invoke their tools directly, never through `make lint` or
|
||||
`script/test` — those are themselves a `docker build` and would recurse
|
||||
inside a build step
|
||||
- [ ] Every depth-independent pattern in `.dockerignore` carries a `**/` prefix,
|
||||
only genuinely root-anchored entries such as `.claude` are unprefixed, and
|
||||
`.gitignore`'s patterns have not been transplanted unmodified — the
|
||||
transplanted form leaves `config/.env` and `certs/server.key` in the build
|
||||
context while reading as solved
|
||||
- [ ] `Dockerfile` and `.dockerignore` exist (fetch `.dockerignore` from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.dockerignore`);
|
||||
Dockerfile runs `make check` as a build step, and every stage containing a
|
||||
check-running `RUN` declares `ARG CHECK_EPOCH` with the
|
||||
`RUN [ -n "$CHECK_EPOCH" ] || exit 1` guard immediately below it — see the
|
||||
`CHECK_EPOCH` rule in `REPO_POLICIES.md`. Without them the check layer is
|
||||
served from cache on an unchanged tree and the build reports a green it
|
||||
never ran.
|
||||
- [ ] **Every stage that runs checks sets `ENV LINT_IN_CONTAINER=1`** — the lint
|
||||
stage and the build stage both. This is the item an existing repo most
|
||||
often fails after adopting the containerised lint: without it
|
||||
`script/lint` tries to build `Dockerfile.lint` from inside a build step,
|
||||
where there is no daemon.
|
||||
- [ ] `Dockerfile.lint` exists and `script/lint` builds it when not already in a
|
||||
container — see the containerised-lint rule in `REPO_POLICIES.md`. Base
|
||||
image pinned by sha256 with a version/date comment, `ARG CHECK_EPOCH`
|
||||
**after** the dependency layer with the guard below it.
|
||||
- [ ] `.dockerignore` excludes the repo's own host-built artifacts (compiled
|
||||
binaries, test binaries, coverage output), written root-anchored —
|
||||
`/myapp`, never `**/myapp`. An existing repo is where such a binary is
|
||||
likeliest to already be sitting in the build context, invisible to git.
|
||||
- [ ] `.claude/` is in `.gitignore` (unanchored) and `.claude` in
|
||||
`.dockerignore` (anchored, no `**/` prefix). Agent worktrees are entire
|
||||
checkouts of the repo, so they inflate the context by a multiple of it and
|
||||
can copy another session's unreviewed work into an image layer. If agents
|
||||
here run anywhere other than the repo root, the anchored entry misses
|
||||
`services/api/.claude/`: add anchored entries for those directories.
|
||||
- [ ] If the repo embeds a version in a binary: `.dockerignore` lets `.git` into
|
||||
the build context. It keeps out every git `config` at any depth
|
||||
(`**/.git/config`, `**/.git/modules/**/config`): the repository's own,
|
||||
each submodule's under `.git/modules/`, and that of a submodule keeping
|
||||
its own `.git` directory. `git describe` does not need them, and each can
|
||||
hold a credential: a password in a remote URL, or the token the CI
|
||||
checkout step stores there. A submodule whose name has a `config` segment
|
||||
(`config`, `deploy/config`, `config/lib`) loses its whole git directory to
|
||||
`**/.git/modules/**/config`, and Go's version stamping then fails the
|
||||
build: give it a name without that segment (`git submodule add --name`).
|
||||
The stage that compiles has `git` (the Debian Go image has it; an alpine
|
||||
one needs `apk add --no-cache git`) and takes the version from the
|
||||
`VERSION` build argument when one is given, otherwise from
|
||||
`git describe --tags --always`. That gives the tag on a tagged commit; on
|
||||
a later commit, the tag, the number of commits since it and the short
|
||||
commit (`v1.2.3-4-gabc1234`); and the short commit when no tag is
|
||||
reachable. The stage that compiles also marks its working directory safe
|
||||
for git (`git config --system --add safe.directory /src`): a context sent
|
||||
as a tar stream keeps the sender's file owners, and git refuses a checkout
|
||||
owned by another user, so the version would come out empty. `ARG VERSION`
|
||||
has no default, and the build fails if the context carries `.git` and the
|
||||
version still comes out empty, `dev` or `unknown`. A plain
|
||||
`docker build .` with no build arguments must succeed; a Dockerfile that
|
||||
refuses an empty build argument drops that refusal and keeps the argument.
|
||||
`script/docker` and `script/cibuild` pass the version they compute on the
|
||||
host; it takes precedence. A tag-derived version additionally needs
|
||||
`fetch-depth: 0` on the CI checkout step, which clones shallow and fetches
|
||||
no tags by default.
|
||||
`/myapp`, never `**/myapp`, which would also match `cmd/myapp/`. An
|
||||
existing repo is where such a binary is likeliest to already be sitting in
|
||||
the build context, invisible to git.
|
||||
- [ ] `.dockerignore` excludes `.claude`, root-anchored and with no `**/`
|
||||
prefix. Agent worktrees are entire checkouts of the repo, so they inflate
|
||||
the context by a multiple of it and can copy another session's unreviewed
|
||||
work into an image layer. Confirm by enumerating the image, not by reading
|
||||
the file — `.gitignore` hides these from `git status` too.
|
||||
- [ ] **Do agents in this repo run anywhere other than the repo root?** The
|
||||
scratch directory is created in the agent's working directory, so the
|
||||
canonical anchored entry misses `services/api/.claude/` in a monorepo with
|
||||
a per-service agent — it still reaches the build context and the image. An
|
||||
existing repo is where such a layout already exists, so check it here
|
||||
rather than assuming the canonical entry covers you: add anchored entries
|
||||
for the subdirectories that have one (`/services/api/.claude`), or
|
||||
`**/.claude` once you have confirmed no legitimately named nested
|
||||
directory would be caught.
|
||||
- [ ] If the repo embeds a version in a binary, that version is computed on the
|
||||
host and passed with `--build-arg VERSION=...` by `script/docker` and
|
||||
`script/cibuild`. No stage calls `git describe`: `.dockerignore` excludes
|
||||
`.git`, so it yields an empty version without failing the build. A
|
||||
tag-derived version additionally needs `fetch-depth: 0` on the CI checkout
|
||||
step, which clones shallow and fetches no tags by default.
|
||||
- [ ] Every depth-independent pattern in `.dockerignore` carries a `**/` prefix;
|
||||
only genuinely root-anchored entries such as `.git` are unprefixed, and
|
||||
`.gitignore`'s patterns have not been transplanted unmodified.
|
||||
`.dockerignore` anchors an unprefixed pattern at the context root, so the
|
||||
transplanted form leaves `config/.env` and `certs/server.key` in the build
|
||||
context while reading as solved — see the `.dockerignore` rule in
|
||||
`REPO_POLICIES.md`.
|
||||
- [ ] Gitea Actions workflow in `.gitea/workflows/` runs `script/cibuild` on
|
||||
push — reference
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
||||
- [ ] Language-specific config:
|
||||
- [ ] Go: `go.mod`, `go.sum`, `.golangci.yml` (fetch from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml` and,
|
||||
in the same commit, set the lint phase digest to the one named in the
|
||||
`.golangci.yml` paragraph of `REPO_POLICIES.md`)
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml`)
|
||||
- [ ] JS: `package.json`, `yarn.lock`, `.prettierrc`, `.prettierignore`
|
||||
(fetch from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.prettierrc` and
|
||||
@@ -118,33 +109,26 @@ with your task.
|
||||
`script/install-precommit`, shimmed by `make hooks`) runs it
|
||||
- [ ] README has an **Entrypoints** section documenting the `script/`
|
||||
entrypoints and linking the standard
|
||||
- [ ] `script/lint` and `script/test` build their phase by name
|
||||
(`docker build --no-cache --target <phase> -t <name>-<phase> .`), and no
|
||||
host invocation anywhere in the repo can produce a lint verdict — grep for
|
||||
- [ ] `script/lint` is the canonical detect-and-branch form, and no host
|
||||
invocation anywhere in the repo can produce a lint **verdict** — grep for
|
||||
the linter's own name across `script/`, the `Makefile` and CI config, not
|
||||
just `script/lint`. A second path is likeliest here: a `make lint-fast`,
|
||||
an older host-versus-container branch, or a CI step calling the binary
|
||||
directly. `script/fmt` and `script/fmt-check` are expected hits and stay
|
||||
on the host.
|
||||
- [ ] Every `docker build` in `script/` is tagged — an untagged one leaves a
|
||||
dangling image behind on every run, on every host and CI runner
|
||||
- [ ] `script/cibuild` runs `script/bootstrap` before `script/check`, and builds
|
||||
the image with `--no-cache`. Without the bootstrap the CI run dies in
|
||||
`script/fmt-check`, which runs the formatter on the host and finds nothing
|
||||
installed.
|
||||
- [ ] `script/fmt` and `script/fmt-check` source nvm for the pinned node version
|
||||
before invoking `yarn`, as `script/bootstrap`'s own install step does.
|
||||
`script/bootstrap` leaves the node and yarn it installs off the `PATH` of
|
||||
the shell that called it, so a bare `yarn` exits 127 on a runner carrying
|
||||
nothing but docker and git.
|
||||
- [ ] `script/bootstrap` installs no linter of its own — delete the block, its
|
||||
version variables and its call site. A JS repo's `yarn install` stays; it
|
||||
brings a linter along with every other dependency, and no verdict is taken
|
||||
from it.
|
||||
an older container-versus-host branch, or a CI step calling the binary
|
||||
directly. **Expected hits that are not the defect**: `script/fmt`, and in
|
||||
a repo whose formatter is also its linter, `script/fmt-check`. Everything
|
||||
else the grep finds is a real second path and goes.
|
||||
- [ ] Detection is on `LINT_IN_CONTAINER` alone. Reject any `/.dockerenv` or
|
||||
cgroup heuristic: absent in BuildKit `RUN` steps, present on hosts that
|
||||
are themselves containers, and a false positive lints on the host.
|
||||
- [ ] `script/bootstrap` installs no golangci-lint. Delete the block, its
|
||||
version and ref variables, and its call site. A JS repo's `yarn install`
|
||||
stays — it brings a linter along with every other dependency, which is
|
||||
fine as long as no verdict is taken from it.
|
||||
- [ ] The per-checkout lint state is gone: no `GOLANGCI_LINT_CACHE` or `TMPDIR`
|
||||
exports, no `--allow-serial-runners`, and `.lint-cache/` removed from
|
||||
`.gitignore` and `.dockerignore`.
|
||||
- [ ] `make check` does not modify any files in the repo
|
||||
- [ ] `make test` has a 90-second timeout and completes within the 60-second
|
||||
hard cap (over 20 seconds is green but must be filed as an improvement
|
||||
bug)
|
||||
- [ ] `make test` has a 30-second timeout
|
||||
- [ ] `make test` runs real tests, not a no-op (at minimum, import/compile
|
||||
check)
|
||||
- [ ] `make check` passes on current branch
|
||||
@@ -189,10 +173,9 @@ with your task.
|
||||
# Final
|
||||
|
||||
- [ ] `make check` passes
|
||||
- [ ] `script/cibuild` succeeds in a fresh clone on a host carrying nothing but
|
||||
docker and git, with no node or yarn on `PATH`, which is what CI has, and
|
||||
demonstrably executed the checks — a sub-second build, or `CACHED` on a
|
||||
gate layer, means nothing ran
|
||||
- [ ] A planted lint violation fails both `make lint` and a plain
|
||||
`docker build .`; revert it afterwards
|
||||
- [ ] `make lint` runs twice on an unchanged tree with the lint layer `DONE`
|
||||
both times, never `CACHED` and never sub-second
|
||||
- [ ] `script/cibuild` succeeds (a bare `docker build .` or
|
||||
`docker build -f Dockerfile.lint .` fails closed by design, on the
|
||||
`CHECK_EPOCH` guard)
|
||||
- [ ] Commit and merge fixes before starting your actual task
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Go HTTP Server Conventions
|
||||
last_modified: 2026-10-04
|
||||
last_modified: 2026-08-09
|
||||
---
|
||||
|
||||
This document defines the architectural patterns, design decisions, and
|
||||
@@ -106,9 +106,6 @@ project-root/
|
||||
package main
|
||||
|
||||
import (
|
||||
"os/signal"
|
||||
"syscall"
|
||||
|
||||
"yourproject/internal/config"
|
||||
"yourproject/internal/database"
|
||||
"yourproject/internal/globals"
|
||||
@@ -121,16 +118,15 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
Appname string = "CHANGEME"
|
||||
Version string
|
||||
Appname string = "CHANGEME"
|
||||
Version string
|
||||
Buildarch string
|
||||
)
|
||||
|
||||
func main() {
|
||||
globals.Appname = Appname
|
||||
globals.Version = Version
|
||||
|
||||
// A write to a closed stdout or stderr must not end the process.
|
||||
signal.Ignore(syscall.SIGPIPE)
|
||||
globals.Buildarch = Buildarch
|
||||
|
||||
fx.New(
|
||||
fx.Provide(
|
||||
@@ -204,8 +200,7 @@ Providers are resolved automatically by fx, but conceptually follow this order:
|
||||
Database)
|
||||
6. `middleware.New` - Middleware (depends on Logger, Globals, Config)
|
||||
7. `handlers.New` - Handlers (depends on Logger, Globals, Database, Healthcheck)
|
||||
8. `server.New` - Server (depends on all above, and on `fx.Shutdowner`, which fx
|
||||
provides itself)
|
||||
8. `server.New` - Server (depends on all above)
|
||||
|
||||
---
|
||||
|
||||
@@ -224,14 +219,16 @@ type ServerParams struct {
|
||||
Config *config.Config
|
||||
Middleware *middleware.Middleware
|
||||
Handlers *handlers.Handlers
|
||||
Shutdowner fx.Shutdowner
|
||||
}
|
||||
|
||||
type Server struct {
|
||||
startupTime time.Time
|
||||
port int
|
||||
exitCode int
|
||||
sentryEnabled bool
|
||||
log *slog.Logger
|
||||
ctx context.Context
|
||||
cancelFunc context.CancelFunc
|
||||
httpServer *http.Server
|
||||
router *chi.Mux
|
||||
params ServerParams
|
||||
@@ -253,15 +250,13 @@ func New(lc fx.Lifecycle, params ServerParams) (*Server, error) {
|
||||
lc.Append(fx.Hook{
|
||||
OnStart: func(ctx context.Context) error {
|
||||
s.startupTime = time.Now()
|
||||
if err := s.enableSentry(); err != nil {
|
||||
return err
|
||||
}
|
||||
s.SetupRoutes()
|
||||
s.httpServer = s.newHTTPServer()
|
||||
go s.serveUntilShutdown()
|
||||
go s.Run()
|
||||
return nil
|
||||
},
|
||||
OnStop: func(ctx context.Context) error {
|
||||
// Server shutdown logic
|
||||
return nil
|
||||
},
|
||||
OnStop: s.cleanShutdown,
|
||||
})
|
||||
return s, nil
|
||||
}
|
||||
@@ -271,25 +266,23 @@ func New(lc fx.Lifecycle, params ServerParams) (*Server, error) {
|
||||
|
||||
```go
|
||||
// internal/server/http.go
|
||||
func (s *Server) newHTTPServer() *http.Server {
|
||||
return &http.Server{
|
||||
Addr: fmt.Sprintf(":%d", s.params.Config.Port),
|
||||
func (s *Server) serveUntilShutdown() {
|
||||
listenAddr := fmt.Sprintf(":%d", s.params.Config.Port)
|
||||
s.httpServer = &http.Server{
|
||||
Addr: listenAddr,
|
||||
ReadTimeout: 10 * time.Second,
|
||||
WriteTimeout: 10 * time.Second,
|
||||
MaxHeaderBytes: 1 << 20,
|
||||
Handler: s,
|
||||
}
|
||||
}
|
||||
|
||||
// serveUntilShutdown returns when the stop hook shuts the HTTP server down.
|
||||
// If it stops for any other reason, such as its port being taken, it asks fx
|
||||
// to shut down with exit code 1.
|
||||
func (s *Server) serveUntilShutdown() {
|
||||
s.log.Info("http begin listen", "listenaddr", s.httpServer.Addr)
|
||||
s.SetupRoutes()
|
||||
|
||||
s.log.Info("http begin listen", "listenaddr", listenAddr)
|
||||
if err := s.httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
||||
s.log.Error("listen error", "error", err)
|
||||
if err := s.params.Shutdowner.Shutdown(fx.ExitCode(1)); err != nil {
|
||||
s.log.Error("shutdown request failed", "error", err)
|
||||
if s.cancelFunc != nil {
|
||||
s.cancelFunc()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -301,30 +294,43 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
## Signal Handling and Graceful Shutdown
|
||||
|
||||
fx owns SIGINT, SIGTERM and the exit code. `Run()` in `main` waits for one of
|
||||
those signals or for a call to `Shutdown()` on `fx.Shutdowner`, runs the stop
|
||||
hooks, and exits 0 after a signal, or with the code the call gave in
|
||||
`fx.ExitCode`. It exits 1 instead when a start hook or a stop hook returns an
|
||||
error; when a start hook fails, fx first runs the stop hooks of everything
|
||||
already started. No other code calls `signal.Notify` or `os.Exit`: the listen
|
||||
error above asks fx to shut down with `fx.ExitCode(1)`, and a Sentry start
|
||||
failure is returned from the start hook. Each component releases its own
|
||||
resources in its own stop hook, which fx runs in the reverse order of start.
|
||||
|
||||
```go
|
||||
// cleanShutdown is the server's stop hook. It fails when requests are still
|
||||
// running after 5 seconds.
|
||||
func (s *Server) cleanShutdown(ctx context.Context) error {
|
||||
ctxShutdown, shutdownCancel := context.WithTimeout(ctx, 5*time.Second)
|
||||
defer shutdownCancel()
|
||||
err := s.httpServer.Shutdown(ctxShutdown)
|
||||
func (s *Server) serve() int {
|
||||
s.ctx, s.cancelFunc = context.WithCancel(context.Background())
|
||||
|
||||
// Signal watcher
|
||||
go func() {
|
||||
c := make(chan os.Signal, 1)
|
||||
signal.Ignore(syscall.SIGPIPE)
|
||||
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
|
||||
sig := <-c
|
||||
s.log.Info("signal received", "signal", sig)
|
||||
if s.cancelFunc != nil {
|
||||
s.cancelFunc()
|
||||
}
|
||||
}()
|
||||
|
||||
go s.serveUntilShutdown()
|
||||
|
||||
for range s.ctx.Done() {
|
||||
}
|
||||
s.cleanShutdown()
|
||||
return s.exitCode
|
||||
}
|
||||
|
||||
func (s *Server) cleanShutdown() {
|
||||
s.exitCode = 0
|
||||
ctxShutdown, shutdownCancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
if err := s.httpServer.Shutdown(ctxShutdown); err != nil {
|
||||
s.log.Error("server clean shutdown failed", "error", err)
|
||||
}
|
||||
if shutdownCancel != nil {
|
||||
shutdownCancel()
|
||||
}
|
||||
s.cleanupForExit()
|
||||
if s.sentryEnabled {
|
||||
sentry.Flush(2 * time.Second)
|
||||
}
|
||||
if err != nil {
|
||||
return fmt.Errorf("http server shutdown: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
```
|
||||
|
||||
@@ -820,7 +826,7 @@ func (l *Logger) Identify() {
|
||||
l.log.Info("starting",
|
||||
"appname", l.params.Globals.Appname,
|
||||
"version", l.params.Globals.Version,
|
||||
"arch", runtime.GOARCH,
|
||||
"buildarch", l.params.Globals.Buildarch,
|
||||
)
|
||||
}
|
||||
```
|
||||
@@ -940,20 +946,23 @@ import "go.uber.org/fx"
|
||||
|
||||
// Package-level variables (set from main)
|
||||
var (
|
||||
Appname string
|
||||
Version string
|
||||
Appname string
|
||||
Version string
|
||||
Buildarch string
|
||||
)
|
||||
|
||||
// Struct for DI
|
||||
type Globals struct {
|
||||
Appname string
|
||||
Version string
|
||||
Appname string
|
||||
Version string
|
||||
Buildarch string
|
||||
}
|
||||
|
||||
func New(lc fx.Lifecycle) (*Globals, error) {
|
||||
n := &Globals{
|
||||
Appname: Appname,
|
||||
Version: Version,
|
||||
Appname: Appname,
|
||||
Buildarch: Buildarch,
|
||||
Version: Version,
|
||||
}
|
||||
return n, nil
|
||||
}
|
||||
@@ -964,13 +973,15 @@ func New(lc fx.Lifecycle) (*Globals, error) {
|
||||
```go
|
||||
// cmd/httpd/main.go
|
||||
var (
|
||||
Appname string = "CHANGEME" // Default, overridden by build
|
||||
Version string // Set at build time
|
||||
Appname string = "CHANGEME" // Default, overridden by build
|
||||
Version string // Set at build time
|
||||
Buildarch string // Set at build time
|
||||
)
|
||||
|
||||
func main() {
|
||||
globals.Appname = Appname
|
||||
globals.Version = Version
|
||||
globals.Buildarch = Buildarch
|
||||
// ...
|
||||
}
|
||||
```
|
||||
@@ -980,16 +991,18 @@ func main() {
|
||||
Use ldflags to inject version information at build time:
|
||||
|
||||
```makefile
|
||||
# ?= rather than := so that a `VERSION` build argument takes precedence:
|
||||
# where a build stage invokes make, `ARG VERSION` puts it in the
|
||||
# environment and `?=` defers to it. Otherwise `git describe` runs, in a
|
||||
# build stage on the `.git` the build context carries. When it prints
|
||||
# nothing (outside a git checkout, or where git is missing or refuses the
|
||||
# checkout), the version falls back to `dev`.
|
||||
VERSION ?= $(or $(shell git describe --tags --always 2>/dev/null),dev)
|
||||
# ?= rather than := because this `$(shell git describe ...)` is only correct
|
||||
# on the host: `.dockerignore` excludes `.git`, so evaluated inside a build
|
||||
# stage it expands to the empty string without failing and the binary reports
|
||||
# no version. The version is computed on the host by `script/docker` /
|
||||
# `script/cibuild` and passed with `--build-arg VERSION=...`; where the build
|
||||
# stage invokes make, `ARG VERSION` puts it in the environment and `?=` defers
|
||||
# to it. See the git-describe rule in REPO_POLICIES.md.
|
||||
VERSION ?= $(shell git describe --tags --always)
|
||||
BUILDARCH := $(shell go env GOARCH)
|
||||
|
||||
build:
|
||||
go build -ldflags "-X main.Version=$(VERSION)" ./cmd/httpd
|
||||
go build -ldflags "-X main.Version=$(VERSION) -X main.Buildarch=$(BUILDARCH)" ./cmd/httpd
|
||||
```
|
||||
|
||||
---
|
||||
@@ -1156,11 +1169,11 @@ s.router.Get("/.well-known/healthcheck", s.h.HandleHealthCheck())
|
||||
Sentry is conditionally enabled based on `SENTRY_DSN` environment variable:
|
||||
|
||||
```go
|
||||
func (s *Server) enableSentry() error {
|
||||
func (s *Server) enableSentry() {
|
||||
s.sentryEnabled = false
|
||||
|
||||
if s.params.Config.SentryDSN == "" {
|
||||
return nil
|
||||
return
|
||||
}
|
||||
|
||||
err := sentry.Init(sentry.ClientOptions{
|
||||
@@ -1168,17 +1181,15 @@ func (s *Server) enableSentry() error {
|
||||
Release: fmt.Sprintf("%s-%s", s.params.Globals.Appname, s.params.Globals.Version),
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("sentry init failure: %w", err)
|
||||
s.log.Error("sentry init failure", "error", err)
|
||||
os.Exit(1)
|
||||
return
|
||||
}
|
||||
s.log.Info("sentry error reporting activated")
|
||||
s.sentryEnabled = true
|
||||
return nil
|
||||
}
|
||||
```
|
||||
|
||||
The server's start hook calls `enableSentry()` and returns its error, so a DSN
|
||||
Sentry rejects stops startup and fx exits 1.
|
||||
|
||||
Sentry middleware with repanic (bubbles panics to chi's Recoverer):
|
||||
|
||||
```go
|
||||
@@ -1190,7 +1201,7 @@ if s.sentryEnabled {
|
||||
}
|
||||
```
|
||||
|
||||
Flush Sentry in the server's stop hook, `cleanShutdown()`:
|
||||
Flush Sentry on shutdown:
|
||||
|
||||
```go
|
||||
if s.sentryEnabled {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: New Repo Checklist
|
||||
last_modified: 2026-10-04
|
||||
last_modified: 2026-08-10
|
||||
---
|
||||
|
||||
Use this checklist when creating a new repository from scratch. Follow the steps
|
||||
@@ -54,9 +54,6 @@ Template files can be fetched from:
|
||||
- [ ] `LICENSE` file matching the chosen license
|
||||
- [ ] `REPO_POLICIES.md` — fetch from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/REPO_POLICIES.md`
|
||||
- [ ] Guidance for coding agents, if the repo has any, is one `AGENTS.md` at the
|
||||
root — never a file or directory named after one agent tool, such as
|
||||
`CLAUDE.md` or `.claude/`, and never separate memory files
|
||||
- [ ] `Dockerfile` and `.dockerignore` — fetch `.dockerignore` from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.dockerignore`
|
||||
- Extend `.dockerignore` with the repo's own host-built artifacts, giving
|
||||
@@ -65,51 +62,44 @@ Template files can be fetched from:
|
||||
`cmd/myapp/` and delete the package directory. Do not transplant
|
||||
`.gitignore`'s patterns: `.dockerignore` anchors an unprefixed pattern at
|
||||
the context root, so the copied form leaves `config/.env` in the build
|
||||
context while reading as solved. The canonical file's `.claude` entry is
|
||||
anchored for the same reason as a repo-root binary; leave it that way, but
|
||||
note that it only covers agents running at the repo root — if this repo
|
||||
will run them in subdirectories, `services/api/.claude/` needs its own
|
||||
context while reading as solved. See the `.dockerignore` rule in
|
||||
`REPO_POLICIES.md`. The canonical file's `.claude` entry is anchored for
|
||||
the same reason as a repo-root binary; leave it that way, but note it only
|
||||
covers agents running at the repo root — if this repo will run them in
|
||||
subdirectories, `services/api/.claude/` is not excluded and needs its own
|
||||
anchored entry.
|
||||
- If the image embeds a version in a binary: `.dockerignore` lets `.git`
|
||||
into the build context. It keeps out every git `config` at any depth
|
||||
(`**/.git/config`, `**/.git/modules/**/config`): the repository's own,
|
||||
each submodule's under `.git/modules/`, and that of a submodule keeping
|
||||
its own `.git` directory. `git describe` does not need them, and each can
|
||||
hold a credential: a password in a remote URL, or the token the CI
|
||||
checkout step stores there. A submodule whose name has a `config` segment
|
||||
(`config`, `deploy/config`, `config/lib`) loses its whole git directory to
|
||||
`**/.git/modules/**/config`, and Go's version stamping then fails the
|
||||
build: give it a name without that segment (`git submodule add --name`).
|
||||
The stage that compiles has `git` (the Debian Go image has it; an alpine
|
||||
one needs `apk add --no-cache git`) and takes the version from the
|
||||
`VERSION` build argument when one is given, otherwise from
|
||||
`git describe --tags --always`. That gives the tag on a tagged commit; on
|
||||
a later commit, the tag, the number of commits since it and the short
|
||||
commit (`v1.2.3-4-gabc1234`); and the short commit when no tag is
|
||||
reachable. The stage that compiles also marks its working directory safe
|
||||
for git (`git config --system --add safe.directory /src`): a context sent
|
||||
as a tar stream keeps the sender's file owners, and git refuses a checkout
|
||||
owned by another user, so the version would come out empty. `ARG VERSION`
|
||||
has no default, and the build fails if the context carries `.git` and the
|
||||
version still comes out empty, `dev` or `unknown`. A plain
|
||||
`docker build .` with no build arguments must succeed; a Dockerfile that
|
||||
refuses an empty build argument drops that refusal and keeps the argument.
|
||||
- The Dockerfile carries a `lint` phase and a `test` phase, each invoking
|
||||
its tool directly rather than through `make` or `script/`, and the final
|
||||
stage carries a `COPY --from=` of a harmless file from each so the image
|
||||
cannot be built unless both passed. Keep the final stage last: a stage
|
||||
nothing depends on is built only when `--target` names it.
|
||||
- Server: the final stage builds and runs the application
|
||||
- Non-server: the final stage brings up the dev environment
|
||||
- If the image embeds a version in a binary, the version is computed on the
|
||||
host and passed with `--build-arg VERSION=...`. `ARG VERSION=dev` is
|
||||
declared in the stage that compiles, and **no stage calls `git describe`**
|
||||
— `.dockerignore` excludes `.git`, so it yields an empty version without
|
||||
failing the build.
|
||||
- All Dockerfiles must run `make check` as a build step, and every stage
|
||||
containing a check-running `RUN` must declare `ARG CHECK_EPOCH` with the
|
||||
`RUN [ -n "$CHECK_EPOCH" ] || exit 1` guard immediately below it — see the
|
||||
`CHECK_EPOCH` rule in `REPO_POLICIES.md`. Without them the check layer is
|
||||
served from cache on an unchanged tree and the build reports a green it
|
||||
never ran.
|
||||
- Every stage that runs checks sets `ENV LINT_IN_CONTAINER=1`, so
|
||||
`script/lint` runs the linter natively instead of trying to build
|
||||
`Dockerfile.lint` where there is no daemon.
|
||||
- Go repos: separate `lint` stage on the `golangci/golangci-lint` image,
|
||||
with `COPY --from=lint /src/go.sum /dev/null` in the build stage to force
|
||||
the ordering. Re-prove that ordering warm after adopting `CHECK_EPOCH`.
|
||||
- Server: also builds and runs the application
|
||||
- Non-server: brings up dev environment and runs `make check`
|
||||
- Image pinned by sha256 hash with version/date comment
|
||||
- [ ] `Dockerfile.lint` — the lint-only image `script/lint` builds when it is
|
||||
not already inside a container. Sets `ENV LINT_IN_CONTAINER=1`; same
|
||||
`ARG CHECK_EPOCH` + guard + expanded-value discipline as above, with the
|
||||
`ARG` **after** the dependency layer so only the lint re-runs. Base image
|
||||
pinned by sha256 with a version/date comment. Copy from
|
||||
`REPO_POLICIES.md`.
|
||||
- [ ] Gitea Actions workflow at `.gitea/workflows/check.yml` that runs
|
||||
`script/cibuild` on push — reference
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
||||
- [ ] Language-specific:
|
||||
- [ ] Go: `go mod init sneak.berlin/go/<name>`, `.golangci.yml` (fetch from
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml` and,
|
||||
in the same commit, set the lint phase digest to the one named in the
|
||||
`.golangci.yml` paragraph of `REPO_POLICIES.md`)
|
||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml`)
|
||||
- [ ] JS: `yarn init`, `yarn add --dev prettier`
|
||||
- [ ] Python: `pyproject.toml`
|
||||
|
||||
@@ -124,40 +114,55 @@ are thin shims calling them. Model scripts:
|
||||
- [ ] `script/bootstrap` / `make bootstrap` — installs all dependencies,
|
||||
idempotently, assuming nothing (pkg manager detection nix/apt/brew/apk;
|
||||
node used if present, else pinned version via nvm from a hash-verified
|
||||
archive; pinned yarn via corepack); a non-server repo's development
|
||||
environment stage runs it instead of inline installs; a gate phase or the
|
||||
build stage installs what its base image lacks either inline or by running
|
||||
it
|
||||
archive; pinned yarn via corepack); Dockerfile runs it instead of inline
|
||||
installs
|
||||
- [ ] `script/setup` / `make setup` — readies a fresh clone: runs `bootstrap`,
|
||||
then `install-precommit`, plus repo-specific init
|
||||
- [ ] `script/test` / `make test` — `docker build --no-cache --target test .`,
|
||||
tagged; the phase runs real tests, not a no-op (90-second timeout,
|
||||
60-second hard cap on wall time)
|
||||
- [ ] `script/lint` / `make lint` — `docker build --no-cache --target lint .`,
|
||||
tagged. No lint verdict may come from a host invocation of the linter.
|
||||
- [ ] `script/fmt` / `make fmt` — formats code (writes; native, never in a
|
||||
container)
|
||||
- [ ] `script/fmt-check` / `make fmt-check` — checks formatting (read-only;
|
||||
native)
|
||||
- [ ] `script/test` / `make test` — runs real tests, not a no-op (30-second
|
||||
timeout)
|
||||
- [ ] `script/lint` / `make lint` — runs the linter directly when
|
||||
`LINT_IN_CONTAINER=1`, otherwise `epoch="$(date +%s%N)$$"` on its own line
|
||||
then `docker build --build-arg CHECK_EPOCH="$epoch" -f Dockerfile.lint .`.
|
||||
No lint verdict may come from a host invocation. Copy from
|
||||
`REPO_POLICIES.md`. Detect on `LINT_IN_CONTAINER` only — never
|
||||
`/.dockerenv`, which is absent in BuildKit `RUN` steps and present on
|
||||
hosts that are themselves containers. Without the nonce this exits 0 on an
|
||||
unchanged tree having linted nothing; without `-f Dockerfile.lint` it
|
||||
builds the main image and lints nothing at all.
|
||||
- [ ] `script/fmt` / `make fmt` — formats code (writes)
|
||||
- [ ] `script/fmt-check` / `make fmt-check` — checks formatting (read-only)
|
||||
- [ ] `script/check` / `make check` — runs `test`, `lint`, `fmt-check`; must not
|
||||
modify files
|
||||
- [ ] `script/projectname` — outputs the project name (used by `script/docker`
|
||||
for the image tag)
|
||||
- [ ] `script/docker` / `make docker` — builds Docker image, tagged via
|
||||
`script/projectname` (byte-identical across repos); `--no-cache`, plus the
|
||||
version as a build arg
|
||||
- [ ] `script/cibuild` — cd to repo root, run `script/bootstrap`, run
|
||||
`script/check`, then
|
||||
`docker build --no-cache --build-arg VERSION="$version" .` (what CI runs).
|
||||
The bootstrap is required: CI checks out and runs this alone, and
|
||||
`script/fmt-check` runs the formatter on the host.
|
||||
- [ ] `script/fmt` and `script/fmt-check` source nvm for the pinned node version
|
||||
before invoking `yarn`, as `script/bootstrap`'s own install step does.
|
||||
`script/bootstrap` leaves the node and yarn it installs off the `PATH` of
|
||||
the shell that called it, so a bare `yarn` exits 127 on a runner carrying
|
||||
nothing but docker and git.
|
||||
- [ ] Every `docker build` in `script/` is tagged, so no invocation leaves a
|
||||
dangling image behind
|
||||
`script/projectname` (byte-identical across repos); carries the same three
|
||||
version lines as `script/cibuild` below, and passes
|
||||
`--build-arg CHECK_EPOCH="$epoch"` and `--build-arg VERSION="$version"`
|
||||
- [ ] `script/cibuild` — cd to repo root, then, each on its own line:
|
||||
|
||||
```sh
|
||||
epoch="$(date +%s%N)$$"
|
||||
version="$(git describe --tags --always --dirty 2>/dev/null || true)"
|
||||
[ -n "$version" ] || version="unknown"
|
||||
docker build \
|
||||
--build-arg CHECK_EPOCH="$epoch" \
|
||||
--build-arg VERSION="$version" \
|
||||
.
|
||||
```
|
||||
|
||||
(what CI runs). Both build args are mandatory, and both assignments must be
|
||||
on their own line: a failing command substitution inside an argument does
|
||||
not trip `set -e`, so the inline form degrades silently to an empty
|
||||
constant. The `[ -n "$version" ]` line is a live check that fires on an
|
||||
export with no `.git` and on a repo with no commits — keep it, and do not
|
||||
collapse it into `|| echo unknown`, which makes it unreachable. See the
|
||||
`CHECK_EPOCH` and git-describe rules in `REPO_POLICIES.md` for why each
|
||||
element is load-bearing. A bare `docker build .` fails closed by design, and
|
||||
so does a bare `docker build -f Dockerfile.lint .`. The image runs
|
||||
`make check`, which includes lint, so `script/cibuild` needs no separate
|
||||
lint step.
|
||||
|
||||
- [ ] `script/precommit` — called by the pre-commit hook; runs `script/check`
|
||||
- [ ] `script/install-precommit` — installs the pre-commit hook that runs
|
||||
`script/precommit`
|
||||
@@ -168,16 +173,12 @@ are thin shims calling them. Model scripts:
|
||||
# 4. Verify
|
||||
|
||||
- [ ] `make check` passes
|
||||
- [ ] `make lint` demonstrably runs the linter rather than returning a cached
|
||||
build: run it twice on an unchanged tree and confirm the lint layer says
|
||||
`DONE`, never `CACHED`, both times
|
||||
- [ ] `make docker` succeeds
|
||||
- [ ] `script/cibuild` succeeds in a fresh clone on a host carrying nothing but
|
||||
docker and git, with no node or yarn on `PATH`, which is what CI has, and
|
||||
demonstrably executed the checks — a sub-second build, or `CACHED` on a
|
||||
gate layer, means nothing ran
|
||||
- [ ] Plant a lint violation and confirm both `make lint` and a plain
|
||||
`docker build .` fail on it; revert. A plain build that passes proves the
|
||||
final stage is missing its `COPY --from=` edge to the gate phases.
|
||||
- [ ] No secrets in repo, and none in the build context: enumerate a probe image
|
||||
rather than reading `.dockerignore`
|
||||
- [ ] `script/cibuild` succeeds and demonstrably executes
|
||||
- [ ] No secrets in repo
|
||||
- [ ] No mutable image/package references
|
||||
- [ ] No unnecessary files in repo root
|
||||
- [ ] All dates written as YYYY-MM-DD
|
||||
|
||||
+601
-331
File diff suppressed because it is too large
Load Diff
+1
-3
@@ -1,8 +1,6 @@
|
||||
#!/bin/sh
|
||||
# script/check: run all checks (test, lint, fmt-check). Our own
|
||||
# extension to scripts-to-rule-them-all. test and lint are Docker
|
||||
# phases; fmt-check is native, because a formatter writes the working
|
||||
# tree. Must not modify any files.
|
||||
# extension to scripts-to-rule-them-all. Must not modify any files.
|
||||
set -eu
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
|
||||
+16
-16
@@ -1,28 +1,28 @@
|
||||
#!/bin/sh
|
||||
# script/cibuild: run the CI build. It bootstraps first: a CI runner
|
||||
# checks out and runs this and nothing else, and script/fmt-check runs
|
||||
# the formatter on the host, which a pristine checkout cannot do.
|
||||
# --no-cache for the same reason as script/docker: the gate phases the
|
||||
# final stage depends on are RUN steps, and a cached one is a check that
|
||||
# did not run.
|
||||
# script/cibuild: run the CI build. The Dockerfile runs script/check, but
|
||||
# that only proves anything because CHECK_EPOCH is a fresh nonce on every
|
||||
# invocation: without it Docker serves the check layer from cache and the
|
||||
# build exits 0 without running the suite.
|
||||
set -eu
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
"$SCRIPT_DIR/bootstrap"
|
||||
"$SCRIPT_DIR/check"
|
||||
# Own line: a failing command substitution inside an argument does
|
||||
# not trip `set -e`, so the inline form degrades silently to an
|
||||
# empty constant. The VERSION build argument takes precedence over
|
||||
# the version a build stage derives from the .git in the context.
|
||||
# Both assignments on their own line: a failing command substitution
|
||||
# inside an argument does not trip `set -e`, so the inline form
|
||||
# degrades silently to an empty constant. `$$` because busybox `date`
|
||||
# drops %N without erroring. VERSION is computed here because
|
||||
# .dockerignore excludes .git, so `git describe` in a build stage
|
||||
# yields an empty version without failing; the guard below is the
|
||||
# single place the fallback is applied.
|
||||
epoch="$(date +%s%N)$$"
|
||||
version="$(git describe --tags --always --dirty 2>/dev/null || true)"
|
||||
[ -n "$version" ] || version="unknown"
|
||||
docker build --no-cache \
|
||||
docker build \
|
||||
--build-arg CHECK_EPOCH="$epoch" \
|
||||
--build-arg VERSION="$version" \
|
||||
-t "$("$SCRIPT_DIR/projectname")" .
|
||||
.
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
+13
-8
@@ -1,8 +1,9 @@
|
||||
#!/bin/sh
|
||||
# script/docker: build the Docker image tagged with the project name.
|
||||
# Identical in all repos; the tag comes from script/projectname.
|
||||
# --no-cache because the gate phases the final stage depends on are RUN
|
||||
# steps, and a cached one is a check that did not run.
|
||||
# Identical in all repos; the tag comes from script/projectname. The
|
||||
# Dockerfile's checks only actually run because CHECK_EPOCH is a fresh
|
||||
# nonce on every invocation; without it a warm cache turns this into a
|
||||
# green that proves nothing.
|
||||
set -eu
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
@@ -10,13 +11,17 @@ ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
||||
|
||||
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. The VERSION build argument takes precedence over
|
||||
# the version a build stage derives from the .git in the context.
|
||||
# Both assignments on their own line: a failing command substitution
|
||||
# inside an argument does not trip `set -e`, so the inline form
|
||||
# degrades silently to an empty constant. `$$` because busybox `date`
|
||||
# drops %N without erroring. VERSION is computed here because
|
||||
# .dockerignore excludes .git, so `git describe` in a build stage
|
||||
# yields an empty version without failing.
|
||||
epoch="$(date +%s%N)$$"
|
||||
version="$(git describe --tags --always --dirty 2>/dev/null || true)"
|
||||
[ -n "$version" ] || version="unknown"
|
||||
docker build --no-cache \
|
||||
docker build \
|
||||
--build-arg CHECK_EPOCH="$epoch" \
|
||||
--build-arg VERSION="$version" \
|
||||
-t "$("$SCRIPT_DIR/projectname")" .
|
||||
}
|
||||
|
||||
+1
-20
@@ -4,28 +4,9 @@ set -eu
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||
|
||||
# Must match the pin in script/bootstrap.
|
||||
NODE_VERSION="22.17.0"
|
||||
|
||||
# script/bootstrap installs node and yarn under nvm and leaves neither
|
||||
# on the PATH of the shell that called it, so resolve the pinned
|
||||
# toolchain here the way bootstrap's own install step does. nvm is a
|
||||
# bash script, hence the subshell.
|
||||
run_yarn() {
|
||||
if command -v yarn >/dev/null 2>&1; then
|
||||
exec yarn "$@"
|
||||
fi
|
||||
if [ ! -s "$HOME/.nvm/nvm.sh" ]; then
|
||||
echo "fmt: no yarn; run script/bootstrap first" >&2
|
||||
exit 1
|
||||
fi
|
||||
exec bash -c '. "$HOME/.nvm/nvm.sh" && nvm use "$1" >/dev/null &&
|
||||
shift && exec yarn "$@"' bash "$NODE_VERSION" "$@"
|
||||
}
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
run_yarn run prettier --write '**/*.md' --tab-width 4 --prose-wrap always
|
||||
yarn run prettier --write '**/*.md' --tab-width 4 --prose-wrap always
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
+1
-20
@@ -4,28 +4,9 @@ set -eu
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||
|
||||
# Must match the pin in script/bootstrap.
|
||||
NODE_VERSION="22.17.0"
|
||||
|
||||
# script/bootstrap installs node and yarn under nvm and leaves neither
|
||||
# on the PATH of the shell that called it, so resolve the pinned
|
||||
# toolchain here the way bootstrap's own install step does. nvm is a
|
||||
# bash script, hence the subshell.
|
||||
run_yarn() {
|
||||
if command -v yarn >/dev/null 2>&1; then
|
||||
exec yarn "$@"
|
||||
fi
|
||||
if [ ! -s "$HOME/.nvm/nvm.sh" ]; then
|
||||
echo "fmt-check: no yarn; run script/bootstrap first" >&2
|
||||
exit 1
|
||||
fi
|
||||
exec bash -c '. "$HOME/.nvm/nvm.sh" && nvm use "$1" >/dev/null &&
|
||||
shift && exec yarn "$@"' bash "$NODE_VERSION" "$@"
|
||||
}
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
run_yarn run prettier --check '**/*.md' --tab-width 4 --prose-wrap always
|
||||
yarn run prettier --check '**/*.md' --tab-width 4 --prose-wrap always
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
+24
-13
@@ -1,23 +1,34 @@
|
||||
#!/bin/sh
|
||||
# script/lint: run the linter. Linting is a phase of the Dockerfile and
|
||||
# this builds that phase alone; the linter is never installed or run on
|
||||
# a developer host, where a shared result cache and a host-global lock
|
||||
# make its answer untrustworthy.
|
||||
# script/lint: run the linter. Inside a container, run it directly;
|
||||
# on a host, build Dockerfile.lint so it runs in one anyway. The linter
|
||||
# is never run on a developer host, where a shared result cache, a
|
||||
# host-global lock and a stale toolchain make its answer untrustworthy.
|
||||
#
|
||||
# The phase is not the last stage in the file, so it is built only when
|
||||
# --target names it. --no-cache because a cached lint layer is a lint
|
||||
# that did not run. The tag makes each build replace the previous image
|
||||
# instead of leaving a dangling one behind.
|
||||
# LINT_IN_CONTAINER is set by this repo's Dockerfiles and is the ONLY
|
||||
# accepted signal. Do not add a /.dockerenv fallback: it is absent
|
||||
# inside BuildKit RUN steps and present on hosts that are themselves
|
||||
# containers, so it both misses and false-positives — and a false
|
||||
# positive silently restores host linting.
|
||||
set -eu
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
docker build --no-cache \
|
||||
--target lint \
|
||||
-t "$("$SCRIPT_DIR/projectname")-lint" .
|
||||
|
||||
if [ "${LINT_IN_CONTAINER:-}" = "1" ]; then
|
||||
exec yarn run prettier --check '**/*.md' \
|
||||
--tab-width 4 --prose-wrap always
|
||||
fi
|
||||
|
||||
# Own line, and `$$` because busybox `date` drops %N silently.
|
||||
# Without a fresh nonce the lint layer is cached and this exits 0
|
||||
# having linted nothing.
|
||||
epoch="$(date +%s%N)$$"
|
||||
docker build \
|
||||
--build-arg CHECK_EPOCH="$epoch" \
|
||||
-f Dockerfile.lint \
|
||||
.
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
+3
-10
@@ -1,19 +1,12 @@
|
||||
#!/bin/sh
|
||||
# script/test: run the test suite. Testing is a phase of the Dockerfile
|
||||
# and this builds that phase alone, on the same terms as script/lint:
|
||||
# --target because a phase that is not the last stage is built only when
|
||||
# named, --no-cache because a cached test layer is a test that did not
|
||||
# run, and a tag so each build replaces the previous image.
|
||||
# script/test: run the test suite.
|
||||
set -eu
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
docker build --no-cache \
|
||||
--target test \
|
||||
-t "$("$SCRIPT_DIR/projectname")-test" .
|
||||
echo "No tests defined."
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
Reference in New Issue
Block a user