diff --git a/docker-compose.yml b/docker-compose.yml index 18c0524..ca4411c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,39 +27,6 @@ services: # Infrastructure Services # ============================================ - postgres: - image: postgres:16-alpine - container_name: plunk-postgres - restart: unless-stopped - environment: - POSTGRES_DB: plunk - POSTGRES_USER: plunk - POSTGRES_PASSWORD: ${DB_PASSWORD:-changeme123} - volumes: - - postgres_data:/var/lib/postgresql/data - healthcheck: - test: [ "CMD-SHELL", "pg_isready -U plunk" ] - interval: 10s - timeout: 5s - retries: 5 - networks: - - plunk - - redis: - image: redis:7-alpine - container_name: plunk-redis - restart: unless-stopped - command: redis-server --appendonly yes - volumes: - - redis_data:/data - healthcheck: - test: [ "CMD", "redis-cli", "ping" ] - interval: 10s - timeout: 5s - retries: 5 - networks: - - plunk - minio: image: minio/minio:latest container_name: plunk-minio @@ -70,10 +37,10 @@ services: MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-plunkminiopass} volumes: - minio_data:/data - ports: - # Expose Minio API (for S3 operations) and Console (for web UI) - - "${MINIO_API_PORT:-9000}:9000" - - "${MINIO_CONSOLE_PORT:-9001}:9001" + # ports: + # # Expose Minio API (for S3 operations) and Console (for web UI) + # - "${MINIO_API_PORT:-9000}:9000" + # - "${MINIO_CONSOLE_PORT:-9001}:9001" healthcheck: test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ] interval: 30s @@ -88,13 +55,13 @@ services: restart: unless-stopped command: serve environment: - - TZ=UTC + - TZ=CST volumes: - ntfy_cache:/var/cache/ntfy - ntfy_etc:/etc/ntfy - ports: - # Expose ntfy web UI and API - - "${NTFY_PORT:-8080}:80" + # ports: + # # Expose ntfy web UI and API + # - "${NTFY_PORT:-8080}:80" healthcheck: test: [ "CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1" ] interval: 30s @@ -118,11 +85,11 @@ services: NODE_ENV: production # Database - DATABASE_URL: postgresql://plunk:${DB_PASSWORD:-changeme123}@postgres:5432/plunk - DIRECT_DATABASE_URL: postgresql://plunk:${DB_PASSWORD:-changeme123}@postgres:5432/plunk + DATABASE_URL: ${DATABASE_URL} + DIRECT_DATABASE_URL: ${DIRECT_DATABASE_URL} # Redis - REDIS_URL: redis://redis:6379 + REDIS_URL: ${REDIS_URL} # Security JWT_SECRET: ${JWT_SECRET} @@ -214,19 +181,15 @@ services: ports: # SMTP ports (for email relay) - - "${PORT_SECURE:-465}:465" # SMTPS (implicit TLS) - - "${PORT_SUBMISSION:-587}:587" # SMTP Submission (STARTTLS) + # - "${PORT_SECURE:-465}:465" # SMTPS (implicit TLS) + # - "${PORT_SUBMISSION:-587}:587" # SMTP Submission (STARTTLS) # Optional: Expose individual service ports for debugging - # - "8080:8080" # API - # - "3000:3000" # Web - # - "4000:4000" # Landing - # - "1000:1000" # Wiki + - "6000:8080" # API + - "6001:3000" # Web + - "6002:4000" # Landing + # - "6003:1000" # Wiki depends_on: - postgres: - condition: service_healthy - redis: - condition: service_healthy minio: condition: service_healthy ntfy: @@ -244,10 +207,6 @@ services: - plunk volumes: - postgres_data: - driver: local - redis_data: - driver: local minio_data: driver: local plunk_data: