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

Fixed docker dependency issues

This commit is contained in:
Eliot Berriot 2020-02-04 11:43:08 +01:00
parent b07cc4c643
commit c116fa21c9
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/Dockerfile
View File

@ -20,19 +20,8 @@ RUN \
make \ make \
zlib-dev \ zlib-dev \
openldap-dev \ openldap-dev \
jpeg-dev \
zlib-dev \
freetype-dev \
lcms2-dev \
openjpeg-dev \
tiff-dev \
tk-dev \
tcl-dev \
harfbuzz-dev \
fribidi-dev \
&& \ && \
\ \
\
ln -s /usr/bin/python3 /usr/bin/python ln -s /usr/bin/python3 /usr/bin/python
RUN mkdir /requirements RUN mkdir /requirements
@ -40,6 +29,9 @@ COPY ./requirements/base.txt /requirements/base.txt
# hack around https://github.com/pypa/pip/issues/6158#issuecomment-456619072 # hack around https://github.com/pypa/pip/issues/6158#issuecomment-456619072
ENV PIP_DOWNLOAD_CACHE=/noop/ ENV PIP_DOWNLOAD_CACHE=/noop/
RUN \ RUN \
echo 'fixing requirements file for alpine' && \
sed -i '/Pillow/d' /requirements/base.txt && \
\
echo 'installing pip requirements' && \ echo 'installing pip requirements' && \
pip3 install --upgrade pip && \ pip3 install --upgrade pip && \
pip3 install setuptools wheel && \ pip3 install setuptools wheel && \

2
api/requirements/base.txt
View File

@ -33,7 +33,7 @@ djangorestframework>=3.10,<3.11
djangorestframework-jwt>=1.11,<1.12 djangorestframework-jwt>=1.11,<1.12
pendulum>=2,<3 pendulum>=2,<3
persisting-theory>=0.2,<0.3 persisting-theory>=0.2,<0.3
django-versatileimagefield>=1.10,<1.11 django-versatileimagefield>=2.0,<2.1
django-filter>=2.1,<2.2 django-filter>=2.1,<2.2
django-rest-auth>=0.9,<0.10 django-rest-auth>=0.9,<0.10
ipython>=7,<8 ipython>=7,<8