Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74f1718eca |
+11
-5
@@ -18,9 +18,14 @@ COPY . .
|
|||||||
# Tells script/lint it is inside a container, so it runs the linter.
|
# Tells script/lint it is inside a container, so it runs the linter.
|
||||||
ENV container=docker
|
ENV container=docker
|
||||||
|
|
||||||
# Run formatting check and linter
|
# Run formatting check and linter. script/cibuild and script/docker pass
|
||||||
RUN make fmt-check
|
# a new CHECK_EPOCH on every run, and each check step names it in its
|
||||||
RUN make lint
|
# command, so a new value reruns the step instead of reusing a cached
|
||||||
|
# success that checked nothing. A plain `docker build .` leaves it empty
|
||||||
|
# and reuses the check steps only for an identical build context.
|
||||||
|
ARG CHECK_EPOCH
|
||||||
|
RUN echo "check epoch: ${CHECK_EPOCH}" && make fmt-check
|
||||||
|
RUN echo "check epoch: ${CHECK_EPOCH}" && make lint
|
||||||
|
|
||||||
# Build stage
|
# Build stage
|
||||||
# golang:1.25.4-alpine, 2026-02-25
|
# golang:1.25.4-alpine, 2026-02-25
|
||||||
@@ -39,8 +44,9 @@ RUN script/bootstrap
|
|||||||
# Copy source code
|
# Copy source code
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Run tests
|
# Run tests; a new CHECK_EPOCH reruns them, as in the lint stage.
|
||||||
RUN make test
|
ARG CHECK_EPOCH
|
||||||
|
RUN echo "check epoch: ${CHECK_EPOCH}" && make test
|
||||||
|
|
||||||
# VERSION is declared here, not earlier: a new value reruns only the
|
# VERSION is declared here, not earlier: a new value reruns only the
|
||||||
# build, not script/bootstrap or the tests. Given none, the version is
|
# build, not script/bootstrap or the tests. Given none, the version is
|
||||||
|
|||||||
@@ -345,8 +345,9 @@ them. We provide:
|
|||||||
- `script/check` — run test, lint, and fmt-check
|
- `script/check` — run test, lint, and fmt-check
|
||||||
- `script/docker` — build the Docker image tagged via `script/projectname`
|
- `script/docker` — build the Docker image tagged via `script/projectname`
|
||||||
- `script/docker-smoke` — build the image, start it, wait for it to be healthy
|
- `script/docker-smoke` — build the image, start it, wait for it to be healthy
|
||||||
- `script/cibuild` — CI entrypoint: `docker build .` (the Dockerfile
|
- `script/cibuild` — CI entrypoint: `docker build .` with a new
|
||||||
runs the checks, so a green build implies a green repo)
|
`CHECK_EPOCH` on every run, so the Dockerfile's checks run instead of
|
||||||
|
coming from the build cache, and a green run implies a green repo
|
||||||
- `script/precommit` — pre-commit checks (`go mod tidy` guard, then
|
- `script/precommit` — pre-commit checks (`go mod tidy` guard, then
|
||||||
`script/check`)
|
`script/check`)
|
||||||
- `script/install-precommit` — install the git pre-commit hook that
|
- `script/install-precommit` — install the git pre-commit hook that
|
||||||
|
|||||||
@@ -29,6 +29,15 @@ P2: security: referer blacklist
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
|
- 2026-10-03 every `script/cibuild` and `script/docker` run executes the checks
|
||||||
|
(closes #101): the `Dockerfile` declares `CHECK_EPOCH` above `make fmt-check`
|
||||||
|
and `make lint` in the lint stage and above `make test` in the build stage,
|
||||||
|
and each of those steps names it in its command; both scripts pass a new value
|
||||||
|
on every run, so Docker runs the checks instead of reusing cached results,
|
||||||
|
while the `script/bootstrap` steps stay cached; a plain `docker build .` still
|
||||||
|
works, leaves it empty, and reuses the check steps only for an identical build
|
||||||
|
context; the `script/cibuild` comment and `README.md` no longer say that any
|
||||||
|
successful build implies a green repo.
|
||||||
- 2026-09-29 only the image routes send CORS headers (closes #98): the CORS
|
- 2026-09-29 only the image routes send CORS headers (closes #98): the CORS
|
||||||
middleware, with the `access_control_allow_origin` origin, moved from the
|
middleware, with the `access_control_allow_origin` origin, moved from the
|
||||||
router root onto a `/v1` subrouter holding `/v1/image/` and `/v1/e/`, where it
|
router root onto a `/v1` subrouter holding `/v1/image/` and `/v1/e/`, where it
|
||||||
|
|||||||
+7
-4
@@ -1,15 +1,18 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# script/cibuild: run the CI build. The Dockerfile runs the checks
|
# script/cibuild: run the CI build. The Dockerfile runs the checks
|
||||||
# (make fmt-check, lint, test), so a successful build implies a green
|
# (make fmt-check, lint, test) as build steps. This script passes a new
|
||||||
# repo. Generic: needs no adaptation. The Gitea workflow runs this on
|
# CHECK_EPOCH on every run, so Docker runs those steps instead of
|
||||||
# push.
|
# reusing cached results: a successful run means the checks ran and
|
||||||
|
# passed on this tree. Generic: needs no adaptation. The Gitea workflow
|
||||||
|
# runs this on push.
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
docker build .
|
epoch="$(date +%s)$$"
|
||||||
|
docker build --build-arg CHECK_EPOCH="$epoch" .
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
+7
-3
@@ -1,7 +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. Like
|
||||||
# Generic: needs no adaptation.
|
# script/cibuild, it passes a new CHECK_EPOCH, so the build runs the
|
||||||
|
# checks instead of reusing cached results. Generic: needs no
|
||||||
|
# adaptation.
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||||
@@ -9,7 +11,9 @@ ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
|||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
docker build -t "$("$SCRIPT_DIR/projectname")" .
|
epoch="$(date +%s)$$"
|
||||||
|
docker build --build-arg CHECK_EPOCH="$epoch" \
|
||||||
|
-t "$("$SCRIPT_DIR/projectname")" .
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user