mirror of
https://github.com/Dvorinka/Trackeep.git
synced 2026-06-03 20:12:58 +00:00
feat: migrate to DragonflyDB and clean up environment configuration
- Replace Redis with DragonflyDB for better performance and memory efficiency - Remove redundant environment variables (POSTGRES_*, ENCRYPTION_KEY, OAUTH_SERVICE_URL) - Consolidate database configuration to use single DB_* variables - Use JWT_SECRET for both JWT tokens and encryption - Remove PORT variable redundancy, use BACKEND_PORT consistently - Clean up docker-compose configurations for dev/prod consistency - Add DragonflyDB configuration with optimized memory usage - Remove redis.conf as it's no longer needed - Update health checks to use Redis-compatible CLI for DragonflyDB
This commit is contained in:
+31
-5
@@ -6,9 +6,9 @@ services:
|
||||
POSTGRES_USER: ${DB_USER:-trackeep}
|
||||
POSTGRES_PASSWORD: ${DB_PASSWORD:?DB_PASSWORD is required}
|
||||
ports:
|
||||
- "5432:5432"
|
||||
- "${DB_PORT:-5432}:5432"
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
- postgres_data:/var/lib/postgres/data
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-trackeep} -d ${DB_NAME:-trackeep}"]
|
||||
@@ -17,16 +17,38 @@ services:
|
||||
retries: 5
|
||||
start_period: 30s
|
||||
|
||||
dragonfly:
|
||||
image: ghcr.io/dragonflydb/dragonfly:latest
|
||||
container_name: dragonfly
|
||||
ports:
|
||||
- "${DRAGONFLY_PORT:-6379}:6379"
|
||||
volumes:
|
||||
- dragonfly_data:/data
|
||||
command: dragonfly --requirepass=${DRAGONFLY_PASSWORD} --proactor_threads=2
|
||||
environment:
|
||||
- DRAGONFLY_PASSWORD=${DRAGONFLY_PASSWORD}
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "redis-cli -a ${DRAGONFLY_PASSWORD} ping"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 30s
|
||||
|
||||
trackeep-backend:
|
||||
build:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
ports:
|
||||
- "${PORT:-8080}:8080"
|
||||
- "${BACKEND_PORT:-8080}:${BACKEND_PORT:-8080}"
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
- APP_VERSION=${APP_VERSION:-1.0.0}
|
||||
- BACKEND_PORT=${BACKEND_PORT:-8080}
|
||||
- FRONTEND_PORT=${FRONTEND_PORT:-8080}
|
||||
- DRAGONFLY_ADDR=${DRAGONFLY_ADDR:-dragonfly:6379}
|
||||
- DRAGONFLY_PASSWORD=${DRAGONFLY_PASSWORD}
|
||||
volumes:
|
||||
- ./data:/data
|
||||
- ./uploads:/app/uploads
|
||||
@@ -35,8 +57,10 @@ services:
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
dragonfly:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/health || wget --no-verbose --tries=1 --spider http://localhost:8080/live"]
|
||||
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:${BACKEND_PORT:-8080}/health || wget --no-verbose --tries=1 --spider http://localhost:${BACKEND_PORT:-8080}/live"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
@@ -50,11 +74,12 @@ services:
|
||||
- VITE_DEMO_MODE=${VITE_DEMO_MODE:-false}
|
||||
- VITE_API_URL=${VITE_API_URL:-http://localhost:8080}
|
||||
ports:
|
||||
- "5173:80"
|
||||
- "${FRONTEND_PORT:-3000}:${FRONTEND_PORT:-3000}"
|
||||
environment:
|
||||
- VITE_APP_VERSION=${APP_VERSION:-1.0.0}
|
||||
- VITE_DEMO_MODE=${VITE_DEMO_MODE:-false}
|
||||
- VITE_API_URL=${VITE_API_URL:-http://localhost:8080}
|
||||
- FRONTEND_PORT=${FRONTEND_PORT:-3000}
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock # Docker socket for updates
|
||||
depends_on:
|
||||
@@ -70,3 +95,4 @@ services:
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
dragonfly_data:
|
||||
|
||||
Reference in New Issue
Block a user