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 infrastructure/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- ../backend/app:/app/app:ro # Hot reload for code changes
- ../data:/app/config
environment:
- DATABASE_URL=postgresql://truehour:truehour@db:5432/truehour
- DATABASE_URL=${DATABASE_URL:-postgresql://truehour:truehour@db:5432/truehour}
- CONFIG_PATH=/app/config/config.json
- RELOAD=true # Enable uvicorn auto-reload
command: ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
Expand Down
5 changes: 4 additions & 1 deletion infrastructure/docker-compose.ghcr-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
ports:
- "8000:8000"
environment:
- DATABASE_URL=postgresql://truehour:truehour@db:5432/truehour
- DATABASE_URL=${DATABASE_URL:-postgresql://truehour:truehour@db:5432/truehour}
- DB_PATH=/app/data/aircraft.db
- ENABLE_FAA_LOOKUP=${ENABLE_FAA_LOOKUP:-false}
depends_on:
Expand All @@ -39,6 +39,9 @@ services:
- POSTGRES_DB=truehour
- POSTGRES_USER=truehour
- POSTGRES_PASSWORD=truehour
# postgres:18+ moved PGDATA to /var/lib/postgresql/<major>/docker.
# Pin it to the mounted path so the named volume is actually used.
- PGDATA=/var/lib/postgresql/data
volumes:
- postgres_data:/var/lib/postgresql/data
- ./init.sql:/docker-entrypoint-initdb.d/init.sql
Expand Down
5 changes: 4 additions & 1 deletion infrastructure/docker-compose.ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
ports:
- "8000:8000"
environment:
- DATABASE_URL=postgresql://truehour:truehour@db:5432/truehour
- DATABASE_URL=${DATABASE_URL:-postgresql://truehour:truehour@db:5432/truehour}
- DB_PATH=/app/data/aircraft.db
- ENABLE_FAA_LOOKUP=${ENABLE_FAA_LOOKUP:-false}
depends_on:
Expand All @@ -36,6 +36,9 @@ services:
- POSTGRES_DB=truehour
- POSTGRES_USER=truehour
- POSTGRES_PASSWORD=truehour
# postgres:18+ moved PGDATA to /var/lib/postgresql/<major>/docker.
# Pin it to the mounted path so the named volume is actually used.
- PGDATA=/var/lib/postgresql/data
volumes:
- postgres_data:/var/lib/postgresql/data
- ./init.sql:/docker-entrypoint-initdb.d/init.sql
Expand Down
5 changes: 4 additions & 1 deletion infrastructure/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
volumes:
- ../data:/app/config # config.json only
environment:
- DATABASE_URL=postgresql://truehour:truehour@db:5432/truehour
- DATABASE_URL=${DATABASE_URL:-postgresql://truehour:truehour@db:5432/truehour}
- CONFIG_PATH=/app/config/config.json
- ENABLE_FAA_LOOKUP=${ENABLE_FAA_LOOKUP:-false}
depends_on:
Expand All @@ -46,6 +46,9 @@ services:
- POSTGRES_USER=${POSTGRES_USER:-truehour}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-truehour}
- POSTGRES_DB=${POSTGRES_DB:-truehour}
# postgres:18+ moved PGDATA to /var/lib/postgresql/<major>/docker.
# Pin it to the mounted path so the named volume is actually used.
- PGDATA=/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U truehour"]
interval: 5s
Expand Down
Loading