From 3f2de8d31310801451692cd880739f08aeeaeb9c Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Thu, 13 Aug 2020 20:25:19 +0000
Subject: [PATCH] Restore lxml requirement in base image for arkindex_common
---
Dockerfile | 4 ++--
Dockerfile.binary | 2 +-
base/requirements.txt | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 366bebc256..8887025a31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM registry.gitlab.com/arkindex/backend/base:django-3.1 as build
+FROM registry.gitlab.com/arkindex/backend/base:django-3.1-lxml as build
RUN mkdir build
ADD . build
RUN cd build && python3 setup.py sdist
-FROM registry.gitlab.com/arkindex/backend/base:django-3.1
+FROM registry.gitlab.com/arkindex/backend/base:django-3.1-lxml
ARG COMMON_BRANCH=master
ARG COMMON_ID=9855787
diff --git a/Dockerfile.binary b/Dockerfile.binary
index e072406b89..1f9fb3ef15 100644
--- a/Dockerfile.binary
+++ b/Dockerfile.binary
@@ -57,7 +57,7 @@ RUN python -m nuitka \
arkindex/manage.py
# Start over from a clean setup
-FROM registry.gitlab.com/arkindex/backend/base:django-3.1 as build
+FROM registry.gitlab.com/arkindex/backend/base:django-3.1-lxml as build
# Import files from compilation
RUN mkdir /usr/share/arkindex
diff --git a/base/requirements.txt b/base/requirements.txt
index fbbd84f820..36c7c1f660 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -4,6 +4,7 @@ Django==3.1
elasticsearch==6.2.0
hiredis==1.0.0
ijson==2.3
+lxml==4.2.3
openpyxl==2.4.9
psycopg2==2.8.5
python-Levenshtein==0.12.0
--
GitLab