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:
+9
-1
@@ -1,21 +1,29 @@
|
|||||||
# VCS / editor / docs — not needed in the image build context.
|
# VCS / editor / docs — not needed in the image build context.
|
||||||
.git
|
.git
|
||||||
.gitea
|
.gitea
|
||||||
.github
|
|
||||||
.idea
|
.idea
|
||||||
.vscode
|
.vscode
|
||||||
*.md
|
*.md
|
||||||
LICENSE
|
LICENSE
|
||||||
|
|
||||||
|
# Secrets and env files must never be baked into an image layer.
|
||||||
|
.env
|
||||||
|
.env.*
|
||||||
|
|
||||||
# Local build outputs and databases.
|
# Local build outputs and databases.
|
||||||
/pansy
|
/pansy
|
||||||
*.db
|
*.db
|
||||||
*.db-wal
|
*.db-wal
|
||||||
*.db-shm
|
*.db-shm
|
||||||
|
|
||||||
|
# Go workspace files (pansy builds standalone; GOWORK=off).
|
||||||
|
go.work
|
||||||
|
go.work.sum
|
||||||
|
|
||||||
# Frontend deps/output are rebuilt inside the image's web stage.
|
# Frontend deps/output are rebuilt inside the image's web stage.
|
||||||
web/node_modules
|
web/node_modules
|
||||||
web/dist
|
web/dist
|
||||||
|
web/.vite
|
||||||
|
|
||||||
# The embedded web build is produced fresh in the image (web stage → embed
|
# The embedded web build is produced fresh in the image (web stage → embed
|
||||||
# directory), so never ship stale local contents. dist.go itself is kept.
|
# directory), so never ship stale local contents. dist.go itself is kept.
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
name: Build image
|
name: Build image
|
||||||
|
|
||||||
# Build the single-binary image and push it to the Gitea container registry so
|
# Build the single-binary image and push it to the Gitea container registry so
|
||||||
# it can be deployed with Komodo. Tagging:
|
# it can be deployed with Komodo. Tagging (see README for the canonical table):
|
||||||
# * main -> :latest
|
# * main -> :latest
|
||||||
# * any other branch -> :<branch-name> (sanitized to valid Docker tag chars)
|
# * any other branch -> :<branch-name> (sanitized to valid Docker tag chars)
|
||||||
# * every build also -> :sha-<short> (immutable, handy for pinning)
|
# * every build also -> :sha-<short> (immutable, handy for pinning)
|
||||||
@@ -27,12 +27,27 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
# Untrusted values (branch name) go through env, never inline ${{ }}, so a
|
||||||
|
# crafted branch name can't inject shell. Check out the exact triggering
|
||||||
|
# commit so the sha-<short> tag matches the code that was built.
|
||||||
|
env:
|
||||||
|
REPO: ${{ github.repository }}
|
||||||
|
REF_NAME: ${{ github.ref_name }}
|
||||||
|
SHA: ${{ github.sha }}
|
||||||
|
GIT_TOKEN: ${{ github.token }}
|
||||||
run: |
|
run: |
|
||||||
REPO_URL="https://token:${{ github.token }}@gitea.stevedudenhoeffer.com/${{ github.repository }}.git"
|
git init -q .
|
||||||
git clone --depth=1 --branch "${{ github.ref_name }}" "$REPO_URL" .
|
git remote add origin "https://token:${GIT_TOKEN}@gitea.stevedudenhoeffer.com/${REPO}.git"
|
||||||
|
git fetch -q --depth=1 origin "$SHA" || git fetch -q --depth=1 origin "$REF_NAME"
|
||||||
|
git checkout -q FETCH_HEAD
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
run: docker buildx create --use --name pansy-builder --driver docker-container 2>/dev/null || docker buildx use pansy-builder
|
# Check first so a genuine create failure surfaces (rather than being
|
||||||
|
# hidden behind a swallowed "already exists").
|
||||||
|
run: |
|
||||||
|
docker buildx inspect pansy-builder >/dev/null 2>&1 \
|
||||||
|
|| docker buildx create --name pansy-builder --driver docker-container
|
||||||
|
docker buildx use pansy-builder
|
||||||
|
|
||||||
- name: Log in to Gitea registry
|
- name: Log in to Gitea registry
|
||||||
env:
|
env:
|
||||||
@@ -40,34 +55,33 @@ jobs:
|
|||||||
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
run: echo "${REGISTRY_PASSWORD}" | docker login gitea.stevedudenhoeffer.com -u "${REGISTRY_USER}" --password-stdin
|
run: echo "${REGISTRY_PASSWORD}" | docker login gitea.stevedudenhoeffer.com -u "${REGISTRY_USER}" --password-stdin
|
||||||
|
|
||||||
- name: Compute tags
|
- name: Build and push (linux/amd64)
|
||||||
id: meta
|
env:
|
||||||
|
REF_NAME: ${{ github.ref_name }}
|
||||||
|
SHA: ${{ github.sha }}
|
||||||
run: |
|
run: |
|
||||||
SHA_SHORT=$(echo "${GITHUB_SHA}" | cut -c1-7)
|
SHA_SHORT=$(echo "$SHA" | cut -c1-7)
|
||||||
if [ "${GITHUB_REF_NAME}" = "main" ]; then
|
|
||||||
|
if [ "$REF_NAME" = "main" ]; then
|
||||||
PRIMARY="latest"
|
PRIMARY="latest"
|
||||||
else
|
else
|
||||||
# Normalize the branch name to valid Docker tag chars [a-zA-Z0-9._-].
|
# Normalize the branch name to valid Docker tag chars [a-zA-Z0-9._-].
|
||||||
PRIMARY=$(echo "${GITHUB_REF_NAME}" | sed 's/[^a-zA-Z0-9._-]/-/g' | sed 's/--*/-/g' | sed 's/^[-.]*//;s/-$//')
|
PRIMARY=$(echo "$REF_NAME" | sed 's/[^a-zA-Z0-9._-]/-/g; s/--*/-/g; s/^[-.]*//; s/-*$//')
|
||||||
|
# A non-main branch must never clobber :latest, and the tag can't be empty.
|
||||||
|
[ "$PRIMARY" = "latest" ] && PRIMARY="branch-latest"
|
||||||
|
[ -z "$PRIMARY" ] && PRIMARY="branch-${SHA_SHORT}"
|
||||||
fi
|
fi
|
||||||
TAGS="${IMAGE_NAME}:${PRIMARY},${IMAGE_NAME}:sha-${SHA_SHORT}"
|
|
||||||
echo "tags=${TAGS}" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "Building tags: ${TAGS}"
|
|
||||||
|
|
||||||
- name: Build and push (linux/amd64)
|
# Build the tag flags as an array so no word-splitting/quoting surprises.
|
||||||
run: |
|
TAGS=(--tag "${IMAGE_NAME}:${PRIMARY}" --tag "${IMAGE_NAME}:sha-${SHA_SHORT}")
|
||||||
TAG_FLAGS=""
|
echo "Building ${IMAGE_NAME}:${PRIMARY} and ${IMAGE_NAME}:sha-${SHA_SHORT}"
|
||||||
IFS=',' read -ra TAG_ARRAY <<< "${{ steps.meta.outputs.tags }}"
|
|
||||||
for tag in "${TAG_ARRAY[@]}"; do
|
|
||||||
TAG_FLAGS="$TAG_FLAGS --tag $tag"
|
|
||||||
done
|
|
||||||
|
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--push \
|
--push \
|
||||||
--platform linux/amd64 \
|
--platform linux/amd64 \
|
||||||
$TAG_FLAGS \
|
"${TAGS[@]}" \
|
||||||
--build-arg "BUILD_COMMIT=${GITHUB_SHA}" \
|
--build-arg "BUILD_COMMIT=${SHA}" \
|
||||||
--build-arg "BUILD_BRANCH=${GITHUB_REF_NAME}" \
|
--build-arg "BUILD_BRANCH=${REF_NAME}" \
|
||||||
--build-arg "BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ')" \
|
--build-arg "BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ')" \
|
||||||
--file ./Dockerfile \
|
--file ./Dockerfile \
|
||||||
.
|
.
|
||||||
|
|||||||
+5
-3
@@ -8,13 +8,15 @@
|
|||||||
FROM node:22-alpine AS web
|
FROM node:22-alpine AS web
|
||||||
WORKDIR /web
|
WORKDIR /web
|
||||||
COPY web/package.json web/package-lock.json ./
|
COPY web/package.json web/package-lock.json ./
|
||||||
RUN npm ci
|
RUN --mount=type=cache,target=/root/.npm npm ci
|
||||||
COPY web/ ./
|
COPY web/ ./
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# ---- stage 2: build the static Go binary (web bundle embedded) --------------
|
# ---- stage 2: build the static Go binary (web bundle embedded) --------------
|
||||||
FROM golang:1.26-alpine AS build
|
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
|
WORKDIR /src
|
||||||
COPY go.mod go.sum ./
|
COPY go.mod go.sum ./
|
||||||
RUN --mount=type=cache,target=/go/pkg/mod go mod download
|
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.version="${BUILD_BRANCH}" \
|
||||||
org.opencontainers.image.created="${BUILD_TIME}"
|
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 \
|
RUN apk add --no-cache ca-certificates tzdata \
|
||||||
&& adduser -D -u 10001 pansy \
|
&& adduser -D -u 10001 pansy \
|
||||||
&& mkdir -p /data \
|
&& mkdir -p /data \
|
||||||
|
|||||||
Reference in New Issue
Block a user