Clearview stack: Postgres config + TZ in env, only pin Postgres image

Revert the over-hardcoding: Postgres connection settings (host/port/db/user/
password) and TZ are env vars again. The only value fixed in the compose is the
Postgres image version (functional dependency). No silent defaults remain
(${VAR:?}); POSTGRES_PASSWORD ships empty and must be set in Portainer.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ivo Oskamp 2026-06-19 13:34:24 +02:00
parent f144261a1a
commit ee66a8cfc3
3 changed files with 29 additions and 26 deletions

View File

@ -6,7 +6,7 @@ This file documents changes on the develop branch of this project.
### Changed ### Changed
- Reworked `stack/docker-compose.yml` + `.env` so the stack has **no baked default values**: every per-deployment value is required via `${VAR:?...}`, so `docker compose`/Portainer refuses to start when one is missing instead of falling back to an insecure default (the old `.env` shipped `POSTGRES_PASSWORD=clearview`). Verified: rendering fails with `required variable POSTGRES_PASSWORD is missing a value` when unset. - Reworked `stack/docker-compose.yml` + `.env` so the stack has **no baked default values**: every per-deployment value is required via `${VAR:?...}`, so `docker compose`/Portainer refuses to start when one is missing instead of falling back to an insecure default (the old `.env` shipped `POSTGRES_PASSWORD=clearview`). Verified: rendering fails with `required variable POSTGRES_PASSWORD is missing a value` when unset.
- Fixed structural constants are now hardcoded in the compose file (DB name/user `clearview`, internal host `postgres`, port `5432`, `TZ`), not env vars. The committed `.env` only carries the per-deploy values: `CLEARVIEW_IMAGE_TAG` (dev|latest), `CLEARVIEW_ENV` (dev|prod) and the host ports. Secrets (`POSTGRES_PASSWORD`, optional `ONBOARDING_*`) are documented but intentionally not shipped — they must be set in Portainer's stack environment. - All configurable values stay in the env (referenced via `${VAR:?}`); the **only** thing pinned in the compose is the Postgres image version (`postgres:16-alpine`), since the app's migrations depend on it. Postgres config (`POSTGRES_HOST`/`PORT`/`DB`/`USER`/`PASSWORD`) and `TZ` are env vars. The committed `.env` is the dev baseline (image tag, env, ports, TZ, Postgres host/port/db/user); `POSTGRES_PASSWORD` ships empty (no default — set in Portainer, else the stack won't start) and `ONBOARDING_*` are optional.
- **Per-environment naming**, driven by `CLEARVIEW_ENV`: container names become `clearview-<env>` / `clearview-postgres-<env>` / `clearview-adminer-<env>` and the Postgres data dir `/docker/appdata/clearview-<env>/postgres`, so a dev and a prod stack run side by side without name/volume clashes. The image tag stays its own variable (`CLEARVIEW_IMAGE_TAG`); Compose can't map `latest`→`prod` from a single value, so tag and env are two variables (chosen over `-latest` naming). DB DNS still uses the `postgres` service name, so `DATABASE_URL` is unaffected by the container rename. - **Per-environment naming**, driven by `CLEARVIEW_ENV`: container names become `clearview-<env>` / `clearview-postgres-<env>` / `clearview-adminer-<env>` and the Postgres data dir `/docker/appdata/clearview-<env>/postgres`, so a dev and a prod stack run side by side without name/volume clashes. The image tag stays its own variable (`CLEARVIEW_IMAGE_TAG`); Compose can't map `latest`→`prod` from a single value, so tag and env are two variables (chosen over `-latest` naming). DB DNS still uses the `postgres` service name, so `DATABASE_URL` is unaffected by the container rename.
## 2026-06-19 — Path-prefix routing support (run behind the landing proxy) ## 2026-06-19 — Path-prefix routing support (run behind the landing proxy)

View File

@ -1,28 +1,31 @@
# Clearview stack environment. # Clearview stack environment.
# #
# Only the values that genuinely differ per deployment live here; everything # All per-deployment values live here. The compose references them with
# structural (DB name/user, internal host/port, TZ) is fixed in the compose # ${VAR:?...}, so the stack refuses to start when a required value is missing —
# file. The compose uses ${VAR:?...} for required values, so the stack REFUSES # there are no silent defaults. The only thing pinned in the compose itself is
# to start when a required variable is missing — there are no silent defaults. # the Postgres image version (postgres:16-alpine), because the app's migrations
# depend on it.
# #
# This file is the dev baseline. For the prod stack, override CLEARVIEW_IMAGE_TAG # This is the dev baseline. For the prod stack, override CLEARVIEW_IMAGE_TAG
# (latest), CLEARVIEW_ENV (prod) and the ports in Portainer's stack environment. # (latest), CLEARVIEW_ENV (prod) and the host ports in Portainer's stack
# # environment. CLEARVIEW_ENV drives the container names (clearview-<env>, …) and
# CLEARVIEW_IMAGE_TAG drives the image tag; CLEARVIEW_ENV drives the container # the Postgres data dir (/docker/appdata/clearview-<env>/postgres) so dev and
# names (clearview-<env>, clearview-postgres-<env>, clearview-adminer-<env>) and # prod run side by side.
# the Postgres data dir (/docker/appdata/clearview-<env>/postgres), so a dev and
# a prod stack run side by side without clashing.
CLEARVIEW_IMAGE_TAG=dev CLEARVIEW_IMAGE_TAG=dev
CLEARVIEW_ENV=dev CLEARVIEW_ENV=dev
CLEARVIEW_PORT=8080 CLEARVIEW_PORT=8080
ADMINER_PORT=8081 ADMINER_PORT=8081
TZ=Europe/Amsterdam
# --- Required, NOT shipped here (set in Portainer's stack environment) ------- POSTGRES_HOST=postgres
# The stack will not start until POSTGRES_PASSWORD is provided. POSTGRES_PORT=5432
# POSTGRES_PASSWORD=... POSTGRES_DB=clearview
POSTGRES_USER=clearview
# No default — set this in Portainer's stack environment, or the stack won't start.
POSTGRES_PASSWORD=
# --- Optional: Microsoft onboarding OAuth (leave unset if unused) ------------ # Optional: Microsoft onboarding OAuth (leave blank if unused).
# ONBOARDING_CLIENT_ID=... ONBOARDING_CLIENT_ID=
# ONBOARDING_CLIENT_SECRET=... ONBOARDING_CLIENT_SECRET=
# ONBOARDING_REDIRECT_URI=... ONBOARDING_REDIRECT_URI=

View File

@ -6,8 +6,8 @@ services:
ports: ports:
- "${CLEARVIEW_PORT:?set CLEARVIEW_PORT}:80" - "${CLEARVIEW_PORT:?set CLEARVIEW_PORT}:80"
environment: environment:
TZ: Europe/Amsterdam TZ: ${TZ:?set TZ}
DATABASE_URL: postgresql://clearview:${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD}@postgres:5432/clearview DATABASE_URL: postgresql://${POSTGRES_USER:?set POSTGRES_USER}:${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD}@${POSTGRES_HOST:?set POSTGRES_HOST}:${POSTGRES_PORT:?set POSTGRES_PORT}/${POSTGRES_DB:?set POSTGRES_DB}
ONBOARDING_CLIENT_ID: ${ONBOARDING_CLIENT_ID} ONBOARDING_CLIENT_ID: ${ONBOARDING_CLIENT_ID}
ONBOARDING_CLIENT_SECRET: ${ONBOARDING_CLIENT_SECRET} ONBOARDING_CLIENT_SECRET: ${ONBOARDING_CLIENT_SECRET}
ONBOARDING_REDIRECT_URI: ${ONBOARDING_REDIRECT_URI} ONBOARDING_REDIRECT_URI: ${ONBOARDING_REDIRECT_URI}
@ -20,14 +20,14 @@ services:
container_name: clearview-postgres-${CLEARVIEW_ENV:?set CLEARVIEW_ENV to dev or prod} container_name: clearview-postgres-${CLEARVIEW_ENV:?set CLEARVIEW_ENV to dev or prod}
restart: unless-stopped restart: unless-stopped
environment: environment:
POSTGRES_DB: clearview POSTGRES_DB: ${POSTGRES_DB:?set POSTGRES_DB}
POSTGRES_USER: clearview POSTGRES_USER: ${POSTGRES_USER:?set POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD}
TZ: Europe/Amsterdam TZ: ${TZ:?set TZ}
volumes: volumes:
- /docker/appdata/clearview-${CLEARVIEW_ENV}/postgres:/var/lib/postgresql/data - /docker/appdata/clearview-${CLEARVIEW_ENV}/postgres:/var/lib/postgresql/data
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U clearview -d clearview"] test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
@ -43,4 +43,4 @@ services:
ports: ports:
- "${ADMINER_PORT:?set ADMINER_PORT}:8080" - "${ADMINER_PORT:?set ADMINER_PORT}:8080"
environment: environment:
ADMINER_DEFAULT_SERVER: postgres ADMINER_DEFAULT_SERVER: ${POSTGRES_HOST:?set POSTGRES_HOST}