diff --git a/api/Dockerfile b/api/Dockerfile index a98f64846..315337b61 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -39,7 +39,7 @@ RUN set -eux; \ openssl-dev \ postgresql-dev \ zlib-dev \ - py3-cryptography=38.0.3-r0 \ + py3-cryptography=38.0.3-r1 \ py3-lxml=4.9.2-r0 \ py3-pillow=9.3.0-r0 \ py3-psycopg2=2.9.5-r0 \ @@ -71,13 +71,13 @@ RUN set -eux; \ ARG install_dev_deps=0 RUN set -eux; \ if [ "$install_dev_deps" = "1" ] ; then \ -   grep -Ev 'cryptography|lxml|pillow|psycopg2|watchfiles' /dev-requirements.txt \ -   | pip3 install -r /dev/stdin \ -   cryptography==38.0.3 \ -   lxml==4.9.2 \ -   pillow==9.3.0 \ -   psycopg2==2.9.5 \ -   watchfiles==0.18.1; \ + grep -Ev 'cryptography|lxml|pillow|psycopg2|watchfiles' /dev-requirements.txt \ + | pip3 install -r /dev/stdin \ + cryptography==38.0.3 \ + lxml==4.9.2 \ + pillow==9.3.0 \ + psycopg2==2.9.5 \ + watchfiles==0.18.1; \ fi FROM alpine:3.17 as image @@ -97,7 +97,7 @@ RUN set -eux; \ libpq \ libxml2 \ libxslt \ - py3-cryptography=38.0.3-r0 \ + py3-cryptography=38.0.3-r1 \ py3-lxml=4.9.2-r0 \ py3-pillow=9.3.0-r0 \ py3-psycopg2=2.9.5-r0 \ diff --git a/api/funkwhale_api/music/fake_data.py b/api/funkwhale_api/music/fake_data.py index 4264947ca..204060404 100644 --- a/api/funkwhale_api/music/fake_data.py +++ b/api/funkwhale_api/music/fake_data.py @@ -15,7 +15,10 @@ def create_data(count=25): ) for album in albums: factories.UploadFactory.create_batch( - track__album=album, size=random.randint(3, 18) + track__album=album, + size=random.randint(3, 18), + playable=True, + in_place=True, ) diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev index 0a931289b..35c9e8288 100644 --- a/docker/nginx/conf.dev +++ b/docker/nginx/conf.dev @@ -144,5 +144,10 @@ http { location /manifest.json { return 302 /api/v1/instance/spa-manifest.json; } + + location /staticfiles/ { + alias /staticfiles/; + } + } }