fix(server): 👷 pass errors down to controller

This commit is contained in:
Amruth Pillai
2023-11-06 09:41:06 +01:00
parent 4f5ccb9ab8
commit a88a794f29
6 changed files with 237 additions and 236 deletions

View File

@@ -7,7 +7,7 @@ version: "3"
services:
# Database (Postgres)
postgres:
image: postgres
image: postgres:alpine
restart: unless-stopped
ports:
- ${POSTGRES_PORT:-5432}:5432
@@ -18,7 +18,7 @@ services:
POSTGRES_USER: ${POSTGRES_USER:-postgres}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
healthcheck:
test: ["CMD", "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-postgres}"]
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-postgres}"]
interval: 10s
timeout: 5s
retries: 5
@@ -38,12 +38,6 @@ services:
MINIO_CONSOLE_ADDRESS: :9001
MINIO_ROOT_USER: ${STORAGE_ACCESS_KEY:-minioadmin}
MINIO_ROOT_PASSWORD: ${STORAGE_SECRET_KEY:-minioadmin}
healthcheck:
test: ["CMD", "curl -f http://minio:9000/minio/health/live"]
start_period: 40s
interval: 30s
timeout: 10s
retries: 3
# Chrome Browser (for printing and previews)
chrome:
@@ -58,7 +52,7 @@ services:
# Redis (for cache & server session management)
redis:
image: redis
image: redis:alpine
restart: unless-stopped
command: redis-server --requirepass ${REDIS_PASSWORD:-password}
ports:

View File

@@ -7,7 +7,7 @@ version: "3"
services:
# Database (Postgres)
postgres:
image: postgres
image: postgres:alpine
restart: unless-stopped
volumes:
- postgres_data:/var/lib/postgresql/data
@@ -16,7 +16,7 @@ services:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
healthcheck:
test: ["CMD", "pg_isready -U postgres -d postgres"]
test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
interval: 10s
timeout: 5s
retries: 5
@@ -45,7 +45,7 @@ services:
# Redis (for cache & server session management)
redis:
image: redis
image: redis:alpine
restart: unless-stopped
command: redis-server --requirepass password
@@ -69,8 +69,8 @@ services:
STORAGE_URL: http://localhost:9000
# -- Printer (Chrome) --
CHROME_URL: ws://chrome:3000
CHROME_TOKEN: chrome_token
CHROME_URL: ws://chrome:3000
# -- Database (Postgres) --
DATABASE_URL: postgresql://postgres:postgres@postgres:5432/postgres

View File

