Address Gadfly review findings on build-image CI
Build image / build-and-push (push) Successful in 1m3s
Build image / build-and-push (push) Successful in 1m3s
Workflow:
- Pass untrusted github.ref_name/repository/sha/token via env instead of
inline ${{ }} in run: blocks, closing a branch-name shell-injection vector.
- Check out the exact triggering commit (fetch by SHA, branch fallback) so
the sha-<short> tag matches what was built.
- Guard the tag scheme: a non-main branch named/sanitized to "latest" can't
clobber :latest, and an empty sanitized name falls back to branch-<sha>.
- Build --tag flags as a bash array (no word-splitting), drop the
comma-string round-trip, and check-then-create the buildx builder so a
real failure isn't swallowed.
Dockerfile:
- GOWORK=off in the build stage (matches the Makefile convention).
- npm ci uses a BuildKit cache mount.
- Drop the stale issue-number reference in a comment.
.dockerignore:
- Add .env/.env.*, go.work/go.work.sum, web/.vite; drop nonexistent .github.
Graded all findings in the gadfly store. Deferred/keep-as-is: token-in-clone-URL
(Gitea masks the secret in logs), sanitization collisions across branch names
(the sha-<short> tag is the collision-proof identifier), and registry build
cache (current builds are fast). False positives: alpine ships wget (busybox);
docker login is its own step.
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_01JdQpdYYsTgtkJBxbcpAszi
This commit is contained in:
+5
-3
@@ -8,13 +8,15 @@
|
||||
FROM node:22-alpine AS web
|
||||
WORKDIR /web
|
||||
COPY web/package.json web/package-lock.json ./
|
||||
RUN npm ci
|
||||
RUN --mount=type=cache,target=/root/.npm npm ci
|
||||
COPY web/ ./
|
||||
RUN npm run build
|
||||
|
||||
# ---- stage 2: build the static Go binary (web bundle embedded) --------------
|
||||
FROM golang:1.26-alpine AS build
|
||||
ENV CGO_ENABLED=0 GOTOOLCHAIN=auto
|
||||
# GOWORK=off matches the Makefile: pansy is a standalone module, built without
|
||||
# any parent workspace even if one leaks into the build context.
|
||||
ENV CGO_ENABLED=0 GOTOOLCHAIN=auto GOWORK=off
|
||||
WORKDIR /src
|
||||
COPY go.mod go.sum ./
|
||||
RUN --mount=type=cache,target=/go/pkg/mod go mod download
|
||||
@@ -38,7 +40,7 @@ LABEL org.opencontainers.image.title="pansy" \
|
||||
org.opencontainers.image.version="${BUILD_BRANCH}" \
|
||||
org.opencontainers.image.created="${BUILD_TIME}"
|
||||
|
||||
# ca-certificates: outbound TLS (OIDC discovery, #5). tzdata: correct local time.
|
||||
# ca-certificates: outbound TLS (e.g. OIDC discovery). tzdata: correct local time.
|
||||
RUN apk add --no-cache ca-certificates tzdata \
|
||||
&& adduser -D -u 10001 pansy \
|
||||
&& mkdir -p /data \
|
||||
|
||||
Reference in New Issue
Block a user