Fix(Docker): dev set-up

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2533>

.env.dev

@@ -12,6 +12,7 @@ FORWARDED_PROTO=http
 LDAP_ENABLED=False
 FUNKWHALE_SPA_HTML_ROOT=http://nginx/
 PYTHONTRACEMALLOC=0
+MEDIA_ROOT=/data/media
 
 # Uncomment this if you're using traefik/https
 # FORCE_HTTPS_URLS=True

docker/nginx/conf.dev

@@ -92,7 +92,7 @@ http {
             add_header Content-Security-Policy "connect-src https: http: 'self'; default-src 'self'; script-src 'self' unpkg.com 'unsafe-inline' 'unsafe-eval'; style-src https: http: 'self' 'unsafe-inline'; img-src https: http: 'self' data:; font-src https: http: 'self' data:; object-src 'none'; media-src https: http: 'self' data:";
             add_header Referrer-Policy "strict-origin-when-cross-origin";
 
-            proxy_pass   http://funkwhale-front/embed.html;
+            proxy_pass   http://funkwhale-front;
             expires 1d;
         }
 
@@ -107,14 +107,6 @@ http {
             proxy_pass   http://funkwhale-api/api/subsonic/rest/;
         }
 
-        location /media/__sized__/ {
-            alias /protected/media/__sized__/;
-        }
-
-        location /media/attachments/ {
-            alias /protected/media/attachments/;
-        }
-
         location /.well-known/ {
             include /etc/nginx/funkwhale_proxy.conf;
             proxy_pass   http://funkwhale-api;

docs/developer/setup/docker.md

@@ -53,6 +53,7 @@ To set up your Docker environment:
    ```text
    MEDIA_URL=http://localhost:8000/media/
    STATIC_URL=http://localhost:8000/staticfiles/
+   MEDIA_ROOT=/data/media
    ```
 
 3. Create a network for federation support