Finish packaging and change to src-based packaging layout, replace caddy with haproxy for performance, and update docker-compose and Dockerfiles for new packaging.

This commit is contained in:
badblocks 2025-05-09 18:39:04 -07:00
parent 959b06c425
commit 762361a21b
210 changed files with 235 additions and 168 deletions

View file

@ -1,26 +1,27 @@
services:
loba:
image: lucaslorentz/caddy-docker-proxy:2.9
image: haproxy:3.1
stop_signal: SIGTERM
ports:
- 8000:8000
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- caddy_data:/data
- ./haproxy/haproxy.dev.cfg:/usr/local/etc/haproxy/haproxy.cfg
depends_on:
- web
web:
build: .
volumes:
#- ./seed:/seed:ro
- ./.env.dev:/.env:ro
#- ./src:/src
- ./seed:/seed:ro
- ./src/pkmntrade_club/accounts/migrations:/app/lib/python3.12/site-packages/pkmntrade_club/accounts/migrations # for makemigrations
- ./src/pkmntrade_club/cards/migrations:/app/lib/python3.12/site-packages/pkmntrade_club/cards/migrations # for makemigrations
- ./src/pkmntrade_club/trades/migrations:/app/lib/python3.12/site-packages/pkmntrade_club/trades/migrations # for makemigrations
- ./src/pkmntrade_club/home/migrations:/app/lib/python3.12/site-packages/pkmntrade_club/home/migrations # for makemigrations
env_file:
- .env.dev
labels:
caddy: ":8000"
caddy.reverse_proxy: "{{upstreams 8000}}"
depends_on:
- db
db:
condition: service_healthy
db:
image: postgres:16
ports:
@ -29,9 +30,11 @@ services:
- postgres_data:/var/lib/postgresql/data/
environment:
- "POSTGRES_HOST_AUTH_METHOD=trust"
healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "postgres"]
interval: 10s
timeout: 5s
retries: 5
volumes:
postgres_data:
labels:
- "db_is_resettable_via_script"
caddy_data:
postgres_data: