246eff196e
- generate-config.sh
- Add flags: --no-clean, --reset-ssl, --ssl-mode (letsencrypt|self-signed|provided)
- Stop deleting docker/ssl by default; only wipe on explicit --reset-ssl
- Inject ACME webroot route into HTTP (80) server; create docker/letsencrypt-www
- Default SSL_MODE: full=letsencrypt, private/public=self-signed
- Add enable_https_if_cert_present: append 443 server only when server-cert.pem/server-key.pem exist
- Keep self-signed path generating HTTPS immediately (non-basic)
- docker-compose.yml
- Mount ./docker/letsencrypt-www:/var/www/certbot:ro for Nginx ACME challenges
- deploy.sh
- Add --le-email for Let’s Encrypt account email
- Auto-install certbot once (apt-get) and enable systemd timer if available
- Install deploy hook at /etc/letsencrypt/renewal-hooks/deploy/privydrop-reload.sh to:
- Copy renewed certs into docker/ssl
- Hot-reload Nginx; HUP or restart coturn
- First-time issuance (webroot) for <domain> and turn.<domain> after Nginx:80 is up; copy certs
- Re-run generate-config with --no-clean --ssl-mode letsencrypt to enable 443, then reload Nginx
- Behavior changes
- Full mode prefers Let’s Encrypt by default; HTTPS gets enabled as soon as certs exist
- docker/ssl is no longer wiped by config generation
- Notes
- SNI-based turns:443 is not implemented yet (planned)
- Backward compatible with private/public (self-signed)
139 lines
3.5 KiB
YAML
139 lines
3.5 KiB
YAML
services:
|
|
# Redis缓存服务
|
|
redis:
|
|
image: redis:7-alpine
|
|
container_name: privydrop-redis
|
|
restart: unless-stopped
|
|
command: redis-server --appendonly yes --maxmemory 256mb --maxmemory-policy allkeys-lru
|
|
volumes:
|
|
- redis_data:/data
|
|
networks:
|
|
- privydrop-network
|
|
healthcheck:
|
|
test: ["CMD", "redis-cli", "ping"]
|
|
interval: 10s
|
|
timeout: 3s
|
|
retries: 3
|
|
start_period: 5s
|
|
|
|
# 后端信令服务
|
|
backend:
|
|
build:
|
|
context: ./backend
|
|
dockerfile: Dockerfile
|
|
args:
|
|
- HTTP_PROXY=${HTTP_PROXY}
|
|
- HTTPS_PROXY=${HTTPS_PROXY}
|
|
- NO_PROXY=${NO_PROXY}
|
|
container_name: privydrop-backend
|
|
restart: unless-stopped
|
|
environment:
|
|
- NODE_ENV=production
|
|
- BACKEND_PORT=3001
|
|
- REDIS_HOST=redis
|
|
- REDIS_PORT=6379
|
|
- CORS_ORIGIN=${CORS_ORIGIN:-http://localhost}
|
|
ports:
|
|
- "${BACKEND_PORT:-3001}:3001"
|
|
depends_on:
|
|
redis:
|
|
condition: service_healthy
|
|
networks:
|
|
- privydrop-network
|
|
volumes:
|
|
- ./logs:/app/logs
|
|
healthcheck:
|
|
test: ["CMD", "node", "health-check.js"]
|
|
interval: 30s
|
|
timeout: 10s
|
|
retries: 3
|
|
start_period: 40s
|
|
|
|
# 前端应用
|
|
frontend:
|
|
build:
|
|
context: ./frontend
|
|
dockerfile: Dockerfile
|
|
args:
|
|
- HTTP_PROXY=${HTTP_PROXY}
|
|
- HTTPS_PROXY=${HTTPS_PROXY}
|
|
- NO_PROXY=${NO_PROXY}
|
|
- NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
|
|
- NEXT_PUBLIC_TURN_HOST=${NEXT_PUBLIC_TURN_HOST}
|
|
- NEXT_PUBLIC_TURN_USERNAME=${NEXT_PUBLIC_TURN_USERNAME}
|
|
- NEXT_PUBLIC_TURN_PASSWORD=${NEXT_PUBLIC_TURN_PASSWORD}
|
|
container_name: privydrop-frontend
|
|
restart: unless-stopped
|
|
environment:
|
|
- NODE_ENV=production
|
|
- NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL:-http://localhost:3001}
|
|
- PORT=3002
|
|
- HOSTNAME=0.0.0.0
|
|
ports:
|
|
- "${FRONTEND_PORT:-3002}:3002"
|
|
depends_on:
|
|
backend:
|
|
condition: service_healthy
|
|
networks:
|
|
- privydrop-network
|
|
healthcheck:
|
|
test: ["CMD", "node", "health-check.js"]
|
|
interval: 30s
|
|
timeout: 10s
|
|
retries: 3
|
|
start_period: 120s
|
|
|
|
# Nginx反向代理
|
|
nginx:
|
|
image: nginx:alpine
|
|
container_name: privydrop-nginx
|
|
restart: unless-stopped
|
|
ports:
|
|
- "${HTTP_PORT:-80}:80"
|
|
- "${HTTPS_PORT:-443}:443"
|
|
volumes:
|
|
- ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
|
|
- ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
|
|
- ./docker/letsencrypt-www:/var/www/certbot:ro
|
|
- ./docker/ssl:/etc/nginx/ssl:ro
|
|
- ./logs/nginx:/var/log/nginx
|
|
depends_on:
|
|
- frontend
|
|
- backend
|
|
networks:
|
|
- privydrop-network
|
|
profiles:
|
|
- nginx
|
|
|
|
# TURN/STUN服务器 (可选,用于NAT穿透)
|
|
coturn:
|
|
image: coturn/coturn:4.6.2
|
|
container_name: privydrop-coturn
|
|
restart: unless-stopped
|
|
ports:
|
|
- "3478:3478/tcp"
|
|
- "3478:3478/udp"
|
|
- "5349:5349/tcp"
|
|
- "5349:5349/udp"
|
|
- "${TURN_MIN_PORT:-49152}-${TURN_MAX_PORT:-49252}:${TURN_MIN_PORT:-49152}-${TURN_MAX_PORT:-49252}/udp"
|
|
volumes:
|
|
- ./docker/coturn/turnserver.conf:/etc/coturn/turnserver.conf:ro
|
|
- ./docker/ssl:/etc/ssl/certs:ro
|
|
- ./logs/coturn:/var/log
|
|
networks:
|
|
- privydrop-network
|
|
profiles:
|
|
- turn
|
|
command: ["-c", "/etc/coturn/turnserver.conf"]
|
|
|
|
networks:
|
|
privydrop-network:
|
|
driver: bridge
|
|
ipam:
|
|
config:
|
|
- subnet: 172.20.0.0/16
|
|
|
|
volumes:
|
|
redis_data:
|
|
driver: local
|