@@ -8,7 +8,7 @@ version: "3"
services:
# Database (Postgres)
postgres:
image: postgres
image: postgres:alpine
restart: unless-stopped
volumes:
- postgres_data:/var/lib/postgresql/data
@@ -17,7 +17,7 @@ services:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
healthcheck:
test: ["CMD", "pg_isready -U postgres -d postgres"]
test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
interval: 10s
timeout: 5s
retries: 5
@@ -33,11 +33,11 @@ services:
MINIO_ROOT_USER: minioadmin
MINIO_ROOT_PASSWORD: minioadmin
labels:
- traefik.enable
- traefik.http.routers.app.rule=Host(`storage.example.com`)
- traefik.http.routers.app.entrypoints=websecure
- traefik.http.routers.app.tls.certresolver=letsencrypt
- traefik.http.services.app.loadbalancer.server.port=9000
- traefik.enable=true
- traefik.http.routers.storage.rule=Host(`storage.example.com`)
- traefik.http.routers.storage.entrypoints=websecure
- traefik.http.routers.storage.tls.certresolver=letsencrypt
- traefik.http.services.storage.loadbalancer.server.port=9000
# Chrome Browser (for printing and previews)
chrome:
@@ -47,10 +47,16 @@ services:
TOKEN: chrome_token
EXIT_ON_HEALTH_FAILURE: true
PRE_REQUEST_HEALTH_CHECK: true
labels:
- traefik.enable=true
- traefik.http.routers.printer.rule=Host(`printer.example.com`)
- traefik.http.routers.printer.entrypoints=websecure
- traefik.http.routers.printer.tls.certresolver=letsencrypt
- traefik.http.services.printer.loadbalancer.server.port=3000
# Redis (for cache & server session management)
redis:
image: redis
image: redis:alpine
restart: unless-stopped
command: redis-server --save 60 1 --loglevel warning --requirepass password
volumes:
@@ -70,12 +76,12 @@ services:
NODE_ENV: production
# -- URLs --
PUBLIC_URL: http://example.com
STORAGE_URL: http://storage.example.com
PUBLIC_URL: https://example.com
STORAGE_URL: https://storage.example.com
# -- Printer (Chrome) --
CHROME_URL: ws://chrome:3000
CHROME_TOKEN: chrome_token
CHROME_URL: wss://printer.example.com
# -- Database (Postgres) --
DATABASE_URL: postgresql://postgres:postgres@postgres:5432/postgres
@@ -111,22 +117,21 @@ services:
GOOGLE_CLIENT_SECRET: google_client_secret
GOOGLE_CALLBACK_URL: http://localhost:3000/api/auth/google/callback
labels:
- traefik.enable
- traefik.enable=true
- traefik.http.routers.app.rule=Host(`example.com`)
- traefik.http.routers.app.entrypoints=websecure
- traefik.http.routers.app.tls
- traefik.http.routers.app.tls.certresolver=letsencrypt
- traefik.http.services.app.loadbalancer.server.port=3000
traefik:
image: traefik
command:
- --api
- --providers.docker
- --api=true
- --providers.docker=true
- --providers.docker.exposedbydefault=false
- --entrypoints.web.address=:80
- --entrypoints.websecure.address=:443
- --certificatesresolvers.letsencrypt.acme.tlschallenge
- --certificatesresolvers.letsencrypt.acme.tlschallenge=true
- --certificatesresolvers.letsencrypt.acme.email=noreply@example.com
- --certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json

View File

@@ -8,7 +8,7 @@ version: "3"
services:
# Database (Postgres)
postgres:
image: postgres
image: postgres:alpine
restart: unless-stopped
volumes:
- postgres_data:/var/lib/postgresql/data
@@ -17,7 +17,7 @@ services:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
healthcheck:
test: ["CMD", "pg_isready -U postgres -d postgres"]
test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
interval: 10s
timeout: 5s
retries: 5
@@ -34,8 +34,8 @@ services:
MINIO_ROOT_PASSWORD: minioadmin
labels:
- traefik.enable=true
- traefik.http.routers.minio.rule=Host(`storage.example.com`)
- traefik.http.services.minio.loadbalancer.server.port=9000
- traefik.http.routers.storage.rule=Host(`storage.example.com`)
- traefik.http.services.storage.loadbalancer.server.port=9000
# Chrome Browser (for printing and previews)
chrome:
@@ -45,10 +45,14 @@ services:
TOKEN: chrome_token
EXIT_ON_HEALTH_FAILURE: true
PRE_REQUEST_HEALTH_CHECK: true
labels:
- traefik.enable=true
- traefik.http.routers.printer.rule=Host(`printer.example.com`)
- traefik.http.services.printer.loadbalancer.server.port=3000
# Redis (for cache & server session management)
redis:
image: redis
image: redis:alpine
restart: unless-stopped
command: redis-server --requirepass password
@@ -70,8 +74,8 @@ services:
STORAGE_URL: http://storage.example.com
# -- Printer (Chrome) --
CHROME_URL: ws://chrome:3000
CHROME_TOKEN: chrome_token
CHROME_URL: ws://chrome:3000
# -- Database (Postgres) --
DATABASE_URL: postgresql://postgres:postgres@postgres:5432/postgres
@@ -115,7 +119,7 @@ services:
image: traefik
command:
- --api.insecure=true
- --providers.docker
- --providers.docker=true
- --providers.docker.exposedbydefault=false
- --entrypoints.web.address=:80
ports: