Compare commits
1 Commits
chore/ci-p
...
chore/cont
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f276f0b55e |
12
.env.example
12
.env.example
@@ -1,23 +1,13 @@
|
|||||||
# Copy to .env for `docker compose up --build`. Local-dev runs (cargo run
|
# Copy to .env for `docker compose up --build`. Local-dev runs (cargo run
|
||||||
# / npm run dev) read backend/.env if present, or pick up the variables
|
# / npm run dev) read backend/.env if present, or pick up the variables
|
||||||
# from your shell.
|
# from your shell.
|
||||||
#
|
|
||||||
# Production note: COOKIE_SECURE=true (the default below) makes browsers
|
|
||||||
# refuse to send the session cookie over plain HTTP. Run with a TLS-
|
|
||||||
# terminating reverse proxy (Caddy, Traefik, nginx) in front — the
|
|
||||||
# compose file here doesn't ship one. Local/dev runs without HTTPS
|
|
||||||
# should set COOKIE_SECURE=false.
|
|
||||||
|
|
||||||
# ----- Postgres -----
|
# ----- Postgres -----
|
||||||
# These are read by the Postgres container *and* by DATABASE_URL below;
|
# These are read by the Postgres container *and* by DATABASE_URL below;
|
||||||
# changing them after the first boot won't migrate existing data, so set
|
# changing them after the first boot won't migrate existing data, so set
|
||||||
# them up front for any new deployment.
|
# them up front for any new deployment.
|
||||||
#
|
|
||||||
# POSTGRES_PASSWORD is REQUIRED — docker-compose.yml fails fast if it
|
|
||||||
# isn't set in this file, to prevent a deploy without an .env booting
|
|
||||||
# Postgres with a publicly-known credential.
|
|
||||||
POSTGRES_USER=mangalord
|
POSTGRES_USER=mangalord
|
||||||
POSTGRES_PASSWORD=change-me-to-a-strong-random-string
|
POSTGRES_PASSWORD=mangalord
|
||||||
POSTGRES_DB=mangalord
|
POSTGRES_DB=mangalord
|
||||||
|
|
||||||
# ----- Backend -----
|
# ----- Backend -----
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ name: deploy
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
pull_request:
|
|
||||||
branches: [main]
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -65,10 +63,6 @@ jobs:
|
|||||||
build-and-push:
|
build-and-push:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [test-backend, test-frontend]
|
needs: [test-backend, test-frontend]
|
||||||
# PRs only run the test jobs; build + deploy are reserved for
|
|
||||||
# post-merge pushes to main. Without this gate every PR would push
|
|
||||||
# a tagged image to the registry and SSH-deploy to prod.
|
|
||||||
if: github.event_name != 'pull_request'
|
|
||||||
outputs:
|
outputs:
|
||||||
image_tag: ${{ steps.meta.outputs.image_tag }}
|
image_tag: ${{ steps.meta.outputs.image_tag }}
|
||||||
version: ${{ steps.meta.outputs.version }}
|
version: ${{ steps.meta.outputs.version }}
|
||||||
@@ -123,7 +117,6 @@ jobs:
|
|||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: build-and-push
|
needs: build-and-push
|
||||||
if: github.event_name != 'pull_request'
|
|
||||||
steps:
|
steps:
|
||||||
- name: SSH deploy
|
- name: SSH deploy
|
||||||
uses: appleboy/ssh-action@v1.0.3
|
uses: appleboy/ssh-action@v1.0.3
|
||||||
|
|||||||
@@ -19,12 +19,49 @@ COPY migrations ./migrations
|
|||||||
RUN touch src/main.rs src/lib.rs && cargo build --locked --release
|
RUN touch src/main.rs src/lib.rs && cargo build --locked --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
|
# `curl` is for the container HEALTHCHECK; `ca-certificates` is for
|
||||||
|
# outbound HTTPS (crawler covers/pages).
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends ca-certificates \
|
&& apt-get install -y --no-install-recommends ca-certificates curl \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Non-root runtime user. The API binary doesn't need any root
|
||||||
|
# privilege; the crawler daemon's Chromium launcher uses --no-sandbox
|
||||||
|
# precisely because user-namespace sandboxing is fragile, so dropping
|
||||||
|
# privileges costs nothing operationally and shrinks the blast radius
|
||||||
|
# of any RCE.
|
||||||
|
ARG APP_UID=10001
|
||||||
|
ARG APP_GID=10001
|
||||||
|
RUN groupadd --system --gid ${APP_GID} app \
|
||||||
|
&& useradd --system --uid ${APP_UID} --gid app --home-dir /home/app --create-home --shell /usr/sbin/nologin app
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=builder /app/target/release/mangalord /usr/local/bin/mangalord
|
COPY --from=builder /app/target/release/mangalord /usr/local/bin/mangalord
|
||||||
COPY --from=builder /app/migrations /app/migrations
|
COPY --from=builder /app/migrations /app/migrations
|
||||||
|
|
||||||
ENV STORAGE_DIR=/var/lib/mangalord/storage
|
ENV STORAGE_DIR=/var/lib/mangalord/storage
|
||||||
|
# Pre-create the storage dir so the entrypoint doesn't need to
|
||||||
|
# mkdir-as-root and so the named volume mount inherits the right
|
||||||
|
# ownership.
|
||||||
|
#
|
||||||
|
# UPGRADE NOTE for operators: if you're moving from an older image
|
||||||
|
# that ran as root, the existing `storage-data` volume has files owned
|
||||||
|
# by UID 0 and the new UID-10001 user can't write them. Run once
|
||||||
|
# before the upgrade:
|
||||||
|
# docker compose run --rm --user 0 backend \
|
||||||
|
# chown -R 10001:10001 /var/lib/mangalord/storage
|
||||||
|
# (Postgres is unaffected — that image's `postgres` user UID hasn't
|
||||||
|
# changed.)
|
||||||
|
RUN mkdir -p ${STORAGE_DIR} \
|
||||||
|
&& chown -R app:app ${STORAGE_DIR} /app /home/app
|
||||||
|
|
||||||
|
USER app
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
|
# `--start-period` is generous because first boot runs sqlx::migrate
|
||||||
|
# against postgres which can take a few seconds; subsequent restarts
|
||||||
|
# are sub-second.
|
||||||
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
|
||||||
|
CMD curl -fsS http://localhost:8080/api/v1/health > /dev/null || exit 1
|
||||||
|
|
||||||
CMD ["mangalord"]
|
CMD ["mangalord"]
|
||||||
|
|||||||
@@ -1,15 +1,9 @@
|
|||||||
# Production-like compose. Requires a populated `.env` next to this
|
|
||||||
# file: at minimum POSTGRES_PASSWORD must be set to a non-default
|
|
||||||
# value (the `?required` form below fails fast otherwise). The
|
|
||||||
# frontend container expects HTTPS in front (Caddy/Traefik/nginx)
|
|
||||||
# because COOKIE_SECURE=true browsers will refuse to send the session
|
|
||||||
# cookie over plain HTTP.
|
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:16-alpine
|
image: postgres:16-alpine
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: ${POSTGRES_USER:-mangalord}
|
POSTGRES_USER: ${POSTGRES_USER:-mangalord}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?POSTGRES_PASSWORD must be set in .env}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-mangalord}
|
||||||
POSTGRES_DB: ${POSTGRES_DB:-mangalord}
|
POSTGRES_DB: ${POSTGRES_DB:-mangalord}
|
||||||
volumes:
|
volumes:
|
||||||
- postgres-data:/var/lib/postgresql/data
|
- postgres-data:/var/lib/postgresql/data
|
||||||
@@ -25,7 +19,7 @@ services:
|
|||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgres://${POSTGRES_USER:-mangalord}:${POSTGRES_PASSWORD:?POSTGRES_PASSWORD must be set in .env}@postgres:5432/${POSTGRES_DB:-mangalord}
|
DATABASE_URL: postgres://${POSTGRES_USER:-mangalord}:${POSTGRES_PASSWORD:-mangalord}@postgres:5432/${POSTGRES_DB:-mangalord}
|
||||||
BIND_ADDRESS: 0.0.0.0:8080
|
BIND_ADDRESS: 0.0.0.0:8080
|
||||||
STORAGE_DIR: /var/lib/mangalord/storage
|
STORAGE_DIR: /var/lib/mangalord/storage
|
||||||
RUST_LOG: ${RUST_LOG:-info,mangalord=debug}
|
RUST_LOG: ${RUST_LOG:-info,mangalord=debug}
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
FROM node:22-alpine AS builder
|
FROM node:22-alpine AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY package.json package-lock.json* ./
|
COPY package.json package-lock.json* ./
|
||||||
RUN npm install
|
# `npm ci` installs the locked versions exactly; `npm install` would
|
||||||
|
# silently rewrite package-lock.json mid-build. CI (.gitea/workflows)
|
||||||
|
# also uses `npm ci`, so this keeps the image build deterministic and
|
||||||
|
# matches what the test job validated.
|
||||||
|
RUN npm ci
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
@@ -10,8 +14,20 @@ WORKDIR /app
|
|||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
ENV HOST=0.0.0.0
|
ENV HOST=0.0.0.0
|
||||||
ENV PORT=3000
|
ENV PORT=3000
|
||||||
COPY --from=builder /app/build ./build
|
|
||||||
COPY --from=builder /app/node_modules ./node_modules
|
# node:22-alpine ships a `node` user (UID 1000); use it instead of
|
||||||
COPY --from=builder /app/package.json ./
|
# running the SvelteKit server as root.
|
||||||
|
COPY --from=builder --chown=node:node /app/build ./build
|
||||||
|
COPY --from=builder --chown=node:node /app/node_modules ./node_modules
|
||||||
|
COPY --from=builder --chown=node:node /app/package.json ./
|
||||||
|
|
||||||
|
USER node
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
|
|
||||||
|
# Alpine's busybox `wget` is the canonical lightweight HTTP probe.
|
||||||
|
# `--spider` doesn't follow redirects; `node build` serves a 200 on
|
||||||
|
# `/` for the homepage so this works without a dedicated /health.
|
||||||
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
|
||||||
|
CMD wget -q --spider http://localhost:3000/ || exit 1
|
||||||
|
|
||||||
CMD ["node", "build"]
|
CMD ["node", "build"]
|
||||||
|
|||||||
Reference in New Issue
Block a user