Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
jovuit
funkwhale
Commits
c116fa21
Verified
Commit
c116fa21
authored
Feb 04, 2020
by
Eliot Berriot
Browse files
Fixed docker dependency issues
parent
b07cc4c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
api/Dockerfile
View file @
c116fa21
...
...
@@ -19,20 +19,9 @@ RUN \
libffi-dev
\
make
\
zlib-dev
\
openldap-dev
\
jpeg-dev \
zlib-dev \
freetype-dev \
lcms2-dev \
openjpeg-dev \
tiff-dev \
tk-dev \
tcl-dev \
harfbuzz-dev \
fribidi-dev \
openldap-dev
\
&&
\
\
\
ln
-s
/usr/bin/python3 /usr/bin/python
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
ENV
PIP_DOWNLOAD_CACHE=/noop/
RUN
\
echo
'fixing requirements file for alpine'
&&
\
sed
-i
'/Pillow/d'
/requirements/base.txt
&&
\
\
echo
'installing pip requirements'
&&
\
pip3
install
--upgrade
pip
&&
\
pip3
install
setuptools wheel
&&
\
...
...
api/requirements/base.txt
View file @
c116fa21
...
...
@@ -33,7 +33,7 @@ djangorestframework>=3.10,<3.11
djangorestframework-jwt>=1.11,<1.12
pendulum>=2,<3
persisting-theory>=0.2,<0.3
django-versatileimagefield>=
1.1
0,<
1
.1
1
django-versatileimagefield>=
2.
0,<
2
.1
django-filter>=2.1,<2.2
django-rest-auth>=0.9,<0.10
ipython>=7,<8
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment