MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix(dev): fix docker development set-up (#2102) 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2367>
This commit is contained in:
Marcos Peña 2023-03-17 19:50:10 +01:00 committed by Marge
parent 6edb1624fc
commit c55a1d1da4
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/Dockerfile
View File

@ -39,7 +39,7 @@ RUN set -eux; \
openssl-dev \ openssl-dev \
postgresql-dev \ postgresql-dev \
zlib-dev \ zlib-dev \
py3-cryptography=38.0.3-r0 \ py3-cryptography=38.0.3-r1 \
py3-lxml=4.9.2-r0 \ py3-lxml=4.9.2-r0 \
py3-pillow=9.3.0-r0 \ py3-pillow=9.3.0-r0 \
py3-psycopg2=2.9.5-r0 \ py3-psycopg2=2.9.5-r0 \
@ -71,13 +71,13 @@ RUN set -eux; \
ARG install_dev_deps=0 ARG install_dev_deps=0
RUN set -eux; \ RUN set -eux; \
if [ "$install_dev_deps" = "1" ] ; then \ if [ "$install_dev_deps" = "1" ] ; then \
  grep -Ev 'cryptography|lxml|pillow|psycopg2|watchfiles' /dev-requirements.txt \ grep -Ev 'cryptography|lxml|pillow|psycopg2|watchfiles' /dev-requirements.txt \
  | pip3 install -r /dev/stdin \ | pip3 install -r /dev/stdin \
  cryptography==38.0.3 \ cryptography==38.0.3 \
  lxml==4.9.2 \ lxml==4.9.2 \
  pillow==9.3.0 \ pillow==9.3.0 \
  psycopg2==2.9.5 \ psycopg2==2.9.5 \
  watchfiles==0.18.1; \ watchfiles==0.18.1; \
fi fi
FROM alpine:3.17 as image FROM alpine:3.17 as image
@ -97,7 +97,7 @@ RUN set -eux; \
libpq \ libpq \
libxml2 \ libxml2 \
libxslt \ libxslt \
py3-cryptography=38.0.3-r0 \ py3-cryptography=38.0.3-r1 \
py3-lxml=4.9.2-r0 \ py3-lxml=4.9.2-r0 \
py3-pillow=9.3.0-r0 \ py3-pillow=9.3.0-r0 \
py3-psycopg2=2.9.5-r0 \ py3-psycopg2=2.9.5-r0 \

5
api/funkwhale_api/music/fake_data.py
View File

@ -15,7 +15,10 @@ def create_data(count=25):
) )
for album in albums: for album in albums:
factories.UploadFactory.create_batch( 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,
) )

5
docker/nginx/conf.dev
View File

@ -144,5 +144,10 @@ http {
location /manifest.json { location /manifest.json {
return 302 /api/v1/instance/spa-manifest.json; return 302 /api/v1/instance/spa-manifest.json;
} }
location /staticfiles/ {
alias /staticfiles/;
}
} }
} }