fix: database migration and routing issues for production
Test and Lint / backend-test (push) Successful in 1m19s
Test and Lint / frontend-test (push) Successful in 2m20s
continuous-integration/drone/push Build is passing
Version and Release / version-bump (push) Successful in 38s
Version and Release / trigger-drone (push) Successful in 3s
Test and Lint / backend-test (push) Successful in 1m19s
Test and Lint / frontend-test (push) Successful in 2m20s
continuous-integration/drone/push Build is passing
Version and Release / version-bump (push) Successful in 38s
Version and Release / trigger-drone (push) Successful in 3s
- Add migration to fix email_templates column structure after language migration - Add migration to ensure default email templates exist - Create diagnostic script to check database issues - Fix docker-compose configuration for proper routing without path stripping The backend expects routes with /api prefix, so removing the stripprefix middleware allows proper routing to work. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,131 @@
|
||||
version: '3.8'
|
||||
services:
|
||||
backend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-backend:latest'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- DATABASE_CLIENT=pg
|
||||
- DB_HOST=db
|
||||
- DB_PORT=5432
|
||||
- DB_USER=${DB_USER:-picpeak}
|
||||
- DB_PASSWORD=${DB_PASSWORD}
|
||||
- DB_NAME=${DB_NAME:-picpeak}
|
||||
- PORT=3000
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- ADMIN_URL=https://picpeak.local.nothaft.cloud
|
||||
- FRONTEND_URL=https://picpeak.local.nothaft.cloud
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT}
|
||||
- SMTP_SECURE=${SMTP_SECURE}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASS=${SMTP_PASS}
|
||||
- EMAIL_FROM=${EMAIL_FROM}
|
||||
- UMAMI_URL=${UMAMI_URL}
|
||||
- UMAMI_WEBSITE_ID=${UMAMI_WEBSITE_ID}
|
||||
- STORAGE_PATH=/app/storage
|
||||
- EVENTS_PATH=/app/storage/events
|
||||
- ARCHIVE_PATH=/app/storage/events/archived
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/storage:/app/storage'
|
||||
- '/mnt/DockerMount/picpeak/data:/app/data'
|
||||
- '/mnt/DockerMount/picpeak/logs:/app/logs'
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
# Backend API routing
|
||||
- 'traefik.http.routers.picpeak-backend.rule=(Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)) && PathPrefix(`/api`)'
|
||||
- traefik.http.routers.picpeak-backend.entrypoints=https
|
||||
- traefik.http.routers.picpeak-backend.tls=true
|
||||
- traefik.http.routers.picpeak-backend.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak-backend.loadbalancer.server.port=3000
|
||||
# Strip /api prefix when forwarding to backend
|
||||
- traefik.http.middlewares.picpeak-stripprefix.stripprefix.prefixes=/api
|
||||
- traefik.http.routers.picpeak-backend.middlewares=picpeak-stripprefix
|
||||
# Higher priority for API routes
|
||||
- traefik.http.routers.picpeak-backend.priority=100
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
depends_on:
|
||||
- db
|
||||
|
||||
frontend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-frontend:latest'
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
# Frontend routing (catch-all for non-API routes)
|
||||
- traefik.http.routers.picpeak.rule=Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)
|
||||
- traefik.http.routers.picpeak.entrypoints=https
|
||||
- traefik.http.routers.picpeak.tls=true
|
||||
- traefik.http.routers.picpeak.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak.loadbalancer.server.port=80
|
||||
# Lower priority than backend to ensure /api routes go to backend
|
||||
- traefik.http.routers.picpeak.priority=10
|
||||
|
||||
db:
|
||||
image: 'postgres:14-alpine'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_USER=${DB_USER:-picpeak}
|
||||
- POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
- POSTGRES_DB=${DB_NAME:-picpeak}
|
||||
- POSTGRES_HOST_AUTH_METHOD=scram-sha-256
|
||||
- POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=trust
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/db:/var/lib/postgresql/data'
|
||||
# Mount init script to create umami database
|
||||
- ./docker/postgres-init:/docker-entrypoint-initdb.d:ro
|
||||
networks:
|
||||
- picpeak
|
||||
command: postgres -c ssl=off
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-picpeak}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
# Optional: Umami analytics
|
||||
umami:
|
||||
image: ghcr.io/umami-software/umami:postgresql-latest
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
DATABASE_URL: postgresql://${DB_USER:-picpeak}:${DB_PASSWORD}@db:5432/umami
|
||||
DATABASE_TYPE: postgresql
|
||||
HASH_SALT: ${UMAMI_HASH_SALT}
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
- traefik.http.routers.picpeak-umami.rule=Host(`analytics.picpeak.local.nothaft.cloud`)
|
||||
- traefik.http.routers.picpeak-umami.entrypoints=https
|
||||
- traefik.http.routers.picpeak-umami.tls=true
|
||||
- traefik.http.routers.picpeak-umami.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak-umami.loadbalancer.server.port=3000
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
picpeak:
|
||||
driver: bridge
|
||||
Reference in New Issue
Block a user