Add Makefile dev/test/docker targets and multi-stage Dockerfile
Independent review Not signed off — 0 high, 2 medium (#5)
Independent review Not signed off — 0 high, 2 medium (#5)
Makefile: dev runs the Go server (:8080) and Vite (:5173) together and stops both on Ctrl-C; test runs the gofmt check, go vet, go test -race and npm ci/typecheck/test; build stamps the version via -ldflags into a static CGO_ENABLED=0 binary; docker builds the root Dockerfile. VERSION defaults to git describe with a dev fallback. Dockerfile: digest-pinned Node 22, Go 1.25 and Alpine 3.22 stages; the runtime runs as uid 10001 with /data as a volume, EXPOSE 8080 and a HEALTHCHECK on /health. .dockerignore keeps VCS, design, dependencies, build output, databases and secrets out of the context. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,20 @@
|
|||||||
|
# Keep the build context small and free of secrets and local state.
|
||||||
|
.git
|
||||||
|
.gitignore
|
||||||
|
.dockerignore
|
||||||
|
Dockerfile
|
||||||
|
.remember/
|
||||||
|
.claude/
|
||||||
|
design/
|
||||||
|
**/.DS_Store
|
||||||
|
node_modules
|
||||||
|
web/node_modules
|
||||||
|
web/dist
|
||||||
|
bin/
|
||||||
|
*.db
|
||||||
|
*.db-*
|
||||||
|
.env*
|
||||||
|
**/.env*
|
||||||
|
deploy/secrets/
|
||||||
|
*.pem
|
||||||
|
*.key
|
||||||
+37
@@ -0,0 +1,37 @@
|
|||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
# Base images are pinned by digest (multi-arch index); tags are for readability.
|
||||||
|
|
||||||
|
FROM node:22-alpine@sha256:0a7108bf6c7bf5de370ffb1a3ed6be93d405b43ff159f681a8d18c0e2bc2e402 AS web
|
||||||
|
WORKDIR /src/web
|
||||||
|
COPY web/package.json web/package-lock.json ./
|
||||||
|
RUN npm ci
|
||||||
|
COPY web/ ./
|
||||||
|
RUN npm run build
|
||||||
|
|
||||||
|
FROM golang:1.25-alpine@sha256:1ae0735f00daffa3aaf1363a5184c0d2dc55c78e3db4ec70241cdac97bf84b59 AS server
|
||||||
|
ARG VERSION=dev
|
||||||
|
WORKDIR /src
|
||||||
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
|
COPY . .
|
||||||
|
# Replace the placeholder with the built PWA; recreate the directory so no
|
||||||
|
# stale file survives into the embed.
|
||||||
|
RUN rm -rf internal/frontend/dist
|
||||||
|
COPY --from=web /src/web/dist/ internal/frontend/dist/
|
||||||
|
RUN CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=${VERSION}" \
|
||||||
|
-o /out/mealquest ./cmd/server
|
||||||
|
|
||||||
|
# Alpine ships the CA bundle and busybox wget for the health check.
|
||||||
|
FROM alpine:3.22@sha256:5291449c3df73caf6ed85e649dec1b9e818b39a5d8c871e97afc13e9cd5e8fa8
|
||||||
|
RUN addgroup -S -g 10001 mealquest \
|
||||||
|
&& adduser -S -D -H -u 10001 -G mealquest mealquest \
|
||||||
|
&& mkdir /data && chown mealquest:mealquest /data
|
||||||
|
COPY --from=server /out/mealquest /usr/local/bin/mealquest
|
||||||
|
ENV MEALQUEST_HTTP_ADDR=:8080 \
|
||||||
|
MEALQUEST_DATA_DIR=/data
|
||||||
|
VOLUME /data
|
||||||
|
EXPOSE 8080
|
||||||
|
USER 10001:10001
|
||||||
|
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
|
||||||
|
CMD wget -q -O /dev/null http://127.0.0.1:8080/health || exit 1
|
||||||
|
ENTRYPOINT ["/usr/local/bin/mealquest"]
|
||||||
@@ -1,11 +1,41 @@
|
|||||||
# Build entry point: build the PWA, embed it, then build the server binary.
|
# MealQuest build entry points.
|
||||||
|
#
|
||||||
|
# make dev Go server on :8080 plus Vite dev server on :5173 (proxies
|
||||||
|
# /api, /auth, /media to :8080). Needs the MEALQUEST_* env set.
|
||||||
|
# make test gofmt check, go vet, go test -race, npm typecheck and test.
|
||||||
|
# make build Build the PWA, embed it, build the static binary bin/mealquest.
|
||||||
|
# make docker Build the container image from ./Dockerfile.
|
||||||
|
|
||||||
FRONTEND_DIST := internal/frontend/dist
|
FRONTEND_DIST := internal/frontend/dist
|
||||||
|
VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
|
||||||
|
IMAGE ?= mealquest:$(VERSION)
|
||||||
|
LDFLAGS := -s -w -X main.version=$(VERSION)
|
||||||
|
|
||||||
.PHONY: build web embed check-embed-clean
|
.PHONY: dev test go-test web-test build web embed check-embed-clean docker
|
||||||
|
|
||||||
|
# Run both servers; Ctrl-C (or either exiting) stops both. The binary is built
|
||||||
|
# first and run directly because `go run` would orphan its child on kill.
|
||||||
|
dev: SHELL := /bin/bash
|
||||||
|
dev:
|
||||||
|
go build -ldflags "$(LDFLAGS)" -o bin/mealquest-dev ./cmd/server
|
||||||
|
@trap 'kill $$(jobs -p) 2>/dev/null; wait' EXIT; \
|
||||||
|
bin/mealquest-dev & \
|
||||||
|
(cd web && exec npm run dev) & \
|
||||||
|
wait -n
|
||||||
|
|
||||||
|
test: go-test web-test
|
||||||
|
|
||||||
|
go-test:
|
||||||
|
@unformatted="$$(gofmt -l .)"; \
|
||||||
|
if [ -n "$$unformatted" ]; then echo "gofmt needed:"; echo "$$unformatted"; exit 1; fi
|
||||||
|
go vet ./...
|
||||||
|
go test -race ./...
|
||||||
|
|
||||||
|
web-test:
|
||||||
|
cd web && npm ci && npm run typecheck && npm test
|
||||||
|
|
||||||
build: embed
|
build: embed
|
||||||
go build -o bin/mealquest ./cmd/server
|
CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -o bin/mealquest ./cmd/server
|
||||||
|
|
||||||
web:
|
web:
|
||||||
cd web && npm ci && npm run build
|
cd web && npm ci && npm run build
|
||||||
@@ -22,3 +52,6 @@ check-embed-clean:
|
|||||||
touch $(FRONTEND_DIST)/.stale-embed-check
|
touch $(FRONTEND_DIST)/.stale-embed-check
|
||||||
$(MAKE) embed
|
$(MAKE) embed
|
||||||
test ! -e $(FRONTEND_DIST)/.stale-embed-check
|
test ! -e $(FRONTEND_DIST)/.stale-embed-check
|
||||||
|
|
||||||
|
docker:
|
||||||
|
docker build --build-arg VERSION=$(VERSION) -t $(IMAGE) .
|
||||||
|
|||||||
Reference in New Issue
Block a user