From 9ece352659638d9ffe6ae0696a146155fad7990a Mon Sep 17 00:00:00 2001 From: knacky Date: Fri, 22 May 2026 19:41:38 +0200 Subject: [PATCH] chore(backend): rename docker-compose.yml -> compose.yml + podman notes Compose v2 canonical filename (compose.yml) is recognized by both docker compose and podman compose without preference. The previous docker-compose.yml worked but signalled a Docker-first stance, while target deployment is Podman 5.8+ rootless. - Rename backend/docker-compose.yml -> backend/compose.yml. - backend/README.md `make db-up` comment uses $(CONTAINER) to mirror the Makefile auto-detect (lines 14-16: docker || podman). - backend/README.md audit-writer bootstrap snippet hints at podman fallback explicitly with `command -v` runtime sniff. - backend/compose.yml comment for audit-writer mentions both runtimes. No functional change. Makefile $(COMPOSE) target unchanged: Compose v2 discovers compose.yml first in its search order. --- backend/README.md | 6 ++++-- backend/{docker-compose.yml => compose.yml} | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) rename backend/{docker-compose.yml => compose.yml} (92%) diff --git a/backend/README.md b/backend/README.md index 88bae7f..8566904 100644 --- a/backend/README.md +++ b/backend/README.md @@ -34,7 +34,7 @@ backend/ ```bash make install # uv venv + pip install -e .[dev] -make db-up # docker compose up -d postgres +make db-up # $(CONTAINER) compose up -d postgres (auto-detect docker|podman) make db-bootstrap # one-time: create the mimic_audit_writer role (see below) make db-migrate # alembic upgrade head make run # flask run (debug) @@ -49,7 +49,9 @@ make lint # ruff + mypy strict (decision D-010). For local development, create it manually after `make db-up`: ```bash -docker exec -it mimic-postgres psql -U mimic_app -d mimic \ +# Substitute "podman" for "docker" if your runtime is Podman. +$(command -v docker || command -v podman) exec -it mimic-postgres \ + psql -U mimic_app -d mimic \ -c "CREATE ROLE mimic_audit_writer LOGIN PASSWORD 'pick-a-dev-secret';" ``` diff --git a/backend/docker-compose.yml b/backend/compose.yml similarity index 92% rename from backend/docker-compose.yml rename to backend/compose.yml index 54e6c70..c069d68 100644 --- a/backend/docker-compose.yml +++ b/backend/compose.yml @@ -12,7 +12,8 @@ services: volumes: - mimic_pgdata:/var/lib/postgresql/data # The `mimic_audit_writer` role is provisioned by the Ansible playbook - # in prod (D-010). For dev, create it manually after `make db-up`: + # in prod (D-010). For dev, create it manually after `make db-up` + # (substitute `podman` for `docker` if your runtime is Podman): # docker exec -it mimic-postgres psql -U mimic_app -d mimic \ # -c "CREATE ROLE mimic_audit_writer LOGIN PASSWORD '';" # Then expose the same secret in MIMIC_DATABASE_AUDIT_URL in your .env.