stan/esports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatted

Browse Source
This commit is contained in:
Stan Runge
2026-03-13 17:03:12 +01:00
parent c9fc1f0190
commit 6a0bb9061d
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docker-compose.staging.yml
View File

@@ -27,9 +27,9 @@ services:
volumes: volumes:
- pgdata-staging:/var/lib/postgresql/data - pgdata-staging:/var/lib/postgresql/data
ports: ports:
- "127.0.0.1:5433:5432" - '127.0.0.1:5433:5432'
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U vash_staging -d vash_staging"] test: ['CMD-SHELL', 'pg_isready -U vash_staging -d vash_staging']
interval: 2s interval: 2s
timeout: 3s timeout: 3s
retries: 10 retries: 10
@@ -44,7 +44,7 @@ services:
staging-db: staging-db:
condition: service_healthy condition: service_healthy
ports: ports:
- "127.0.0.1:3002:3000" - '127.0.0.1:3002:3000'
environment: environment:
DATABASE_URL: postgresql://vash_staging:${STAGING_DB_PASSWORD}@staging-db:5432/vash_staging DATABASE_URL: postgresql://vash_staging:${STAGING_DB_PASSWORD}@staging-db:5432/vash_staging
ORIGIN: https://esports-staging.vash.software ORIGIN: https://esports-staging.vash.software
@@ -67,10 +67,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"bun", 'bun',
"-e", '-e',
"fetch('http://localhost:3000/api/health').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))", "fetch('http://localhost:3000/api/health').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))"
] ]
interval: 5s interval: 5s
timeout: 3s timeout: 3s

24
docker-compose.yml
View File

@@ -9,9 +9,9 @@ services:
volumes: volumes:
- pgdata:/var/lib/postgresql/data - pgdata:/var/lib/postgresql/data
ports: ports:
- "127.0.0.1:5432:5432" # Only accessible from host - '127.0.0.1:5432:5432' # Only accessible from host
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U vash -d vash"] test: ['CMD-SHELL', 'pg_isready -U vash -d vash']
interval: 2s interval: 2s
timeout: 3s timeout: 3s
retries: 10 retries: 10
@@ -25,7 +25,7 @@ services:
db: db:
condition: service_healthy condition: service_healthy
ports: ports:
- "127.0.0.1:3000:3000" # Only accessible from host (nginx proxies) - '127.0.0.1:3000:3000' # Only accessible from host (nginx proxies)
environment: environment:
DATABASE_URL: postgresql://vash:***REMOVED***@db:5432/vash DATABASE_URL: postgresql://vash:***REMOVED***@db:5432/vash
ORIGIN: ${ORIGIN:-https://esports.vash.software} ORIGIN: ${ORIGIN:-https://esports.vash.software}
@@ -40,10 +40,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"bun", 'bun',
"-e", '-e',
"fetch('http://localhost:3000/api/health').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))", "fetch('http://localhost:3000/api/health').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))"
] ]
interval: 5s interval: 5s
timeout: 3s timeout: 3s
@@ -60,7 +60,7 @@ services:
volumes: volumes:
- umamidata:/var/lib/postgresql/data - umamidata:/var/lib/postgresql/data
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U umami -d umami"] test: ['CMD-SHELL', 'pg_isready -U umami -d umami']
interval: 2s interval: 2s
timeout: 3s timeout: 3s
retries: 10 retries: 10
@@ -73,16 +73,12 @@ services:
umami-db: umami-db:
condition: service_healthy condition: service_healthy
ports: ports:
- "127.0.0.1:3001:3000" # Proxy via nginx at e.g. analytics.vash.software - '127.0.0.1:3001:3000' # Proxy via nginx at e.g. analytics.vash.software
environment: environment:
DATABASE_URL: postgresql://umami:${UMAMI_DB_PASSWORD}@umami-db:5432/umami DATABASE_URL: postgresql://umami:${UMAMI_DB_PASSWORD}@umami-db:5432/umami
APP_SECRET: ${UMAMI_APP_SECRET} APP_SECRET: ${UMAMI_APP_SECRET}
healthcheck: healthcheck:
test: test: ['CMD-SHELL', 'wget -q -O /dev/null http://localhost:3000/api/heartbeat || exit 1']
[
"CMD-SHELL",
"wget -q -O /dev/null http://localhost:3000/api/heartbeat || exit 1",
]
interval: 15s interval: 15s
timeout: 5s timeout: 5s
retries: 5 retries: 5