Merge pull request #3 from JMR-dev/feat-mvp

Feat mvp

Makefile

@@ -1,8 +1,12 @@
 # idea-collect — developer tasks
-# Override COMPOSE with `podman compose` or `podman-compose` if you prefer Podman locally.
-COMPOSE ?= docker compose
+# Dev mirrors production: everything runs under rootless Podman.
 DB_URL  ?= postgres://idea:idea@localhost:5432/idea?sslmode=disable
 
+# Dev Postgres (rootless Podman). Same image as the production quadlet.
+PG_IMAGE     ?= docker.io/library/postgres:18
+PG_CONTAINER ?= idea-collect-db
+PG_VOLUME    ?= idea-collect-pgdata
+
 .DEFAULT_GOAL := help
 
 .PHONY: help
@@ -12,12 +16,18 @@ help: ## Show this help
 
 ## ---- Database ----
 .PHONY: db-up db-down db-logs
-db-up: ## Start Postgres 18 (dev)
-	$(COMPOSE) -f compose.dev.yml up -d db
-db-down: ## Stop dev Postgres (keeps volume)
-	$(COMPOSE) -f compose.dev.yml down
+db-up: ## Start Postgres 18 (rootless Podman; idempotent)
+	podman run -d --replace --name $(PG_CONTAINER) \
+		-e POSTGRES_USER=idea -e POSTGRES_PASSWORD=idea -e POSTGRES_DB=idea \
+		-p 5432:5432 \
+		-v $(PG_VOLUME):/var/lib/postgresql \
+		--health-cmd 'pg_isready -U idea -d idea' \
+		--health-interval 5s --health-retries 10 \
+		$(PG_IMAGE)
+db-down: ## Stop and remove dev Postgres (keeps the data volume)
+	-podman rm -f -t 5 $(PG_CONTAINER)
 db-logs: ## Tail Postgres logs
-	$(COMPOSE) -f compose.dev.yml logs -f db
+	podman logs -f $(PG_CONTAINER)
 
 ## ---- Backend ----
 .PHONY: backend-run backend-build backend-test admin
@@ -46,9 +56,8 @@ e2e: db-up ## Start DB then run backend (use frontend-dev in another shell)
 	$(MAKE) backend-run
 
 ## ---- Containers ----
-# Use podman locally to mirror production; override with ENGINE=docker.
-ENGINE ?= podman
+# Rootless Podman mirrors production (the quadlets load these same images).
 .PHONY: images
 images: ## Build the backend + custom Caddy images
-	$(ENGINE) build -t localhost/idea-collect-backend:latest -f backend/Containerfile backend
-	$(ENGINE) build -t localhost/idea-collect-caddy:latest deploy/caddy
+	podman build -t localhost/idea-collect-backend:latest -f backend/Containerfile backend
+	podman build -t localhost/idea-collect-caddy:latest deploy/caddy

README.md

@@ -35,10 +35,10 @@ deploy/
 
 ## Quick start (local dev)
 
-Prerequisites: Go 1.26+, Node 20+, Podman or Docker.
+Prerequisites: Go 1.26+, Node 20+, rootless Podman.
 
 ```bash
-# 1. Start Postgres 18
+# 1. Start Postgres 18 (rootless Podman; mirrors the production quadlet)
 make db-up
 
 # 2. Run the backend (applies migrations on startup)

backend/go.mod

@@ -3,8 +3,8 @@ module github.com/jasonross/idea-collect/backend
 go 1.26
 
 require (
-	github.com/golang-jwt/jwt/v5 v5.2.1
-	github.com/jackc/pgx/v5 v5.7.2
+	github.com/golang-jwt/jwt/v5 v5.2.2
+	github.com/jackc/pgx/v5 v5.9.2
 	golang.org/x/time v0.9.0
 )
 
@@ -12,7 +12,6 @@ require (
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
 )

backend/go.sum

@@ -1,14 +1,14 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
+github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.2 h1:mLoDLV6sonKlvjIEsV56SkWNCnuNv531l94GaIzO+XI=
-github.com/jackc/pgx/v5 v5.7.2/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
+github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw=
+github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -16,14 +16,12 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
 golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
 golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

compose.dev.yml

@@ -1,20 +0,0 @@
-# Local development only. Production uses Podman quadlets in deploy/quadlets/.
-services:
-  db:
-    image: postgres:18
-    environment:
-      POSTGRES_USER: idea
-      POSTGRES_PASSWORD: idea
-      POSTGRES_DB: idea
-    ports:
-      - "5432:5432"
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U idea -d idea"]
-      interval: 5s
-      timeout: 5s
-      retries: 10
-
-volumes:
-  pgdata:

deploy/quadlets/postgres.container

@@ -7,7 +7,9 @@ After=network-online.target
 Image=docker.io/library/postgres:18
 ContainerName=postgres
 Network=idea-collect.network
-Volume=idea-pgdata.volume:/var/lib/postgresql/data:Z
+# Mount the parent so postgres:18 stores data in its version-specific subdir
+# (/var/lib/postgresql/18/...), which keeps in-place pg_upgrade possible.
+Volume=idea-pgdata.volume:/var/lib/postgresql:Z
 EnvironmentFile=%h/idea-collect/secrets/postgres.env
 # Only reachable inside idea-collect.network; no PublishPort.
 HealthCmd=pg_isready -U idea -d idea

deploy/secrets-examples/postgres.env.example

@@ -1,5 +1,6 @@
 # -> %h/idea-collect/secrets/postgres.env (rendered by Ansible from vault)
+# No PGDATA: the postgres:18 image defaults to a version-specific subdir under
+# the mounted /var/lib/postgresql volume (see deploy/quadlets/postgres.container).
 POSTGRES_USER=idea
 POSTGRES_PASSWORD=change-me-strong
 POSTGRES_DB=idea
-PGDATA=/var/lib/postgresql/data