30b0c70bbb
All checks were successful
secrets-guard / encrypted (pull_request) Successful in 6s
PR build (required check) / changes (pull_request) Successful in 8s
shell-lint / shellcheck (pull_request) Successful in 9s
PR build (required check) / validate-observability (pull_request) Has been skipped
PR build (required check) / build-frontend (pull_request) Successful in 1m9s
PR build (required check) / build-backend (pull_request) Successful in 1m44s
PR build (required check) / gate (pull_request) Successful in 2s
main took two direct PRs (#19 shell-lint, #21 the thermograph-daemon Go service) while dev accumulated the ERA5 lake stack; both sides added compose/ stack services and touched the same seams. Resolutions keep both worlds: - compose + Swarm stack: lake AND daemon are sibling services; backend env carries THERMOGRAPH_LAKE_URL and THERMOGRAPH_INTERNAL_TOKEN. - deploy.sh: backend deploys roll (backend lake daemon); all adds frontend. - requirements.txt: websockets/apscheduler stay removed (moved to the Go daemon), duckdb stays (the lake role's engine). Merged tree: backend suite green, both compose configs validate.
55 lines
2.7 KiB
YAML
55 lines
2.7 KiB
YAML
# Dev overlay for the LAN dev server (deploy/deploy-dev.sh):
|
|
#
|
|
# docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d
|
|
#
|
|
# Split-repo adaptation: the monorepo's docker-compose.dev.yml (see
|
|
# thermograph/docker-compose.dev.yml) overlaid a base file where backend and
|
|
# frontend had `build: .` -- dev's whole point there was `--build` in place from
|
|
# the working checkout. This infra repo holds no Dockerfile at all (each service's
|
|
# lives in its own app repo, thermograph-backend / thermograph-frontend), so the
|
|
# base docker-compose.yml already has NO `build:` for either service, only
|
|
# `image: .../${BACKEND_IMAGE_PATH}:${BACKEND_IMAGE_TAG}` (and the frontend
|
|
# equivalent) -- same registry-pull model as prod/beta, just pointed at a dev tag
|
|
# by deploy-dev.sh. This overlay must NOT reintroduce `build:`; it only relaxes
|
|
# resource caps and LAN-exposes a port, same as the monorepo overlay did.
|
|
#
|
|
# Differences from the prod stack (unchanged intent from the monorepo overlay):
|
|
# 1. backend is published on ALL interfaces (0.0.0.0:8137), not loopback, so
|
|
# phones and other devices on the Wi-Fi can reach the dev server directly --
|
|
# dev has no Caddy in front (prod does, which is why the base file binds
|
|
# 127.0.0.1 only).
|
|
# 2. frontend's port publish is dropped entirely -- dev has no Caddy to reach it
|
|
# directly, so it stays compose-internal-only, reached solely through
|
|
# backend's own reverse-proxy fallback (THERMOGRAPH_FRONTEND_BASE_INTERNAL,
|
|
# see backend/web/app.py's _proxy_to_frontend in the backend repo). This
|
|
# keeps the dev stack serving the one URL it always has, at :8137.
|
|
# 3. The CPU caps are removed -- dev runs UNCAPPED (no thread/CPU limits), unlike
|
|
# prod's backend=4 / frontend=2 / db=2 allocation. `!reset` drops the base
|
|
# value (both the top-level `cpus:` and the Swarm-style `deploy.resources`
|
|
# block the base file carries for parity).
|
|
services:
|
|
backend:
|
|
ports: !override
|
|
- "8137:8137"
|
|
cpus: !reset null
|
|
deploy: !reset null
|
|
frontend:
|
|
ports: !reset null
|
|
cpus: !reset null
|
|
deploy: !reset null
|
|
# Same uncapped-on-dev treatment for the daemon; it has no ports to touch
|
|
# (outbound-only in every environment).
|
|
daemon:
|
|
cpus: !reset null
|
|
deploy: !reset null
|
|
db:
|
|
cpus: !reset null
|
|
deploy: !reset null
|
|
lake:
|
|
cpus: !reset null
|
|
deploy: !reset null
|
|
# Uncapped memory on dev too (prod ceilings it at 8g). The Postgres/DuckDB
|
|
# memory *budget* is still the ~8 GB derived by deploy/db/init/20-tuning.sh from
|
|
# the default DB_MEMORY (raise DB_MEMORY to give dev more); shm_size stays (it's
|
|
# required shared memory for parallel query, not a limit).
|
|
mem_limit: !reset null
|