Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
--health-timeout 3s
--health-retries 10
postgres:
image: postgres:16-alpine
image: postgres:18-alpine
env:
POSTGRES_USER: tensies
POSTGRES_PASSWORD: tensies
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.design.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ services:
retries: 10

postgres:
image: postgres:16-alpine
image: postgres:18-alpine
environment:
POSTGRES_USER: tensies
POSTGRES_PASSWORD: tensies
Expand Down
11 changes: 8 additions & 3 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,17 @@ services:
restart: unless-stopped

postgres:
image: postgres:16.15-alpine@sha256:721873c34ceb9f8d8fc265984940dc982404c105f19ad51be9fdc5970a6080ea
image: postgres:18.6-alpine@sha256:77f585114c32fbca283dc835b0596f4e52b51b4c6662d7810b2f4084f60a1873
environment:
POSTGRES_USER: tensies
POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD}"
POSTGRES_DB: tensies
volumes:
- pg_data:/var/lib/postgresql/data
# Postgres 18 images keep PGDATA in a versioned subdirectory
# (/var/lib/postgresql/18/docker), so the volume mounts one level up.
# pg18_data is a fresh volume: the 16.x cluster in pg_data is left
# untouched as the rollback copy (data moved by dump/restore).
- pg18_data:/var/lib/postgresql
healthcheck:
test: ["CMD-SHELL", "pg_isready -U tensies"]
interval: 5s
Expand Down Expand Up @@ -220,6 +224,7 @@ networks:
driver: bridge

volumes:
pg_data:
pg_data: # Postgres 16 cluster, kept as the rollback copy
pg18_data:
prom_data:
grafana_data:
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ services:
retries: 10

postgres:
image: postgres:16-alpine
image: postgres:18-alpine
environment:
POSTGRES_USER: tensies
POSTGRES_PASSWORD: tensies
POSTGRES_DB: tensies
volumes:
- pg_data:/var/lib/postgresql/data
- pg18_data:/var/lib/postgresql
ports:
- "5432:5432"
healthcheck:
Expand Down Expand Up @@ -123,6 +123,6 @@ services:
- postgres

volumes:
pg_data:
pg18_data:
prom_data:
grafana_data:
Loading