dtoro
fc63b1f69d
The CORS allowed-origins list, host port mappings, log level, container
timezone, and worker concurrency are now all driven by environment
variables with sane defaults. Same-origin access through the nginx
proxy keeps working with no config; direct cross-origin backend
access can be locked down via ALLOWED_ORIGINS.
- backend/config: ALLOWED_ORIGINS env (comma-separated, "*" for any)
exposed via settings.cors_origins. LOG_LEVEL too.
- backend/main: build the CORS middleware from settings.cors_origins,
auto-disable allow_credentials when origins is wildcard (CORS spec
forbids credentials + "*").
- docker-compose: parameterize FRONTEND_PORT, BACKEND_PORT, REDIS_PORT,
CELERYD_CONCURRENCY, LOG_LEVEL, and TZ via ${VAR:-default} so each
has a working fallback if the .env entry is missing.
- .env.example: new template documenting every knob with examples.
- .env: pruned to only the values that diverge from .env.example;
removed dead VITE_API_URL.
- README: configuration knobs table + "accessing from another machine"
section explaining the same-origin proxy story.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
105 lines
3.1 KiB
YAML
105 lines
3.1 KiB
YAML
version: '3.8'
|
|
|
|
services:
|
|
frontend:
|
|
build:
|
|
context: ./frontend
|
|
dockerfile: Dockerfile
|
|
container_name: mulita-frontend
|
|
ports:
|
|
# Host port is configurable via FRONTEND_PORT in .env so multiple
|
|
# instances / other services on the same host don't collide.
|
|
- "${FRONTEND_PORT:-3000}:80"
|
|
depends_on:
|
|
- backend
|
|
networks:
|
|
- mulita-network
|
|
restart: unless-stopped
|
|
|
|
backend:
|
|
build:
|
|
context: ./backend
|
|
dockerfile: Dockerfile
|
|
container_name: mulita-backend
|
|
ports:
|
|
# Direct backend access on the host is rarely needed (the frontend
|
|
# talks to it through the nginx /api proxy on the same network),
|
|
# but it's exposed for debugging / curl. Override with BACKEND_PORT.
|
|
- "${BACKEND_PORT:-8001}:8000"
|
|
volumes:
|
|
- ./mulita.yml:/app/config/mulita.yml:ro
|
|
# The single host → container mount for your photo library. Set
|
|
# PHOTO_DIRS in .env to your library root. Mounted :rw because file
|
|
# operations (rename, move, empty discard pile) need to mutate the
|
|
# filesystem; flip to :ro for a strict read-only library and the
|
|
# write endpoints will return EROFS.
|
|
- ${PHOTO_DIRS:-./photos}:/photos:rw
|
|
- thumbs_data:/data/thumbs
|
|
- proxies_data:/data/proxies
|
|
- db_data:/data/db
|
|
environment:
|
|
- DATABASE_URL=sqlite+aiosqlite:////data/db/mulita.db
|
|
- REDIS_URL=redis://redis:6379
|
|
- CELERY_BROKER_URL=redis://redis:6379
|
|
- CELERY_RESULT_BACKEND=redis://redis:6379
|
|
- PHOTO_DIRS=${PHOTO_DIRS:-/photos}
|
|
- ALLOWED_ORIGINS=${ALLOWED_ORIGINS:-*}
|
|
- LOG_LEVEL=${LOG_LEVEL:-INFO}
|
|
- TZ=${TZ:-UTC}
|
|
depends_on:
|
|
- redis
|
|
networks:
|
|
- mulita-network
|
|
restart: unless-stopped
|
|
|
|
worker:
|
|
build:
|
|
context: ./backend
|
|
dockerfile: Dockerfile
|
|
container_name: mulita-worker
|
|
command: celery -A app.tasks.celery worker --loglevel=${LOG_LEVEL:-info} --concurrency=${CELERYD_CONCURRENCY:-4}
|
|
volumes:
|
|
- ./mulita.yml:/app/config/mulita.yml:ro
|
|
- ${PHOTO_DIRS:-./photos}:/photos:rw
|
|
- thumbs_data:/data/thumbs
|
|
- proxies_data:/data/proxies
|
|
- db_data:/data/db
|
|
environment:
|
|
- DATABASE_URL=sqlite+aiosqlite:////data/db/mulita.db
|
|
- REDIS_URL=redis://redis:6379
|
|
- CELERY_BROKER_URL=redis://redis:6379
|
|
- CELERY_RESULT_BACKEND=redis://redis:6379
|
|
- PHOTO_DIRS=${PHOTO_DIRS:-/photos}
|
|
- CELERYD_CONCURRENCY=${CELERYD_CONCURRENCY:-4}
|
|
- LOG_LEVEL=${LOG_LEVEL:-INFO}
|
|
- TZ=${TZ:-UTC}
|
|
depends_on:
|
|
- redis
|
|
- backend
|
|
networks:
|
|
- mulita-network
|
|
restart: unless-stopped
|
|
|
|
redis:
|
|
image: redis:7-alpine
|
|
container_name: mulita-redis
|
|
# Host port exposed only for local debugging; the backend / worker
|
|
# reach Redis via the internal mulita-network on its container name.
|
|
ports:
|
|
- "${REDIS_PORT:-6379}:6379"
|
|
volumes:
|
|
- redis_data:/data
|
|
networks:
|
|
- mulita-network
|
|
restart: unless-stopped
|
|
command: redis-server --appendonly yes
|
|
|
|
networks:
|
|
mulita-network:
|
|
driver: bridge
|
|
|
|
volumes:
|
|
thumbs_data:
|
|
proxies_data:
|
|
db_data:
|
|
redis_data: |