From c116fa21c9af191e45e314b94852251171ecebb7 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 4 Feb 2020 11:43:08 +0100
Subject: [PATCH] Fixed docker dependency issues
---
api/Dockerfile | 16 ++++------------
api/requirements/base.txt | 2 +-
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/api/Dockerfile b/api/Dockerfile
index 130606b41..036330368 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -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 && \
diff --git a/api/requirements/base.txt b/api/requirements/base.txt
index 9cdbb477d..b1921a8f7 100644
--- a/api/requirements/base.txt
+++ b/api/requirements/base.txt
@@ -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.10,<1.11
+django-versatileimagefield>=2.0,<2.1
django-filter>=2.1,<2.2
django-rest-auth>=0.9,<0.10
ipython>=7,<8
--
GitLab