diff --git a/dev.yml b/dev.yml index 4a61a7a87c014bb0717f070e80ae827fe154489c..b0ca7fc72b80b8ea0d11f02505b1d81a83d57e78 100644 --- a/dev.yml +++ b/dev.yml @@ -49,11 +49,14 @@ services: args: install_dev_deps: 1 entrypoint: compose/django/dev-entrypoint.sh - command: uvicorn --reload config.asgi:application --host 0.0.0.0 --port 5000 --reload-dir config/ --reload-dir=funkwhale_api/ + command: > + bash -c "python manage.py collectstatic --no-input + && uvicorn --reload config.asgi:application --host 0.0.0.0 --port 5000 --reload-dir config/ --reload-dir=funkwhale_api/" volumes: - ./api:/app - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro" - "./data/plugins:/srv/funkwhale/plugins" + - "./data/staticfiles:/staticfiles" environment: - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}" - "FUNKWHALE_HOSTNAME_SUFFIX=funkwhale.test" @@ -61,6 +64,7 @@ services: - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL-http}" - "DATABASE_URL=postgresql://postgres@postgres/postgres" - "CACHE_URL=redis://redis:6379/0" + - "STATIC_ROOT=/staticfiles" depends_on: - postgres @@ -120,6 +124,7 @@ services: - ./deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro - "${MEDIA_ROOT-./api/funkwhale_api/media}:/protected/media:ro" - "./front:/frontend:ro" + - "./data/staticfiles:/staticfiles:ro" networks: - federation - internal diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev index 976c2e4357b5a9cdc5ef389f7742d8ef7ea1114c..95560b6d839010df0525d87c979e1635ae77edcb 100644 --- a/docker/nginx/conf.dev +++ b/docker/nginx/conf.dev @@ -136,5 +136,8 @@ http { internal; alias /music; } + location /staticfiles/ { + alias /staticfiles/; + } } }