Two prod-readiness hardening changes: DB tuning scales with the container budget. Replace the fixed 8 GB 20-tuning.sql with 20-tuning.sh, which derives shared_buffers (25%), effective_cache_size (75%), work_mem, maintenance_work_mem and duckdb.max_memory (50%) from the DB_MEMORY the compose db service now passes in. The ratios reproduce the historical 8 GB tuning exactly and scale linearly, so the 48 GB prod box (db_memory 16g) gets shared_buffers 4 GB / duckdb 8 GB with no separate edit. Beta/local (8g default) are unchanged. Docs that told operators to raise the tuning by hand are updated. Boot ordering for the self-hosted archive. On an openmeteo host, install a docker.service drop-in (Wants/After rclone-om.service) so Docker starts after the object-storage mount is ready on every boot — the restart-policy containers never bind an empty mount point. rclone-om is Type=notify, so After waits for the mount to actually be ready. Cleaned up when openmeteo is toggled off.
111 lines
5.1 KiB
YAML
111 lines
5.1 KiB
YAML
# Thermograph production stack: the FastAPI app plus its PostgreSQL 18 database.
|
|
#
|
|
# docker compose up -d --build # or: make up
|
|
#
|
|
# POSTGRES_PASSWORD must be set at `docker compose` time — compose reads it from
|
|
# the repo-root .env for local runs (copy .env.example -> .env), and in prod the
|
|
# systemd unit's EnvironmentFile=/etc/thermograph.env puts it in the environment
|
|
# so `docker compose up` can interpolate it. It is used BOTH to initialize the db
|
|
# container and to build the app's THERMOGRAPH_DATABASE_URL below.
|
|
|
|
services:
|
|
db:
|
|
# PostgreSQL 18 + pg_duckdb (deploy/db/Dockerfile.db, FROM pgduckdb/pgduckdb:18-…,
|
|
# which IS PostgreSQL 18). Lets the DB read the app's parquet climate cache
|
|
# directly, e.g. SELECT * FROM read_parquet('/parquet/cache/*.parquet'). The init
|
|
# script CREATE EXTENSIONs pg_duckdb on a fresh volume.
|
|
build:
|
|
context: .
|
|
dockerfile: deploy/db/Dockerfile.db
|
|
environment:
|
|
POSTGRES_USER: thermograph
|
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD}
|
|
POSTGRES_DB: thermograph
|
|
# The init tuning script (deploy/db/init/20-tuning.sh) scales the Postgres +
|
|
# DuckDB memory GUCs from this budget, matching the mem_limit below. One knob
|
|
# per host: Terraform sets DB_MEMORY (prod 16g), local/beta default 8g.
|
|
DB_MEMORY: ${DB_MEMORY:-8g}
|
|
volumes:
|
|
# Mount the volume at the PARENT of the data dir and let the PG18 image use
|
|
# its own versioned subdir (/var/lib/postgresql/18/docker). Pinning PGDATA
|
|
# directly at the mountpoint trips an initdb chmod on some Docker setups; the
|
|
# whole tree still persists on the named volume this way.
|
|
- pgdata:/var/lib/postgresql
|
|
# Read the app's live parquet cache (the same appdata volume the app writes,
|
|
# mounted read-only) — query it under /parquet/cache/*.parquet.
|
|
- appdata:/parquet:ro
|
|
- ./deploy/db/init:/docker-entrypoint-initdb.d
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "pg_isready -U thermograph -d thermograph"]
|
|
interval: 5s
|
|
timeout: 5s
|
|
retries: 10
|
|
# Give Postgres room to cache + process. mem_limit is the hard ceiling; the actual
|
|
# budget is tuned in deploy/db/init/20-tuning.sh, which scales shared_buffers (25%),
|
|
# effective_cache_size (75%), work_mem, maintenance_work_mem and duckdb.max_memory
|
|
# (50%) from DB_MEMORY — so raising DB_MEMORY raises both the cap and the tuning
|
|
# together. shm_size backs parallel-query shared memory (the 64MB docker default is
|
|
# too small once shared_buffers/parallelism grow).
|
|
# Sized via env (Terraform sets DB_CPUS/DB_MEMORY per host); defaults match the
|
|
# historical 2 CPU / 8 GB budget so a plain `docker compose up` is unchanged.
|
|
mem_limit: ${DB_MEMORY:-8g}
|
|
shm_size: 1gb
|
|
# Cap the DB at DB_CPUS CPUs. Compose v2 honors the top-level `cpus:`; the
|
|
# deploy.resources block is the Swarm-style equivalent, kept for parity.
|
|
cpus: ${DB_CPUS:-2}
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
cpus: "${DB_CPUS:-2}"
|
|
# Must match mem_limit above (compose rejects distinct values).
|
|
memory: ${DB_MEMORY:-8g}
|
|
restart: unless-stopped
|
|
# No host port on purpose: the app reaches Postgres as db:5432 on the
|
|
# compose network. Nothing outside the stack should touch the database.
|
|
|
|
app:
|
|
build: .
|
|
depends_on:
|
|
db:
|
|
condition: service_healthy
|
|
environment:
|
|
# Built from POSTGRES_PASSWORD; this `environment` value wins over anything
|
|
# in env_file, so the URL always matches the db container's password.
|
|
THERMOGRAPH_DATABASE_URL: postgresql+asyncpg://thermograph:${POSTGRES_PASSWORD}@db:5432/thermograph
|
|
THERMOGRAPH_BASE: /
|
|
PORT: 8137
|
|
# Worker count is env-driven so Terraform can raise it on a bigger host;
|
|
# defaults to 4 to keep a plain `docker compose up` identical to before.
|
|
WORKERS: ${WORKERS:-4}
|
|
# One worker wins this lock and runs the subscription notifier / homepage
|
|
# sweep; it lives on the appdata volume so it's shared across workers.
|
|
THERMOGRAPH_SINGLETON_LOCK: /app/data/notifier.lock
|
|
# Prod secrets live in /etc/thermograph.env: POSTGRES_PASSWORD,
|
|
# THERMOGRAPH_AUTH_SECRET, THERMOGRAPH_VAPID_PRIVATE_KEY/_PUBLIC_KEY,
|
|
# THERMOGRAPH_COOKIE_SECURE=1, mail/Discord keys, ... (see
|
|
# deploy/thermograph.env.example). `required: false` so local `docker compose
|
|
# up` works without that file — it reads POSTGRES_PASSWORD from repo-root .env.
|
|
env_file:
|
|
- path: /etc/thermograph.env
|
|
required: false
|
|
volumes:
|
|
# Parquet cache, notifier.lock, homepage.json, vapid.json persist here.
|
|
- appdata:/app/data
|
|
- applogs:/app/logs
|
|
# Sized via env (Terraform sets APP_CPUS per host); defaults to 4 CPUs. The
|
|
# deploy.resources block mirrors the top-level `cpus:` for Swarm parity; the
|
|
# dev overlay drops both so dev runs uncapped.
|
|
cpus: ${APP_CPUS:-4}
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
cpus: "${APP_CPUS:-4}"
|
|
ports:
|
|
# Loopback only — host Caddy terminates TLS and reverse-proxies to this.
|
|
- "127.0.0.1:8137:8137"
|
|
restart: unless-stopped
|
|
|
|
volumes:
|
|
pgdata: {}
|
|
appdata: {}
|
|
applogs: {}
|