coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pgbouncer port and activate DB split
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 7m29s
Details

Browse Source 
edoburu/pgbouncer listens on 5432, not 6432. Update all DATABASE_URL
entries to use pgbouncer:5432. Activate per-app DATABASE_URL split
(no longer commented out).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-02-25 10:59:51 +00:00
parent 961067841e
commit 50a9e5d952
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
docker-compose.yml
View File

@@ -10,8 +10,8 @@ x-app-common: &app-common
- /root/rose-ash/_config/app-config.yaml:/app/config/app-config.yaml:ro - /root/rose-ash/_config/app-config.yaml:/app/config/app-config.yaml:ro
x-app-env: &app-env x-app-env: &app-env
DATABASE_URL_ACCOUNT: postgresql+asyncpg://postgres:change-me@pgbouncer:6432/db_account DATABASE_URL_ACCOUNT: postgresql+asyncpg://postgres:change-me@pgbouncer:5432/db_account
DATABASE_URL_FEDERATION: postgresql+asyncpg://postgres:change-me@pgbouncer:6432/db_federation DATABASE_URL_FEDERATION: postgresql+asyncpg://postgres:change-me@pgbouncer:5432/db_federation
SMTP_HOST: ${SMTP_HOST} SMTP_HOST: ${SMTP_HOST}
SMTP_PORT: ${SMTP_PORT} SMTP_PORT: ${SMTP_PORT}
MAIL_FROM: ${MAIL_FROM} MAIL_FROM: ${MAIL_FROM}
@@ -56,7 +56,7 @@ services:
dockerfile: blog/Dockerfile dockerfile: blog/Dockerfile
environment: environment:
<<: *app-env <<: *app-env
DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:6432/db_blog DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:5432/db_blog
ALEMBIC_DATABASE_URL: postgresql+psycopg://postgres:change-me@db:5432/db_blog ALEMBIC_DATABASE_URL: postgresql+psycopg://postgres:change-me@db:5432/db_blog
REDIS_URL: redis://redis:6379/0 REDIS_URL: redis://redis:6379/0
DATABASE_HOST: db DATABASE_HOST: db
@@ -74,7 +74,7 @@ services:
- /root/rose-ash/_snapshot:/app/_snapshot - /root/rose-ash/_snapshot:/app/_snapshot
environment: environment:
<<: *app-env <<: *app-env
DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:6432/db_market DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:5432/db_market
REDIS_URL: redis://redis:6379/1 REDIS_URL: redis://redis:6379/1
DATABASE_HOST: db DATABASE_HOST: db
DATABASE_PORT: "5432" DATABASE_PORT: "5432"
@@ -87,7 +87,7 @@ services:
dockerfile: cart/Dockerfile dockerfile: cart/Dockerfile
environment: environment:
<<: *app-env <<: *app-env
DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:6432/db_cart DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:5432/db_cart
REDIS_URL: redis://redis:6379/2 REDIS_URL: redis://redis:6379/2
DATABASE_HOST: db DATABASE_HOST: db
DATABASE_PORT: "5432" DATABASE_PORT: "5432"
@@ -100,7 +100,7 @@ services:
dockerfile: events/Dockerfile dockerfile: events/Dockerfile
environment: environment:
<<: *app-env <<: *app-env
DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:6432/db_events DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:5432/db_events
REDIS_URL: redis://redis:6379/3 REDIS_URL: redis://redis:6379/3
DATABASE_HOST: db DATABASE_HOST: db
DATABASE_PORT: "5432" DATABASE_PORT: "5432"
@@ -113,7 +113,7 @@ services:
dockerfile: federation/Dockerfile dockerfile: federation/Dockerfile
environment: environment:
<<: *app-env <<: *app-env
DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:6432/db_federation DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:5432/db_federation
REDIS_URL: redis://redis:6379/4 REDIS_URL: redis://redis:6379/4
DATABASE_HOST: db DATABASE_HOST: db
DATABASE_PORT: "5432" DATABASE_PORT: "5432"
@@ -126,7 +126,7 @@ services:
dockerfile: account/Dockerfile dockerfile: account/Dockerfile
environment: environment:
<<: *app-env <<: *app-env
DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:6432/db_account DATABASE_URL: postgresql+asyncpg://postgres:change-me@pgbouncer:5432/db_account
REDIS_URL: redis://redis:6379/5 REDIS_URL: redis://redis:6379/5
DATABASE_HOST: db DATABASE_HOST: db
DATABASE_PORT: "5432" DATABASE_PORT: "5432"
@@ -151,17 +151,17 @@ services:
- node.labels.gpu != true - node.labels.gpu != true
pgbouncer: pgbouncer:
image: bitnami/pgbouncer:latest image: edoburu/pgbouncer:latest
environment: environment:
POSTGRESQL_HOST: db DB_HOST: db
POSTGRESQL_PORT: "5432" DB_PORT: "5432"
POSTGRESQL_USERNAME: ${POSTGRES_USER:-postgres} DB_USER: ${POSTGRES_USER:-postgres}
POSTGRESQL_PASSWORD: ${POSTGRES_PASSWORD:-change-me} DB_PASSWORD: ${POSTGRES_PASSWORD:-change-me}
POSTGRESQL_DATABASE: "*" POOL_MODE: transaction
PGBOUNCER_POOL_MODE: transaction DEFAULT_POOL_SIZE: "20"
PGBOUNCER_DEFAULT_POOL_SIZE: "20" MAX_CLIENT_CONN: "300"
PGBOUNCER_MAX_CLIENT_CONN: "300" MIN_POOL_SIZE: "5"
PGBOUNCER_MIN_POOL_SIZE: "5" AUTH_TYPE: plain
networks: networks:
appnet: appnet:
deploy: deploy: