Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dcf75f6c72 | ||
|
|
12e8db8b0e | ||
|
|
0620416869 | ||
|
|
3a218497b8 | ||
|
|
fd78aeb003 | ||
|
|
d173e69f85 | ||
|
|
51c394552e |
+64
-30
@@ -1,42 +1,75 @@
|
|||||||
# .dockerignore does NOT use .gitignore semantics. Docker matches with
|
# Docker matches this file with moby/patternmatcher: Go filepath.Match
|
||||||
# moby/patternmatcher: filepath.Match plus `**`, so `*` does not cross
|
# semantics plus a `**` extension, compiled to a regexp. Plain
|
||||||
# `/` and an unprefixed pattern is anchored at the context root. Every
|
# filepath.Match has no `**` at all. What follows from that: `*` does not
|
||||||
# depth-independent pattern therefore needs `**/`, or `config/.env` and
|
# cross `/`, and a pattern without a leading `**/` is anchored at the
|
||||||
# `certs/server.key` still ship while this file reads as solved. Only
|
# build-context root. Every depth-independent pattern therefore needs the
|
||||||
# genuinely root-anchored entries go unprefixed. Never transplant these
|
# `**/` prefix — without it `config/.env` and `certs/server.key` still
|
||||||
# into .gitignore, where `**/` is wrong.
|
# ship while the file reads as solved.
|
||||||
#
|
#
|
||||||
# Matching is case-sensitive, so secrets use character ranges rather
|
# Root-anchored entries are for paths that occur exactly once, at the
|
||||||
# than an ALL-CAPS twin, which would still miss `Server.Key`.
|
# context root. A host-built binary is the usual case, and it must be
|
||||||
|
# written anchored: `/myapp`, never `**/myapp`. The prefixed form also
|
||||||
|
# matches `cmd/myapp/`, which deletes the package directory from the
|
||||||
|
# context. In-repo agent scratch is the other case, for the same reason
|
||||||
|
# — with the caveat recorded at that entry: anchoring is exact only
|
||||||
|
# where agents run at the repo root, and a repo where they do not must
|
||||||
|
# add its own entries.
|
||||||
#
|
#
|
||||||
# Extend with this repo's own host-built artifacts, written anchored:
|
# Matching is case-sensitive, so `**/*.key` does not match
|
||||||
# `/myapp`, never `**/myapp`, which also matches `cmd/myapp/` and
|
# `certs/SERVER.KEY`, which is reachable on the case-insensitive
|
||||||
# deletes the package directory from the context.
|
# filesystems most laptops use. Adding an ALL-CAPS twin per pattern is
|
||||||
|
# not the fix: it still misses `Server.Key` while reading as though case
|
||||||
|
# were handled. Character ranges cover every spelling in one line, so
|
||||||
|
# every secret name below is written that way — including the
|
||||||
|
# extensionless SSH keys and `.envrc`, because on those same
|
||||||
|
# case-insensitive filesystems direnv reads `.ENVRC` and ssh reads
|
||||||
|
# `ID_RSA`.
|
||||||
|
#
|
||||||
|
# `**/*.[eE][nN][vV]` also excludes a committed env template such as
|
||||||
|
# `example.env`. If the build genuinely needs one, re-include it with a
|
||||||
|
# negation after the pattern: `!docs/example.env`.
|
||||||
|
#
|
||||||
|
# Extend this file with the repo's own host-built artifacts (compiled
|
||||||
|
# binaries, test binaries, coverage output); those are per-repo and
|
||||||
|
# belong here because a host build otherwise drops them into the
|
||||||
|
# context.
|
||||||
|
|
||||||
# .git is sent without its config. Without a VERSION build argument the
|
# Repository metadata: exactly one, at the context root. Excluding it
|
||||||
# stage that compiles runs `git describe --tags --always` on .git, which
|
# means `git describe` cannot run in any build stage, and it fails
|
||||||
# does not need .git/config; that file can hold a credential, such as a
|
# quietly there rather than erroring, so a version embedded that way
|
||||||
# password in a remote URL or the token the CI checkout step stores there.
|
# comes out empty. Compute the version on the host and pass it in with
|
||||||
# Each submodule keeps a config with the same exposure in its git directory
|
# `--build-arg VERSION=...`; see the version rule in REPO_POLICIES.md.
|
||||||
# under .git/modules/, nested again for a submodule's own submodules.
|
.git
|
||||||
.git/config
|
|
||||||
.git/modules/**/config
|
|
||||||
|
|
||||||
# Agent scratch: one full checkout of the repo per in-flight agent.
|
# In-repo agent scratch: a directory holding a full additional checkout
|
||||||
# Anchored because it occurs once where agents run at the repo root.
|
# of the repo for each in-flight agent. Anchored because it occurs
|
||||||
# KNOWN GAP: a repo running agents in subdirectories still ships
|
# exactly once *where agents run at the repo root*, which is the
|
||||||
# `services/api/.claude/` and must add its own anchored entry.
|
# convention this file assumes; the `**/` form would also match any
|
||||||
|
# nested directory of that name and delete it from the build.
|
||||||
|
#
|
||||||
|
# KNOWN GAP, and it is not hypothetical: the directory is created in the
|
||||||
|
# agent's working directory. If agents in this repo run in
|
||||||
|
# subdirectories — a monorepo with a per-service agent, say — then
|
||||||
|
# `services/api/.claude/` is NOT excluded by the line below and still
|
||||||
|
# reaches the build context and the image, which is the exposure this
|
||||||
|
# entry exists to close. A repo in that shape adds its own anchored
|
||||||
|
# entries (`/services/api/.claude`), or `**/.claude` after confirming no
|
||||||
|
# legitimately named nested directory would be caught.
|
||||||
|
#
|
||||||
|
# Not case-folded, unlike the secret patterns below: tooling creates
|
||||||
|
# this directory in exactly one spelling, so a folded pattern would add
|
||||||
|
# no coverage.
|
||||||
.claude
|
.claude
|
||||||
|
|
||||||
# Environment files. `*.env` covers bare `.env` and the `prod.env`
|
# Environment files. `*.env` covers both the bare `.env` name (`*` matches
|
||||||
# convention. Re-include a committed template with a negation if the
|
# the empty string) and the `prod.env` convention.
|
||||||
# build needs one: `!docs/example.env`.
|
|
||||||
**/*.[eE][nN][vV]
|
**/*.[eE][nN][vV]
|
||||||
**/.[eE][nN][vV].*
|
**/.[eE][nN][vV].*
|
||||||
**/.[eE][nN][vV][rR][cC]
|
**/.[eE][nN][vV][rR][cC]
|
||||||
|
|
||||||
# Private keys and the bundles carrying them. Public certificates
|
# Private keys and the bundles that carry them. Public certificates
|
||||||
# (*.crt, *.cer) are deliberately absent: they are legitimate inputs.
|
# (*.crt, *.cer) are deliberately absent: they are not secrets and are
|
||||||
|
# sometimes a legitimate build input.
|
||||||
**/*.[pP][eE][mM]
|
**/*.[pP][eE][mM]
|
||||||
**/*.[kK][eE][yY]
|
**/*.[kK][eE][yY]
|
||||||
**/*.[pP]12
|
**/*.[pP]12
|
||||||
@@ -53,7 +86,8 @@
|
|||||||
**/.DS_Store
|
**/.DS_Store
|
||||||
**/Thumbs.db
|
**/Thumbs.db
|
||||||
|
|
||||||
# Editor state: never a build input, and it churns COPY.
|
# Editor state. Never a build input, and it churns under a developer's
|
||||||
|
# hands, so it invalidates COPY for reasons unrelated to the source.
|
||||||
**/*.swp
|
**/*.swp
|
||||||
**/*.swo
|
**/*.swo
|
||||||
**/*~
|
**/*~
|
||||||
|
|||||||
+5
-23
@@ -20,26 +20,8 @@ Thumbs.db
|
|||||||
# Node
|
# Node
|
||||||
node_modules/
|
node_modules/
|
||||||
|
|
||||||
# Secrets. Unanchored like every entry above, so each matches at every
|
# Environment / secrets
|
||||||
# depth. Matching is case-sensitive on Linux, so names use character
|
.env
|
||||||
# ranges rather than a lowercase form that misses `Server.Key`.
|
.env.*
|
||||||
|
*.pem
|
||||||
# Environment files. `*.env` covers bare `.env` and the `prod.env`
|
*.key
|
||||||
# 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][dD]25519
|
|
||||||
|
|||||||
+2
-67
@@ -10,21 +10,14 @@ run:
|
|||||||
|
|
||||||
linters:
|
linters:
|
||||||
default: all
|
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:
|
disable:
|
||||||
# Genuinely incompatible with project patterns
|
# Genuinely incompatible with project patterns
|
||||||
- exhaustruct # Requires all struct fields
|
- 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
|
- godot # Requires comments to end with periods
|
||||||
|
- wsl # Deprecated, replaced by wsl_v5
|
||||||
- wrapcheck # Too verbose for internal packages
|
- wrapcheck # Too verbose for internal packages
|
||||||
- varnamelen # Short names like db, id are idiomatic Go
|
- 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:
|
settings:
|
||||||
lll:
|
lll:
|
||||||
line-length: 88
|
line-length: 88
|
||||||
@@ -35,64 +28,6 @@ linters:
|
|||||||
max-complexity: 15
|
max-complexity: 15
|
||||||
dupl:
|
dupl:
|
||||||
threshold: 100
|
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:
|
issues:
|
||||||
max-issues-per-linter: 0
|
max-issues-per-linter: 0
|
||||||
|
|||||||
+26
-48
@@ -1,59 +1,37 @@
|
|||||||
# 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
|
# node 22-alpine, 2026-02-22
|
||||||
FROM node@sha256:e4bf2a82ad0a4037d28035ae71529873c069b13eb0455466ae0bc13363826e34
|
FROM node@sha256:e4bf2a82ad0a4037d28035ae71529873c069b13eb0455466ae0bc13363826e34
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY --from=lint /app/package.json /dev/null
|
# script/bootstrap installs all prerequisites (make via apk here; node
|
||||||
COPY --from=test /app/package.json /dev/null
|
# and yarn are already in the base image, so those steps are skipped).
|
||||||
|
# Dependency manifests are copied first so the bootstrap layer is
|
||||||
# script/bootstrap installs all prerequisites. Manifests are copied
|
# cached until they change.
|
||||||
# first so that layer stays cached until dependencies change.
|
|
||||||
COPY script/ script/
|
COPY script/ script/
|
||||||
COPY package.json yarn.lock ./
|
COPY package.json yarn.lock ./
|
||||||
RUN script/bootstrap
|
RUN script/bootstrap
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Nothing here is compiled and a LABEL cannot run git, so the version is
|
# CHECK_EPOCH is a per-invocation nonce supplied by script/cibuild and
|
||||||
# the VERSION build argument that script/docker and script/cibuild pass;
|
# script/docker. Without it an unchanged tree serves this layer from
|
||||||
# a plain `docker build .` leaves it empty.
|
# cache and the build reports a green it never ran. ARG is stage-scoped,
|
||||||
ARG VERSION
|
# so it must be redeclared in every stage that runs checks. The guard
|
||||||
LABEL org.opencontainers.image.version="${VERSION}"
|
# makes a bare `docker build .` fail loudly instead of silently reusing
|
||||||
|
# the empty (and therefore stable) cache key. Expand the value into the
|
||||||
|
# command so the cache miss does not depend on BuildKit's handling of an
|
||||||
|
# unreferenced ARG. Both the guard and the check RUN reference the value,
|
||||||
|
# so both are value-keyed: there are two independent invalidation points
|
||||||
|
# here, not one. Keep both.
|
||||||
|
ARG CHECK_EPOCH
|
||||||
|
RUN [ -n "$CHECK_EPOCH" ] || exit 1
|
||||||
|
|
||||||
|
# The individual non-lint checks, NOT `make check`. Lint is deliberately
|
||||||
|
# absent here: `script/lint` is itself a `docker build` (of
|
||||||
|
# Dockerfile.lint), so running `make check` in this image would attempt
|
||||||
|
# a docker build inside a build step, where there is no daemon. Putting
|
||||||
|
# `make check` back reintroduces exactly that recursion. Lint is not
|
||||||
|
# skipped — script/cibuild runs script/lint first, in its own container,
|
||||||
|
# before this build starts.
|
||||||
|
RUN echo "check epoch: ${CHECK_EPOCH}" && script/test
|
||||||
|
RUN script/fmt-check
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
# Lint-only image. `script/lint` builds this file and nothing else: the
|
||||||
|
# linter runs as a build step, so a successful build IS a clean lint.
|
||||||
|
# Building rather than bind-mounting is what makes it work where the
|
||||||
|
# docker daemon is remote and bind mounts are impossible.
|
||||||
|
#
|
||||||
|
# The linter is invoked directly below rather than through `make lint`.
|
||||||
|
# That is not a style choice: `script/lint` IS this build, so calling it
|
||||||
|
# from inside would recurse into a docker build with no daemon.
|
||||||
|
#
|
||||||
|
# This repo's linter is prettier over markdown. A Go repo's version of
|
||||||
|
# this file differs only in the base image and the two lint commands;
|
||||||
|
# see the containerised-lint rule in prompts/REPO_POLICIES.md.
|
||||||
|
#
|
||||||
|
# node 22-alpine, 2026-02-22
|
||||||
|
FROM node@sha256:e4bf2a82ad0a4037d28035ae71529873c069b13eb0455466ae0bc13363826e34
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Dependency layer first, and deliberately above the ARG below, so it
|
||||||
|
# stays cached and only the lint steps re-run on every invocation.
|
||||||
|
# Without that ordering the cache-bust would reinstall dependencies on
|
||||||
|
# every lint and make linting network-dependent.
|
||||||
|
COPY script/ script/
|
||||||
|
COPY package.json yarn.lock ./
|
||||||
|
RUN script/bootstrap
|
||||||
|
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# CHECK_EPOCH is a per-invocation nonce supplied by script/lint. Without
|
||||||
|
# it an unchanged tree serves the lint layer from cache and the build
|
||||||
|
# reports a lint it never ran — a green that proves nothing, which is
|
||||||
|
# the whole failure mode this file exists to avoid reintroducing. The
|
||||||
|
# guard makes a bare `docker build -f Dockerfile.lint .` fail loudly
|
||||||
|
# instead of silently reusing the empty (and therefore stable) cache
|
||||||
|
# key. The value is expanded into the lint command as well, so the cache
|
||||||
|
# miss does not depend on BuildKit's handling of an unreferenced ARG and
|
||||||
|
# the epoch is visible in the build log. Keep both references.
|
||||||
|
ARG CHECK_EPOCH
|
||||||
|
RUN [ -n "$CHECK_EPOCH" ] || exit 1
|
||||||
|
RUN echo "lint epoch: ${CHECK_EPOCH}" && \
|
||||||
|
yarn run prettier --check '**/*.md' --tab-width 4 --prose-wrap always
|
||||||
@@ -116,23 +116,26 @@ alpine. We provide:
|
|||||||
`script/bootstrap`, then `script/install-precommit`
|
`script/bootstrap`, then `script/install-precommit`
|
||||||
- `script/projectname` — output the project name (our own extension); used by
|
- `script/projectname` — output the project name (our own extension); used by
|
||||||
`script/docker` for the image tag
|
`script/docker` for the image tag
|
||||||
- `script/test` — `docker build --no-cache --target test -t prompts-test .`,
|
- `script/test` — run the test suite (no tests defined here)
|
||||||
building the `test` phase of the `Dockerfile` (no tests defined here)
|
- `script/lint` — lint the markdown files, by building `Dockerfile.lint`. The
|
||||||
- `script/lint` — `docker build --no-cache --target lint -t prompts-lint .`,
|
linter runs in a container, always: it is never installed on the host and
|
||||||
building the `lint` phase, which runs prettier over the markdown files
|
never invoked there. Linting happens as a build step, so a successful build is
|
||||||
- `script/fmt` — format all markdown files with prettier (writes; native, not in
|
a clean lint, and the same per-invocation `CHECK_EPOCH` nonce used elsewhere
|
||||||
a container)
|
is what stops Docker serving that lint from cache on an unchanged tree
|
||||||
- `script/fmt-check` — check formatting (read-only; native)
|
- `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
|
- `script/check` — run all checks: `test`, `lint`, `fmt-check` (our own
|
||||||
extension); builds no image of its own
|
extension). Needs a docker daemon, since `script/lint` is a container build
|
||||||
- `script/docker` —
|
- `script/docker` — build the Docker image, tagged via `script/projectname`
|
||||||
`docker build --no-cache --build-arg VERSION="$version" -t prompts .`, the tag
|
(byte-identical across repos); passes the same `CHECK_EPOCH` nonce as
|
||||||
coming from `script/projectname` (byte-identical across repos)
|
`script/cibuild`
|
||||||
- `script/cibuild` — cd to the repo root, run `script/bootstrap`, run
|
- `script/cibuild` — cd to the repo root, run `script/lint` first, then assign
|
||||||
`script/check`, compute `version` from `git describe`, then
|
`epoch="$(date +%s%N)$$"` and
|
||||||
`docker build --no-cache --build-arg VERSION="$version" -t prompts .` (what CI
|
`docker build --build-arg CHECK_EPOCH="$epoch" .` (what CI runs). Two
|
||||||
runs; it bootstraps because CI checks out and runs this alone while
|
container builds: the lint image, then the main image, which runs
|
||||||
`script/fmt-check` is native)
|
`script/test` and `script/fmt-check` but deliberately not `make check` — that
|
||||||
|
would nest a docker build inside a build step. A bare `docker build .` fails
|
||||||
|
closed on purpose
|
||||||
- `script/precommit` — run by the git pre-commit hook (our own extension); calls
|
- `script/precommit` — run by the git pre-commit hook (our own extension); calls
|
||||||
`script/check`
|
`script/check`
|
||||||
- `script/install-precommit` — installs the git pre-commit hook (our own
|
- `script/install-precommit` — installs the git pre-commit hook (our own
|
||||||
|
|||||||
@@ -21,87 +21,140 @@ fmt-check, and commit.
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
- 2026-10-04: Rewrote the note under the canonical Go `make test` example in
|
- 2026-08-10: Closed three gaps the containerised-lint rule left between the
|
||||||
`REPO_POLICIES.md` (issue 77), which still named the cache-busting build
|
canonical text and the first repos to implement it. `.dockerignore` excluding
|
||||||
argument that `--no-cache` replaced. It now says where Go's test result cache
|
the agent scratch directory is now stated as a correctness precondition of
|
||||||
can replay a pass: on a developer's machine, where the Makefile target runs,
|
that rule rather than a context-size measure: the lint image lints whatever
|
||||||
and not in the `test` phase of the `Dockerfile`, whose base image and earlier
|
`COPY . .` copies, and toolchains discover files by walking the tree instead
|
||||||
steps hold no result for the repo's tests.
|
of reading `.gitignore`, so a nested worktree puts the foreign-tree false reds
|
||||||
- 2026-10-04: The canonical `.dockerignore` now also keeps out each submodule's
|
back inside the container — `sneak/quak` measured the same discovery mechanism
|
||||||
`config` (issue 75). A submodule's git directory lives under `.git/modules/`,
|
taking a test count from 210 to 1050. The cache-bust arg is fixed at
|
||||||
nested again for its own submodules, and its `config` can hold a credential
|
`CHECK_EPOCH` in `Dockerfile.lint` as well, because a per-file name is
|
||||||
just like `.git/config`. The pattern `.git/modules/**/config` covers every
|
invisible to the grep that proves every build is busted, making a renamed
|
||||||
depth and leaves the top-level `.git` that `git describe` reads untouched.
|
guard indistinguishable from a missing one. And the formatting check is now
|
||||||
`REPO_POLICIES.md` and both checklists say so in the same words.
|
required to run in exactly one of the two images, with either placement
|
||||||
- 2026-10-03: Fixed two defects in the canonical Go `Dockerfile` example (issue
|
allowed: splitting lint out of the `Dockerfile` is precisely when `fmt-check`
|
||||||
73). The test phase now uses the Debian Go image, since `-race` needs cgo and
|
gets dropped from both, and running the formatter beside the linters is the
|
||||||
the alpine image has no C compiler, so the phase failed before running a test.
|
better shape where it is the same pinned dependency.
|
||||||
The stage that compiles runs `git config --system --add safe.directory /src`,
|
- 2026-08-10: Moved every lint run into a container, on the owner's ruling, and
|
||||||
because a context sent as a tar stream keeps the sender's file owners and git
|
made this repo do it rather than merely document it. `script/lint` is now
|
||||||
refuses that checkout, leaving the version empty. Both checklists state that
|
`docker build -f Dockerfile.lint .` and nothing else; the linter is never
|
||||||
step in the same words.
|
installed on the host and never invoked there, so a run cannot inherit another
|
||||||
- 2026-10-03: Moved the canonical golangci-lint to v2.14.0, built with go1.27,
|
checkout's content-keyed result cache, the host-global
|
||||||
because v2.12.2 refuses to lint a module whose `go` directive is 1.27 (issue
|
`$TMPDIR/golangci-lint.lock`, or a host toolchain that differs from the pinned
|
||||||
65). Releases from v2.13.0 deprecate `exhaustruct` in favour of
|
one — the three mechanisms behind a confirmed false green, a string of
|
||||||
`exhaustruct_v5`, which `default: all` switches on, so the canonical
|
findings reported against other agents' checkouts, and a container that saw
|
||||||
`.golangci.yml` now disables `exhaustruct_v5` beside `exhaustruct`. v2.12.2
|
thirteen findings the host missed. Linting runs as a build step, so a
|
||||||
rejects that file, so `REPO_POLICIES.md` and both repo checklists now say a
|
successful build is a clean lint, which also works where the docker daemon is
|
||||||
repo sets the lint phase digest and re-vendors `.golangci.yml` in one commit.
|
remote and bind mounts are impossible. The recursion this creates is resolved
|
||||||
- 2026-10-03: Brought the canonical `.gitignore` level with `.dockerignore` on
|
by direction rather than by detection: the main `Dockerfile` runs the
|
||||||
secrets (issue 38): it now also ignores `prod.env`-style `*.env` files,
|
individual non-lint checks instead of `make check`, and `script/cibuild` runs
|
||||||
`.envrc`, `*.p12`, `*.pfx` and the extensionless SSH private keys, written to
|
`script/lint` first, so no build ever nests a build. `Dockerfile.lint` carries
|
||||||
`.gitignore`'s own rules (no `**/` prefix) and case-folded with character
|
the same `CHECK_EPOCH` guard as the main image, with the `ARG` below the
|
||||||
ranges. `example.env` and `sample.env` stay trackable through negations.
|
dependency layer so only the lint steps re-run — blanket `--no-cache` was
|
||||||
- 2026-10-02: The image version now comes from git inside the build (issues 69
|
rejected because it makes every lint reinstall its dependencies over the
|
||||||
and 71), superseding the 2026-09-08 entry that excluded `.git`. The canonical
|
network. Two canonical forms were superseded rather than left standing beside
|
||||||
`.dockerignore` sends `.git` but keeps out `.git/config`, which can hold a
|
the new one, since consuming repos read this document literally: the
|
||||||
credential. The Dockerfile example in `REPO_POLICIES.md` installs `git`, takes
|
`script/bootstrap` golangci-lint install (nothing runs a host linter now, so
|
||||||
the `VERSION` build argument when one is given and otherwise
|
it can only reintroduce skew; the version-enforcement principle stays
|
||||||
`git describe --tags --always`, and fails when `.git` exists but the version
|
documented for other pinned host tools) and the per-checkout
|
||||||
is empty, `dev` or `unknown`; a plain `docker build .` with no build arguments
|
cache/lock/`.lint-cache` wrapper (its whole subject was making a host run
|
||||||
must succeed. This repo's `script/docker` and `script/cibuild` still pass
|
trustworthy). The Go multistage lint stage goes with them: it ran `make lint`,
|
||||||
`--build-arg VERSION`, since its own `Dockerfile` compiles nothing.
|
which is now a docker build. `golangci-lint config verify` was kept on
|
||||||
- 2026-09-08: Moved linting and testing into Docker as phases of the main
|
measurement, not preference — a bogus config key passes `golangci-lint run`
|
||||||
`Dockerfile`, per the owner ruling on issue 40. `script/lint` and
|
with `0 issues` and fails `config verify`, and every case reproduced
|
||||||
`script/test` build one phase each by name with `--no-cache` — the same answer
|
byte-identically under `docker run --network none`, so the schema is embedded
|
||||||
issue 26 got, so no separate cache-busting mechanism survives — and the final
|
in the pinned binary and the line costs no network. Verified with two
|
||||||
stage copies a harmless file from both, so the image cannot be built unless
|
consecutive runs on an unchanged tree both executing the linter, a planted
|
||||||
they pass. This also closes issue 30: a container has its own result cache and
|
violation caught and reverted, the bare-build guard firing, and the main image
|
||||||
its own lock, so a lint verdict can no longer belong to another checkout. No
|
building without attempting a nested build.
|
||||||
separate lint Dockerfile, and no `golangci-lint config verify` step.
|
- 2026-08-09: Made a golangci-lint result belong to the tree that asked for it.
|
||||||
`script/check` runs the gates and nothing else, and `script/cibuild`
|
REPO_POLICIES.md now carries the canonical Go `script/lint`, which gives the
|
||||||
bootstraps first, since it is all CI runs and `script/fmt-check` is native.
|
linter per-checkout `GOLANGCI_LINT_CACHE` and per-checkout `TMPDIR`. The two
|
||||||
- 2026-09-08: Kept in-repo agent scratch out of the Docker build context and out
|
are separate defects and the second is the one that gets dropped: the result
|
||||||
of version control: `.claude/` is one full checkout of the repo per in-flight
|
cache is keyed on file content rather than location, so checkouts holding
|
||||||
agent, and under `COPY . .` all of it was reaching the image. Also closed the
|
identical files serve each other's findings under the other's path, while the
|
||||||
consequence of excluding `.git` — `git describe` yields an empty version
|
concurrency lock is `$TMPDIR/golangci-lint.lock` — host-global, independent of
|
||||||
inside a build stage without failing, so `script/docker` and `script/cibuild`
|
the cache, and unaffected by isolating it. Moving workers from worktrees to
|
||||||
now compute the version on the host and pass `--build-arg VERSION`.
|
their own clones does not help either half; it only removes the foreign-path
|
||||||
- 2026-09-08: Closed the secret exposure in the canonical `.dockerignore`: a
|
artefact that made the defect visible. The lock error is retried rather than
|
||||||
local `.env`, `*.pem` or `*.key` was reaching the build context under
|
surfaced, because it is not a result: it exits non-zero exactly as findings
|
||||||
`COPY . .`, invisible to every git-based check. The patterns are now written
|
do, and reporting it as findings sends a correct branch back for rework.
|
||||||
to `.dockerignore`'s own semantics — `**/`-prefixed so they hold at every
|
Detection is on the stderr stream and never on exit status, so a finding
|
||||||
depth, case-folded with character ranges — and `REPO_POLICIES.md` requires
|
quoting the lock message in source cannot be retried away, and exhaustion
|
||||||
verifying by enumerating the image rather than by reading the file.
|
exits 75 with a VOID message rather than passing or failing quietly.
|
||||||
- 2026-09-08: Made a pinned tool in `script/bootstrap` actually reach the host.
|
`--allow-serial-runners` (which keeps the guard and queues) covers the
|
||||||
`REPO_POLICIES.md` now requires comparing the installed version against the
|
same-checkout overlap that `TMPDIR` scoping cannot; `--allow-parallel-runners`
|
||||||
pin rather than testing `PATH` presence, and re-resolving the binary through
|
is rejected outright. The stdout and stderr capture files are per invocation
|
||||||
`PATH` after installing, so a version bump cannot be a silent no-op and a
|
rather than per checkout, because serialising the linter does not serialise
|
||||||
shadowed install cannot report success.
|
the shell's redirections: two runs in one checkout — the overlap the flag
|
||||||
- 2026-09-08: Closed the false green in the canonical CI gate: `script/cibuild`
|
exists to support — would otherwise truncate and read each other's output,
|
||||||
and `script/docker` now build with `--no-cache`, so the Dockerfile's check
|
which is the same defect one layer above where it was fixed. Both checklists
|
||||||
layers cannot be served from cache on an unchanged tree, and the text claiming
|
gained the corresponding items, since a half-fix that sets only the cache
|
||||||
a bare `docker build .` proves the checks ran is corrected in
|
reads as complete. `GOCACHE` was measured and does not need isolating.
|
||||||
`REPO_POLICIES.md`, both checklists and the Go styleguide.
|
Verified with the snippet extracted from the committed document and executed
|
||||||
- 2026-09-03: Added `-count=1` to both `go test` invocations in the canonical Go
|
as a consuming repo would adopt it, against paired controls: contamination
|
||||||
`make test` example in `REPO_POLICIES.md`, so the target cannot report a
|
reproduced on the pre-fix form and absent on the adopted one, retry engaged,
|
||||||
cached pass it did not earn, and documented that Go's test-result cache is a
|
exhaustion loud, a genuine finding still reported, and a held host lock
|
||||||
second, independent cache stacked below the Docker layer cache.
|
failing the pre-fix script while leaving the adopted one untouched.
|
||||||
- 2026-08-31: Migrated the canonical `.golangci.yml` from the deprecated
|
- 2026-08-09: Kept in-repo agent scratch out of the Docker build context and out
|
||||||
`gomodguard` to `gomodguard_v2`: the old linter is disabled by name (which is
|
of version control. `.claude/` holds one worktree — an entire additional
|
||||||
what silences the deprecation warning), the successor is named explicitly in
|
checkout of the repo — per in-flight agent, and under `COPY . .` all of it was
|
||||||
`linters.enable`, and it carries a `blocked` module list drawn only from
|
reaching the image: another session's unreviewed, sometimes uncommitted work,
|
||||||
decisions already recorded in the Go package defaults.
|
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
|
- 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
|
config already deployed byte-identical across the org's Go repos (settings
|
||||||
under `linters.settings` so thresholds like lll/funlen/cyclop/dupl actually
|
under `linters.settings` so thresholds like lll/funlen/cyclop/dupl actually
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
title: Code Styleguide — Go
|
title: Code Styleguide — Go
|
||||||
last_modified: 2026-10-02
|
last_modified: 2026-08-10
|
||||||
---
|
---
|
||||||
|
|
||||||
1. Try to hard wrap long lines at 77 characters or less.
|
1. Try to hard wrap long lines at 77 characters or less.
|
||||||
@@ -24,8 +24,7 @@ last_modified: 2026-10-02
|
|||||||
1. Embed the git commit hash into the binary and include it in startup logs and
|
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
|
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
|
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
|
will make the build nondeterministic.
|
||||||
build time; a program that reports it reads `runtime.GOARCH` at run time.
|
|
||||||
|
|
||||||
Example relevant Makefile sections:
|
Example relevant Makefile sections:
|
||||||
|
|
||||||
@@ -36,25 +35,38 @@ last_modified: 2026-10-02
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"runtime"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var Version string
|
var (
|
||||||
|
Version string
|
||||||
|
Buildarch string
|
||||||
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
fmt.Printf("Version: %s\n", Version)
|
fmt.Printf("Version: %s\n", Version)
|
||||||
fmt.Printf("Arch: %s\n", runtime.GOARCH)
|
fmt.Printf("Buildarch: %s\n", Buildarch)
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
```make
|
```make
|
||||||
# ?= rather than := so that a `VERSION` build argument takes precedence:
|
# ?= rather than := because this `$(shell git describe ...)` is only
|
||||||
# where a build stage invokes make, `ARG VERSION` puts it in the
|
# correct on the host. `.dockerignore` excludes `.git`, so evaluated
|
||||||
# environment and `?=` defers to it. Otherwise `git describe` runs, in a
|
# inside a build stage it expands to the empty string without failing
|
||||||
# build stage on the `.git` the build context carries.
|
# and the binary reports no version at all. The version is computed on
|
||||||
VERSION ?= $(shell git describe --tags --always)
|
# 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.Version=$(VERSION)
|
||||||
|
GOLDFLAGS += -X main.Buildarch=$(BUILDARCH)
|
||||||
|
|
||||||
# osx can't statically link apparently?!
|
# osx can't statically link apparently?!
|
||||||
ifeq ($(UNAME_S),Darwin)
|
ifeq ($(UNAME_S),Darwin)
|
||||||
@@ -99,19 +111,26 @@ last_modified: 2026-10-02
|
|||||||
|
|
||||||
1. For anything beyond a simple script or tool, or anything that is going to
|
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
|
run in any sort of "production" anywhere, make sure it passes
|
||||||
`golangci-lint`. Run it with `make lint`, never by invoking the binary: the
|
`golangci-lint`. Run it with `make lint`, which builds `Dockerfile.lint`:
|
||||||
linter runs as a phase of the `Dockerfile` and is not installed on the host
|
the linter runs in a container, always, and is never installed on the host.
|
||||||
by any repo. Invoked directly on a shared host it reads a result cache keyed
|
A `golangci-lint` invoked directly on a shared host reads a result cache
|
||||||
on file content rather than location, and a host-global lock, so its answer
|
keyed on file content rather than location and a host-global lock, so its
|
||||||
may belong to another checkout entirely.
|
answer may belong to another checkout entirely.
|
||||||
|
|
||||||
1. Write a `Dockerfile` for every repo, even if it only runs the tests and
|
1. Write a `Dockerfile` for every repo, even if it only runs the tests. It runs
|
||||||
linting. It carries the lint and test phases, and the final stage depends on
|
the non-lint checks; linting lives in `Dockerfile.lint` and is run by
|
||||||
both, so a build makes sure the code is in an able-to-be-compiled state,
|
`script/cibuild` before the main build, because `script/lint` is itself a
|
||||||
linted, and its tests run. Go through `script/cibuild` or `script/docker`
|
`docker build` and cannot run inside one. So `script/cibuild` is what
|
||||||
rather than a bare `docker build .`: they pass `--no-cache`, without which
|
guarantees the code is in an able-to-be-compiled state, linted, and tested —
|
||||||
an unchanged tree serves the gate layers from cache and the build reports a
|
**a successful `docker build .` on its own does not, because it never
|
||||||
green it never ran.
|
lints.** That guarantee holds only because each build passes a
|
||||||
|
per-invocation `CHECK_EPOCH` build arg that busts its 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`, `script/docker` or `script/lint`. 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
|
1. Every repo must have a `Makefile`. See
|
||||||
[Repository Policies](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/REPO_POLICIES.md)
|
[Repository Policies](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/REPO_POLICIES.md)
|
||||||
@@ -132,15 +151,10 @@ last_modified: 2026-10-02
|
|||||||
|
|
||||||
1. Keep the `main()` function as small as possible.
|
1. Keep the `main()` function as small as possible.
|
||||||
|
|
||||||
1. Keep the `main` package as small as possible. Each `cmd/<name>/` directory
|
1. Keep the `main` package as small as possible. Move as much code as is
|
||||||
contains a single `main.go` whose body is one call into library code (for
|
feasible to a library package, even if it's an internal one. `main` is just
|
||||||
example `os.Exit(cli.Main())` calling `internal/cli`). All CLI logic — flag
|
an entrypoint to your code, not a place for implementations. Exception:
|
||||||
parsing, subcommand dispatch, argument handling, output formatting — lives
|
single-file scripts.
|
||||||
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. HTTP HandleFuncs should be returned from methods or functions that need to
|
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
|
handle HTTP requests. Don't use methods or your top level functions as
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
title: Existing Repo Checklist
|
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
|
Use this checklist when beginning work in a repo that may not yet conform to our
|
||||||
@@ -28,67 +28,80 @@ with your task.
|
|||||||
artifacts, secrets) — fetch from
|
artifacts, secrets) — fetch from
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitignore` if missing.
|
`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,
|
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
|
- [ ] `.editorconfig` exists — fetch from
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.editorconfig`
|
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.editorconfig`
|
||||||
- [ ] `Dockerfile` and `.dockerignore` exist; the Dockerfile carries a `lint`
|
- [ ] `Dockerfile` and `.dockerignore` exist (fetch `.dockerignore` from
|
||||||
phase and a `test` phase, and the final stage carries a `COPY --from=` of
|
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.dockerignore`);
|
||||||
a harmless file from each — fetch `.dockerignore` from
|
Dockerfile runs the **non-lint** checks as build steps (`script/test`,
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.dockerignore`
|
`script/fmt-check`), and every stage containing a check-running `RUN`
|
||||||
- [ ] Nothing has been appended after the final stage, and the gate phases are
|
declares `ARG CHECK_EPOCH` with the `RUN [ -n "$CHECK_EPOCH" ] || exit 1`
|
||||||
reachable from it. A stage nothing depends on is built only when
|
guard immediately below it — see the `CHECK_EPOCH` rule in
|
||||||
`--target` names it, so a lost `COPY --from=` edge leaves `docker build .`
|
`REPO_POLICIES.md`. Without them the check layer is served from cache on
|
||||||
passing while the gate never runs. Confirm by planting a violation, not by
|
an unchanged tree and the build reports a green it never ran.
|
||||||
reading the file.
|
- [ ] The `Dockerfile` no longer runs `make check`, and no longer has a `lint`
|
||||||
- [ ] The gate phases invoke their tools directly, never through `make lint` or
|
stage or a `COPY --from=lint ... /dev/null` ordering line. This is the
|
||||||
`script/test` — those are themselves a `docker build` and would recurse
|
item an existing repo most often fails: `script/lint` is now a
|
||||||
inside a build step
|
`docker build`, so both of those nest a docker build inside a build step.
|
||||||
- [ ] Every depth-independent pattern in `.dockerignore` carries a `**/` prefix,
|
Delete the stage; `script/cibuild` running `script/lint` first is what
|
||||||
only genuinely root-anchored entries such as `.claude` are unprefixed, and
|
replaces its fail-fast purpose.
|
||||||
`.gitignore`'s patterns have not been transplanted unmodified — the
|
- [ ] `Dockerfile.lint` exists and `script/lint` builds it — see the
|
||||||
transplanted form leaves `config/.env` and `certs/server.key` in the build
|
containerised-lint rule in `REPO_POLICIES.md` for the canonical file. Its
|
||||||
context while reading as solved
|
base image is pinned by sha256 with a version/date comment, it carries
|
||||||
|
`ARG CHECK_EPOCH` **after** the dependency layer with the guard below it,
|
||||||
|
and it invokes the linter directly rather than through `make lint`. The
|
||||||
|
arg is named `CHECK_EPOCH` in this file too — a repo that calls it
|
||||||
|
`LINT_EPOCH` here is missed by the grep that checks every build is
|
||||||
|
cache-busted.
|
||||||
|
- [ ] The formatting check runs in exactly one of the two images — either
|
||||||
|
`script/fmt-check` in the `Dockerfile` or the formatter beside the linters
|
||||||
|
in `Dockerfile.lint`, whichever puts it on the pinned toolchain. Neither
|
||||||
|
image running it is the failure to look for here, since moving lint out of
|
||||||
|
the `Dockerfile` is exactly when it gets dropped.
|
||||||
- [ ] `.dockerignore` excludes the repo's own host-built artifacts (compiled
|
- [ ] `.dockerignore` excludes the repo's own host-built artifacts (compiled
|
||||||
binaries, test binaries, coverage output), written root-anchored —
|
binaries, test binaries, coverage output), written root-anchored —
|
||||||
`/myapp`, never `**/myapp`. An existing repo is where such a binary is
|
`/myapp`, never `**/myapp`, which would also match `cmd/myapp/`. An
|
||||||
likeliest to already be sitting in the build context, invisible to git.
|
existing repo is where such a binary is likeliest to already be sitting in
|
||||||
- [ ] `.claude/` is in `.gitignore` (unanchored) and `.claude` in
|
the build context, invisible to git.
|
||||||
`.dockerignore` (anchored, no `**/` prefix). Agent worktrees are entire
|
- [ ] `.dockerignore` excludes `.claude`, root-anchored and with no `**/`
|
||||||
checkouts of the repo, so they inflate the context by a multiple of it and
|
prefix. Agent worktrees are entire checkouts of the repo, so they inflate
|
||||||
can copy another session's unreviewed work into an image layer. If agents
|
the context by a multiple of it and can copy another session's unreviewed
|
||||||
here run anywhere other than the repo root, the anchored entry misses
|
work into an image layer — and `Dockerfile.lint` then lints that checkout
|
||||||
`services/api/.claude/`: add anchored entries for those directories.
|
as though it were this one, because toolchains discover files by walking
|
||||||
- [ ] If the repo embeds a version in a binary: `.dockerignore` lets `.git` into
|
the tree and never read `.gitignore` (`sneak/quak`: 210 discovered tests
|
||||||
the build context. It keeps out `.git/config` and each submodule's
|
became 1050). Confirm by enumerating the image, not by reading the file —
|
||||||
`config` under `.git/modules/` at any depth (`.git/modules/**/config`),
|
`.gitignore` hides these from `git status` too.
|
||||||
which `git describe` does not need and which can hold a credential: a
|
- [ ] **Do agents in this repo run anywhere other than the repo root?** The
|
||||||
password in a remote URL, or the token the CI checkout step stores there.
|
scratch directory is created in the agent's working directory, so the
|
||||||
The stage that compiles has `git` (the Debian Go image has it; an alpine
|
canonical anchored entry misses `services/api/.claude/` in a monorepo with
|
||||||
one needs `apk add --no-cache git`) and takes the version from the
|
a per-service agent — it still reaches the build context and the image. An
|
||||||
`VERSION` build argument when one is given, otherwise from
|
existing repo is where such a layout already exists, so check it here
|
||||||
`git describe --tags --always`. That gives the tag on a tagged commit; on
|
rather than assuming the canonical entry covers you: add anchored entries
|
||||||
a later commit, the tag, the number of commits since it and the short
|
for the subdirectories that have one (`/services/api/.claude`), or
|
||||||
commit (`v1.2.3-4-gabc1234`); and the short commit when no tag is
|
`**/.claude` once you have confirmed no legitimately named nested
|
||||||
reachable. The stage that compiles also marks its working directory safe
|
directory would be caught.
|
||||||
for git (`git config --system --add safe.directory /src`): a context sent
|
- [ ] If the repo embeds a version in a binary, that version is computed on the
|
||||||
as a tar stream keeps the sender's file owners, and git refuses a checkout
|
host and passed with `--build-arg VERSION=...` by `script/docker` and
|
||||||
owned by another user, so the version would come out empty. `ARG VERSION`
|
`script/cibuild`. No stage calls `git describe`: `.dockerignore` excludes
|
||||||
has no default, and the build fails if the context carries `.git` and the
|
`.git`, so it yields an empty version without failing the build. A
|
||||||
version still comes out empty, `dev` or `unknown`. A plain
|
tag-derived version additionally needs `fetch-depth: 0` on the CI checkout
|
||||||
`docker build .` with no build arguments must succeed; a Dockerfile that
|
step, which clones shallow and fetches no tags by default.
|
||||||
refuses an empty build argument drops that refusal and keeps the argument.
|
- [ ] Every depth-independent pattern in `.dockerignore` carries a `**/` prefix;
|
||||||
`script/docker` and `script/cibuild` pass the version they compute on the
|
only genuinely root-anchored entries such as `.git` are unprefixed, and
|
||||||
host; it takes precedence. A tag-derived version additionally needs
|
`.gitignore`'s patterns have not been transplanted unmodified.
|
||||||
`fetch-depth: 0` on the CI checkout step, which clones shallow and fetches
|
`.dockerignore` anchors an unprefixed pattern at the context root, so the
|
||||||
no tags by default.
|
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
|
- [ ] Gitea Actions workflow in `.gitea/workflows/` runs `script/cibuild` on
|
||||||
push — reference
|
push — reference
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
||||||
- [ ] Language-specific config:
|
- [ ] Language-specific config:
|
||||||
- [ ] Go: `go.mod`, `go.sum`, `.golangci.yml` (fetch from
|
- [ ] Go: `go.mod`, `go.sum`, `.golangci.yml` (fetch from
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml` and,
|
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml`)
|
||||||
in the same commit, set the lint phase digest to the one named in the
|
|
||||||
`.golangci.yml` paragraph of `REPO_POLICIES.md`)
|
|
||||||
- [ ] JS: `package.json`, `yarn.lock`, `.prettierrc`, `.prettierignore`
|
- [ ] JS: `package.json`, `yarn.lock`, `.prettierrc`, `.prettierignore`
|
||||||
(fetch from
|
(fetch from
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.prettierrc` and
|
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.prettierrc` and
|
||||||
@@ -109,33 +122,26 @@ with your task.
|
|||||||
`script/install-precommit`, shimmed by `make hooks`) runs it
|
`script/install-precommit`, shimmed by `make hooks`) runs it
|
||||||
- [ ] README has an **Entrypoints** section documenting the `script/`
|
- [ ] README has an **Entrypoints** section documenting the `script/`
|
||||||
entrypoints and linking the standard
|
entrypoints and linking the standard
|
||||||
- [ ] `script/lint` and `script/test` build their phase by name
|
- [ ] `script/lint` is the canonical container build and nothing else. No host
|
||||||
(`docker build --no-cache --target <phase> -t <name>-<phase> .`), and no
|
linter invocation survives anywhere in the repo — grep for the linter's
|
||||||
host invocation anywhere in the repo can produce a lint verdict — grep for
|
own name in `script/`, the `Makefile` and CI config, not just in
|
||||||
the linter's own name across `script/`, the `Makefile` and CI config, not
|
`script/lint`. An existing repo is where a second path to the linter is
|
||||||
just `script/lint`. A second path is likeliest here: a `make lint-fast`,
|
likeliest to exist: a `make lint-fast`, a container-versus-host branch, or
|
||||||
an older host-versus-container branch, or a CI step calling the binary
|
a CI step that calls the binary directly.
|
||||||
directly. `script/fmt` and `script/fmt-check` are expected hits and stay
|
- [ ] `script/bootstrap` installs no linter. Delete the golangci-lint install
|
||||||
on the host.
|
block, its version and ref variables, and its call site: nothing invokes a
|
||||||
- [ ] Every `docker build` in `script/` is tagged — an untagged one leaves a
|
host linter any more, so all it can still do is put a differently
|
||||||
dangling image behind on every run, on every host and CI runner
|
versioned binary where somebody runs it by hand and believes the result.
|
||||||
- [ ] `script/cibuild` runs `script/bootstrap` before `script/check`, and builds
|
- [ ] The per-checkout lint state is gone: no `GOLANGCI_LINT_CACHE` or `TMPDIR`
|
||||||
the image with `--no-cache`. Without the bootstrap the CI run dies in
|
exports, no `--allow-serial-runners`, and `.lint-cache/` removed from
|
||||||
`script/fmt-check`, which runs the formatter on the host and finds nothing
|
`.gitignore` and `.dockerignore`. A container has its own cache and its
|
||||||
installed.
|
own lock, so keeping the wrapper leaves two contradictory `script/lint`
|
||||||
- [ ] `script/fmt` and `script/fmt-check` source nvm for the pinned node version
|
forms in the fleet.
|
||||||
before invoking `yarn`, as `script/bootstrap`'s own install step does.
|
- [ ] `script/cibuild` runs `script/lint` before the main `docker build`.
|
||||||
`script/bootstrap` leaves the node and yarn it installs off the `PATH` of
|
Without that line CI never lints at all, because the main image
|
||||||
the shell that called it, so a bare `yarn` exits 127 on a runner carrying
|
deliberately does not.
|
||||||
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.
|
|
||||||
- [ ] `make check` does not modify any files in the repo
|
- [ ] `make check` does not modify any files in the repo
|
||||||
- [ ] `make test` has a 90-second timeout and completes within the 60-second
|
- [ ] `make test` has a 30-second timeout
|
||||||
hard cap (over 20 seconds is green but must be filed as an improvement
|
|
||||||
bug)
|
|
||||||
- [ ] `make test` runs real tests, not a no-op (at minimum, import/compile
|
- [ ] `make test` runs real tests, not a no-op (at minimum, import/compile
|
||||||
check)
|
check)
|
||||||
- [ ] `make check` passes on current branch
|
- [ ] `make check` passes on current branch
|
||||||
@@ -180,10 +186,9 @@ with your task.
|
|||||||
# Final
|
# Final
|
||||||
|
|
||||||
- [ ] `make check` passes
|
- [ ] `make check` passes
|
||||||
- [ ] `script/cibuild` succeeds in a fresh clone on a host carrying nothing but
|
- [ ] `make lint` runs twice on an unchanged tree with the lint layer `DONE`
|
||||||
docker and git, with no node or yarn on `PATH`, which is what CI has, and
|
both times, never `CACHED` and never sub-second
|
||||||
demonstrably executed the checks — a sub-second build, or `CACHED` on a
|
- [ ] `script/cibuild` succeeds and runs both container builds (a bare
|
||||||
gate layer, means nothing ran
|
`docker build .` or `docker build -f Dockerfile.lint .` fails closed by
|
||||||
- [ ] A planted lint violation fails both `make lint` and a plain
|
design, on the `CHECK_EPOCH` guard)
|
||||||
`docker build .`; revert it afterwards
|
|
||||||
- [ ] Commit and merge fixes before starting your actual task
|
- [ ] Commit and merge fixes before starting your actual task
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
title: Go HTTP Server Conventions
|
title: Go HTTP Server Conventions
|
||||||
last_modified: 2026-10-02
|
last_modified: 2026-08-09
|
||||||
---
|
---
|
||||||
|
|
||||||
This document defines the architectural patterns, design decisions, and
|
This document defines the architectural patterns, design decisions, and
|
||||||
@@ -118,13 +118,15 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
Appname string = "CHANGEME"
|
Appname string = "CHANGEME"
|
||||||
Version string
|
Version string
|
||||||
|
Buildarch string
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
globals.Appname = Appname
|
globals.Appname = Appname
|
||||||
globals.Version = Version
|
globals.Version = Version
|
||||||
|
globals.Buildarch = Buildarch
|
||||||
|
|
||||||
fx.New(
|
fx.New(
|
||||||
fx.Provide(
|
fx.Provide(
|
||||||
@@ -824,7 +826,7 @@ func (l *Logger) Identify() {
|
|||||||
l.log.Info("starting",
|
l.log.Info("starting",
|
||||||
"appname", l.params.Globals.Appname,
|
"appname", l.params.Globals.Appname,
|
||||||
"version", l.params.Globals.Version,
|
"version", l.params.Globals.Version,
|
||||||
"arch", runtime.GOARCH,
|
"buildarch", l.params.Globals.Buildarch,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
@@ -944,20 +946,23 @@ import "go.uber.org/fx"
|
|||||||
|
|
||||||
// Package-level variables (set from main)
|
// Package-level variables (set from main)
|
||||||
var (
|
var (
|
||||||
Appname string
|
Appname string
|
||||||
Version string
|
Version string
|
||||||
|
Buildarch string
|
||||||
)
|
)
|
||||||
|
|
||||||
// Struct for DI
|
// Struct for DI
|
||||||
type Globals struct {
|
type Globals struct {
|
||||||
Appname string
|
Appname string
|
||||||
Version string
|
Version string
|
||||||
|
Buildarch string
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(lc fx.Lifecycle) (*Globals, error) {
|
func New(lc fx.Lifecycle) (*Globals, error) {
|
||||||
n := &Globals{
|
n := &Globals{
|
||||||
Appname: Appname,
|
Appname: Appname,
|
||||||
Version: Version,
|
Buildarch: Buildarch,
|
||||||
|
Version: Version,
|
||||||
}
|
}
|
||||||
return n, nil
|
return n, nil
|
||||||
}
|
}
|
||||||
@@ -968,13 +973,15 @@ func New(lc fx.Lifecycle) (*Globals, error) {
|
|||||||
```go
|
```go
|
||||||
// cmd/httpd/main.go
|
// cmd/httpd/main.go
|
||||||
var (
|
var (
|
||||||
Appname string = "CHANGEME" // Default, overridden by build
|
Appname string = "CHANGEME" // Default, overridden by build
|
||||||
Version string // Set at build time
|
Version string // Set at build time
|
||||||
|
Buildarch string // Set at build time
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
globals.Appname = Appname
|
globals.Appname = Appname
|
||||||
globals.Version = Version
|
globals.Version = Version
|
||||||
|
globals.Buildarch = Buildarch
|
||||||
// ...
|
// ...
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
@@ -984,14 +991,18 @@ func main() {
|
|||||||
Use ldflags to inject version information at build time:
|
Use ldflags to inject version information at build time:
|
||||||
|
|
||||||
```makefile
|
```makefile
|
||||||
# ?= rather than := so that a `VERSION` build argument takes precedence:
|
# ?= rather than := because this `$(shell git describe ...)` is only correct
|
||||||
# where a build stage invokes make, `ARG VERSION` puts it in the
|
# on the host: `.dockerignore` excludes `.git`, so evaluated inside a build
|
||||||
# environment and `?=` defers to it. Otherwise `git describe` runs, in a
|
# stage it expands to the empty string without failing and the binary reports
|
||||||
# build stage on the `.git` the build context carries.
|
# 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)
|
VERSION ?= $(shell git describe --tags --always)
|
||||||
|
BUILDARCH := $(shell go env GOARCH)
|
||||||
|
|
||||||
build:
|
build:
|
||||||
go build -ldflags "-X main.Version=$(VERSION)" ./cmd/httpd
|
go build -ldflags "-X main.Version=$(VERSION) -X main.Buildarch=$(BUILDARCH)" ./cmd/httpd
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
title: New Repo Checklist
|
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
|
Use this checklist when creating a new repository from scratch. Follow the steps
|
||||||
@@ -62,46 +62,53 @@ Template files can be fetched from:
|
|||||||
`cmd/myapp/` and delete the package directory. Do not transplant
|
`cmd/myapp/` and delete the package directory. Do not transplant
|
||||||
`.gitignore`'s patterns: `.dockerignore` anchors an unprefixed pattern at
|
`.gitignore`'s patterns: `.dockerignore` anchors an unprefixed pattern at
|
||||||
the context root, so the copied form leaves `config/.env` in the build
|
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
|
context while reading as solved. See the `.dockerignore` rule in
|
||||||
anchored for the same reason as a repo-root binary; leave it that way, but
|
`REPO_POLICIES.md`. The canonical file's `.claude` entry is anchored for
|
||||||
note that it only covers agents running at the repo root — if this repo
|
the same reason as a repo-root binary; leave it that way, but note it only
|
||||||
will run them in subdirectories, `services/api/.claude/` needs its own
|
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.
|
anchored entry.
|
||||||
- If the image embeds a version in a binary: `.dockerignore` lets `.git`
|
- If the image embeds a version in a binary, the version is computed on the
|
||||||
into the build context. It keeps out `.git/config` and each submodule's
|
host and passed with `--build-arg VERSION=...`. `ARG VERSION=dev` is
|
||||||
`config` under `.git/modules/` at any depth (`.git/modules/**/config`),
|
declared in the stage that compiles, and **no stage calls `git describe`**
|
||||||
which `git describe` does not need and which can hold a credential: a
|
— `.dockerignore` excludes `.git`, so it yields an empty version without
|
||||||
password in a remote URL, or the token the CI checkout step stores there.
|
failing the build.
|
||||||
The stage that compiles has `git` (the Debian Go image has it; an alpine
|
- The `Dockerfile` runs the **non-lint** checks as build steps —
|
||||||
one needs `apk add --no-cache git`) and takes the version from the
|
`script/test` and `script/fmt-check`, never `make check`. `script/lint` is
|
||||||
`VERSION` build argument when one is given, otherwise from
|
a `docker build` of `Dockerfile.lint`, so `make check` here nests a build
|
||||||
`git describe --tags --always`. That gives the tag on a tagged commit; on
|
inside a build step, where there is no daemon. Put a comment above those
|
||||||
a later commit, the tag, the number of commits since it and the short
|
`RUN` lines saying so. Every stage containing a check-running `RUN` must
|
||||||
commit (`v1.2.3-4-gabc1234`); and the short commit when no tag is
|
declare `ARG CHECK_EPOCH` with the `RUN [ -n "$CHECK_EPOCH" ] || exit 1`
|
||||||
reachable. The stage that compiles also marks its working directory safe
|
guard immediately below it — see the `CHECK_EPOCH` rule in
|
||||||
for git (`git config --system --add safe.directory /src`): a context sent
|
`REPO_POLICIES.md`. Without them the check layer is served from cache on
|
||||||
as a tar stream keeps the sender's file owners, and git refuses a checkout
|
an unchanged tree and the build reports a green it never ran.
|
||||||
owned by another user, so the version would come out empty. `ARG VERSION`
|
- Server: also builds and runs the application
|
||||||
has no default, and the build fails if the context carries `.git` and the
|
- Non-server: brings up dev environment and runs those checks
|
||||||
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
|
|
||||||
- Image pinned by sha256 hash with version/date comment
|
- Image pinned by sha256 hash with version/date comment
|
||||||
|
- [ ] `Dockerfile.lint` — the lint-only image that `script/lint` builds. Same
|
||||||
|
`ARG CHECK_EPOCH` + guard + expanded-value discipline as above, with the
|
||||||
|
`ARG` placed **after** the dependency layer so only the lint steps re-run.
|
||||||
|
Base image pinned by sha256 with a version/date comment. Go repos use
|
||||||
|
`golangci/golangci-lint` and run both `golangci-lint config verify` and
|
||||||
|
`golangci-lint run`; other repos use the same pattern around their own
|
||||||
|
linter (eslint, ruff, prettier). Copy the canonical file from
|
||||||
|
`REPO_POLICIES.md`. The linter is invoked directly there, never via
|
||||||
|
`make lint`, which would recurse. The arg keeps the name `CHECK_EPOCH` in
|
||||||
|
this file as well, so one grep covers both builds.
|
||||||
|
- The formatting check runs in exactly one of the two images: either
|
||||||
|
`script/fmt-check` in the `Dockerfile`, or the formatter beside the
|
||||||
|
linters in `Dockerfile.lint` where that is the same pinned dependency.
|
||||||
|
Never neither, never both.
|
||||||
|
- `.dockerignore` must exclude the agent scratch directory before this image
|
||||||
|
is trusted: it lints whatever is in the build context, and toolchains walk
|
||||||
|
the tree rather than reading `.gitignore`, so an agent worktree that
|
||||||
|
reaches the context is linted as though it were the repo.
|
||||||
- [ ] Gitea Actions workflow at `.gitea/workflows/check.yml` that runs
|
- [ ] Gitea Actions workflow at `.gitea/workflows/check.yml` that runs
|
||||||
`script/cibuild` on push — reference
|
`script/cibuild` on push — reference
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
||||||
- [ ] Language-specific:
|
- [ ] Language-specific:
|
||||||
- [ ] Go: `go mod init sneak.berlin/go/<name>`, `.golangci.yml` (fetch from
|
- [ ] Go: `go mod init sneak.berlin/go/<name>`, `.golangci.yml` (fetch from
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml` and,
|
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml`)
|
||||||
in the same commit, set the lint phase digest to the one named in the
|
|
||||||
`.golangci.yml` paragraph of `REPO_POLICIES.md`)
|
|
||||||
- [ ] JS: `yarn init`, `yarn add --dev prettier`
|
- [ ] JS: `yarn init`, `yarn add --dev prettier`
|
||||||
- [ ] Python: `pyproject.toml`
|
- [ ] Python: `pyproject.toml`
|
||||||
|
|
||||||
@@ -120,34 +127,51 @@ are thin shims calling them. Model scripts:
|
|||||||
installs
|
installs
|
||||||
- [ ] `script/setup` / `make setup` — readies a fresh clone: runs `bootstrap`,
|
- [ ] `script/setup` / `make setup` — readies a fresh clone: runs `bootstrap`,
|
||||||
then `install-precommit`, plus repo-specific init
|
then `install-precommit`, plus repo-specific init
|
||||||
- [ ] `script/test` / `make test` — `docker build --no-cache --target test .`,
|
- [ ] `script/test` / `make test` — runs real tests, not a no-op (30-second
|
||||||
tagged; the phase runs real tests, not a no-op (90-second timeout,
|
timeout)
|
||||||
60-second hard cap on wall time)
|
- [ ] `script/lint` / `make lint` — builds `Dockerfile.lint` and nothing else:
|
||||||
- [ ] `script/lint` / `make lint` — `docker build --no-cache --target lint .`,
|
`epoch="$(date +%s%N)$$"` on its own line, then
|
||||||
tagged. No lint verdict may come from a host invocation of the linter.
|
`docker build --build-arg CHECK_EPOCH="$epoch" -f Dockerfile.lint .`. The
|
||||||
- [ ] `script/fmt` / `make fmt` — formats code (writes; native, never in a
|
linter is never installed on the host and never invoked there. Copy the
|
||||||
container)
|
canonical script from `REPO_POLICIES.md`; it is byte-identical across
|
||||||
- [ ] `script/fmt-check` / `make fmt-check` — checks formatting (read-only;
|
repos. Without the nonce this script exits 0 on an unchanged tree having
|
||||||
native)
|
linted nothing.
|
||||||
|
- [ ] `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
|
- [ ] `script/check` / `make check` — runs `test`, `lint`, `fmt-check`; must not
|
||||||
modify files
|
modify files. It needs a docker daemon, because `script/lint` is a
|
||||||
|
container build, and it must never be called from inside a build stage
|
||||||
- [ ] `script/projectname` — outputs the project name (used by `script/docker`
|
- [ ] `script/projectname` — outputs the project name (used by `script/docker`
|
||||||
for the image tag)
|
for the image tag)
|
||||||
- [ ] `script/docker` / `make docker` — builds Docker image, tagged via
|
- [ ] `script/docker` / `make docker` — builds Docker image, tagged via
|
||||||
`script/projectname` (byte-identical across repos); `--no-cache`, plus the
|
`script/projectname` (byte-identical across repos); carries the same three
|
||||||
version as a build arg
|
version lines as `script/cibuild` below, and passes
|
||||||
- [ ] `script/cibuild` — cd to repo root, run `script/bootstrap`, run
|
`--build-arg CHECK_EPOCH="$epoch"` and `--build-arg VERSION="$version"`
|
||||||
`script/check`, then
|
- [ ] `script/cibuild` — cd to repo root, run `script/lint` **first** for
|
||||||
`docker build --no-cache --build-arg VERSION="$version" .` (what CI runs).
|
fail-fast feedback, then, each on its own line:
|
||||||
The bootstrap is required: CI checks out and runs this alone, and
|
|
||||||
`script/fmt-check` runs the formatter on the host.
|
```sh
|
||||||
- [ ] `script/fmt` and `script/fmt-check` source nvm for the pinned node version
|
epoch="$(date +%s%N)$$"
|
||||||
before invoking `yarn`, as `script/bootstrap`'s own install step does.
|
version="$(git describe --tags --always --dirty 2>/dev/null || true)"
|
||||||
`script/bootstrap` leaves the node and yarn it installs off the `PATH` of
|
[ -n "$version" ] || version="unknown"
|
||||||
the shell that called it, so a bare `yarn` exits 127 on a runner carrying
|
docker build \
|
||||||
nothing but docker and git.
|
--build-arg CHECK_EPOCH="$epoch" \
|
||||||
- [ ] Every `docker build` in `script/` is tagged, so no invocation leaves a
|
--build-arg VERSION="$version" \
|
||||||
dangling image behind
|
.
|
||||||
|
```
|
||||||
|
|
||||||
|
(what CI runs). The `script/lint` call is not optional: the main image does
|
||||||
|
not lint, so without it CI never lints. 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 .`.
|
||||||
|
|
||||||
- [ ] `script/precommit` — called by the pre-commit hook; runs `script/check`
|
- [ ] `script/precommit` — called by the pre-commit hook; runs `script/check`
|
||||||
- [ ] `script/install-precommit` — installs the pre-commit hook that runs
|
- [ ] `script/install-precommit` — installs the pre-commit hook that runs
|
||||||
`script/precommit`
|
`script/precommit`
|
||||||
@@ -158,16 +182,12 @@ are thin shims calling them. Model scripts:
|
|||||||
# 4. Verify
|
# 4. Verify
|
||||||
|
|
||||||
- [ ] `make check` passes
|
- [ ] `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
|
- [ ] `make docker` succeeds
|
||||||
- [ ] `script/cibuild` succeeds in a fresh clone on a host carrying nothing but
|
- [ ] `script/cibuild` succeeds and runs both container builds
|
||||||
docker and git, with no node or yarn on `PATH`, which is what CI has, and
|
- [ ] No secrets in repo
|
||||||
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`
|
|
||||||
- [ ] No mutable image/package references
|
- [ ] No mutable image/package references
|
||||||
- [ ] No unnecessary files in repo root
|
- [ ] No unnecessary files in repo root
|
||||||
- [ ] All dates written as YYYY-MM-DD
|
- [ ] All dates written as YYYY-MM-DD
|
||||||
|
|||||||
+613
-300
File diff suppressed because it is too large
Load Diff
+8
-3
@@ -1,8 +1,13 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# script/check: run all checks (test, lint, fmt-check). Our own
|
# script/check: run all checks (test, lint, fmt-check). Our own
|
||||||
# extension to scripts-to-rule-them-all. test and lint are Docker
|
# extension to scripts-to-rule-them-all. Must not modify any files.
|
||||||
# phases; fmt-check is native, because a formatter writes the working
|
#
|
||||||
# tree. Must not modify any files.
|
# script/lint is a docker build (see Dockerfile.lint), so this script
|
||||||
|
# requires a docker daemon. That is deliberate: it is the only way a
|
||||||
|
# developer and the pre-commit hook get the same linter CI gets. It also
|
||||||
|
# means this script must never be run from inside a build stage — see
|
||||||
|
# the comment in Dockerfile, which runs the individual non-lint checks
|
||||||
|
# for exactly that reason.
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||||
|
|||||||
+26
-14
@@ -1,10 +1,10 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# script/cibuild: run the CI build. It bootstraps first: a CI runner
|
# script/cibuild: run the CI build. Two container builds, in order:
|
||||||
# checks out and runs this and nothing else, and script/fmt-check runs
|
# script/lint (Dockerfile.lint) and then the main image, which runs the
|
||||||
# the formatter on the host, which a pristine checkout cannot do.
|
# non-lint checks. Both only prove anything because each passes its own
|
||||||
# --no-cache for the same reason as script/docker: the gate phases the
|
# fresh CHECK_EPOCH nonce: without it Docker serves the check layers
|
||||||
# final stage depends on are RUN steps, and a cached one is a check that
|
# from cache on an unchanged tree and the build exits 0 without running
|
||||||
# did not run.
|
# anything.
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||||
@@ -12,17 +12,29 @@ ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
|||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
"$SCRIPT_DIR/bootstrap"
|
# Lint first, for fail-fast feedback: it is its own container build
|
||||||
"$SCRIPT_DIR/check"
|
# and computes its own CHECK_EPOCH. It runs here rather than inside
|
||||||
# Own line: a failing command substitution inside an argument does
|
# the main image because a docker build cannot run a docker build.
|
||||||
# not trip `set -e`, so the inline form degrades silently to an
|
"$SCRIPT_DIR/lint"
|
||||||
# empty constant. The VERSION build argument takes precedence over
|
# Assign on its own line: a failing command substitution inside an
|
||||||
# the version a build stage derives from the .git in the context.
|
# argument does not trip `set -e`, which would silently degrade the
|
||||||
|
# nonce to an empty constant. `$$` is required because busybox `date`
|
||||||
|
# drops %N without erroring.
|
||||||
|
epoch="$(date +%s%N)$$"
|
||||||
|
# VERSION must be computed here, on the host: .dockerignore excludes
|
||||||
|
# .git, so `git describe` cannot run in any build stage and fails
|
||||||
|
# quietly there rather than erroring. Same own-line discipline as the
|
||||||
|
# epoch. `|| true` keeps a failing describe from tripping `set -e`
|
||||||
|
# and leaves the value empty; the guard below is then the single
|
||||||
|
# place the fallback is applied, and it does fire — on an export with
|
||||||
|
# no .git, or a repo with no commits yet. `unknown` is visibly wrong
|
||||||
|
# in a binary in a way that an empty version is not.
|
||||||
version="$(git describe --tags --always --dirty 2>/dev/null || true)"
|
version="$(git describe --tags --always --dirty 2>/dev/null || true)"
|
||||||
[ -n "$version" ] || version="unknown"
|
[ -n "$version" ] || version="unknown"
|
||||||
docker build --no-cache \
|
docker build \
|
||||||
|
--build-arg CHECK_EPOCH="$epoch" \
|
||||||
--build-arg VERSION="$version" \
|
--build-arg VERSION="$version" \
|
||||||
-t "$("$SCRIPT_DIR/projectname")" .
|
.
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
+19
-8
@@ -1,8 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# script/docker: build the Docker image tagged with the project name.
|
# script/docker: build the Docker image tagged with the project name.
|
||||||
# Identical in all repos; the tag comes from script/projectname.
|
# Identical in all repos; the tag comes from script/projectname. The
|
||||||
# --no-cache because the gate phases the final stage depends on are RUN
|
# Dockerfile's checks only actually run because CHECK_EPOCH is a fresh
|
||||||
# steps, and a cached one is a check that did not run.
|
# nonce on every invocation; without it a warm cache turns this into a
|
||||||
|
# green that proves nothing.
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||||
@@ -10,13 +11,23 @@ ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
|||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
# Own line: a failing command substitution inside an argument does
|
# Assign on its own line: a failing command substitution inside an
|
||||||
# not trip `set -e`, so the inline form degrades silently to an
|
# argument does not trip `set -e`, which would silently degrade the
|
||||||
# empty constant. The VERSION build argument takes precedence over
|
# nonce to an empty constant. `$$` is required because busybox `date`
|
||||||
# the version a build stage derives from the .git in the context.
|
# drops %N without erroring.
|
||||||
|
epoch="$(date +%s%N)$$"
|
||||||
|
# VERSION must be computed here, on the host: .dockerignore excludes
|
||||||
|
# .git, so `git describe` cannot run in any build stage and fails
|
||||||
|
# quietly there rather than erroring. Same own-line discipline as the
|
||||||
|
# epoch. `|| true` keeps a failing describe from tripping `set -e`
|
||||||
|
# and leaves the value empty; the guard below is then the single
|
||||||
|
# place the fallback is applied, and it does fire — on an export with
|
||||||
|
# no .git, or a repo with no commits yet. `unknown` is visibly wrong
|
||||||
|
# in a binary in a way that an empty version is not.
|
||||||
version="$(git describe --tags --always --dirty 2>/dev/null || true)"
|
version="$(git describe --tags --always --dirty 2>/dev/null || true)"
|
||||||
[ -n "$version" ] || version="unknown"
|
[ -n "$version" ] || version="unknown"
|
||||||
docker build --no-cache \
|
docker build \
|
||||||
|
--build-arg CHECK_EPOCH="$epoch" \
|
||||||
--build-arg VERSION="$version" \
|
--build-arg VERSION="$version" \
|
||||||
-t "$("$SCRIPT_DIR/projectname")" .
|
-t "$("$SCRIPT_DIR/projectname")" .
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-20
@@ -4,28 +4,9 @@ set -eu
|
|||||||
|
|
||||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
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() {
|
main() {
|
||||||
cd "$ROOT"
|
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 "$@"
|
main "$@"
|
||||||
|
|||||||
+1
-20
@@ -4,28 +4,9 @@ set -eu
|
|||||||
|
|
||||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
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() {
|
main() {
|
||||||
cd "$ROOT"
|
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 "$@"
|
main "$@"
|
||||||
|
|||||||
+18
-14
@@ -1,23 +1,27 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# script/lint: run the linter. Linting is a phase of the Dockerfile and
|
# script/lint: run the linter. The linter is never installed on the host
|
||||||
# this builds that phase alone; the linter is never installed or run on
|
# and never invoked there — it runs in a container, one way, everywhere,
|
||||||
# a developer host, where a shared result cache and a host-global lock
|
# so a run cannot inherit another checkout's cache, another process's
|
||||||
# make its answer untrustworthy.
|
# lock, or a host toolchain that differs from the pinned one. Linting
|
||||||
#
|
# happens as a build step (see Dockerfile.lint), so a successful build
|
||||||
# The phase is not the last stage in the file, so it is built only when
|
# is a clean lint, and it works where the docker daemon is remote and
|
||||||
# --target names it. --no-cache because a cached lint layer is a lint
|
# bind mounts are impossible.
|
||||||
# that did not run. The tag makes each build replace the previous image
|
|
||||||
# instead of leaving a dangling one behind.
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
docker build --no-cache \
|
# Assign on its own line: a failing command substitution inside an
|
||||||
--target lint \
|
# argument does not trip `set -e`, which would silently degrade the
|
||||||
-t "$("$SCRIPT_DIR/projectname")-lint" .
|
# nonce to an empty constant. `$$` is required because busybox `date`
|
||||||
|
# drops %N without erroring. Without a fresh nonce the lint layer is
|
||||||
|
# served from cache and this script exits 0 having linted nothing.
|
||||||
|
epoch="$(date +%s%N)$$"
|
||||||
|
docker build \
|
||||||
|
--build-arg CHECK_EPOCH="$epoch" \
|
||||||
|
-f Dockerfile.lint \
|
||||||
|
.
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
+3
-10
@@ -1,19 +1,12 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# script/test: run the test suite. Testing is a phase of the Dockerfile
|
# script/test: run the test suite.
|
||||||
# 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.
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
docker build --no-cache \
|
echo "No tests defined."
|
||||||
--target test \
|
|
||||||
-t "$("$SCRIPT_DIR/projectname")-test" .
|
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user