From 311e3eab884adc1b1257c46fdf12e2bae90df099 Mon Sep 17 00:00:00 2001
From: "Gerber, Mike" <mike.gerber@sbb.spk-berlin.de>
Date: Fri, 25 Sep 2020 16:11:11 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Consistently=20use=20pip=20insta?=
 =?UTF-8?q?ll=20--use-feature=3D2020-resolver?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile-core                  | 3 ++-
 Dockerfile-dinglehopper          | 4 ++--
 Dockerfile-ocrd_calamari         | 4 +++-
 Dockerfile-ocrd_olena            | 4 +++-
 Dockerfile-ocrd_tesserocr        | 4 ++--
 Dockerfile-sbb_textline_detector | 4 ++--
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Dockerfile-core b/Dockerfile-core
index da4a850..9c85cf6 100644
--- a/Dockerfile-core
+++ b/Dockerfile-core
@@ -1,5 +1,6 @@
 FROM ubuntu:18.04
 
+ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
 ENV PIP_DEFAULT_TIMEOUT=120
 
@@ -35,7 +36,7 @@ RUN curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
 
 
 # Install pip installable-stuff
-RUN pip3 install --no-cache-dir \
+RUN ${PIP_INSTALL} \
         'ocrd >= 2.13.1'
 
 
diff --git a/Dockerfile-dinglehopper b/Dockerfile-dinglehopper
index dfa9c1a..3f45fd3 100644
--- a/Dockerfile-dinglehopper
+++ b/Dockerfile-dinglehopper
@@ -1,11 +1,11 @@
 FROM my_ocrd_workflow-core
 
-
+ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
 ENV DINGLEHOPPER_COMMIT 2b98f69
 
 
 # Build pip installable stuff
-RUN pip3 install --no-cache-dir \
+RUN ${PIP_INSTALL} \
 # Now the real stuff:
     https://github.com/qurator-spk/dinglehopper/archive/$DINGLEHOPPER_COMMIT.tar.gz
 
diff --git a/Dockerfile-ocrd_calamari b/Dockerfile-ocrd_calamari
index 209a2d8..8393cb8 100644
--- a/Dockerfile-ocrd_calamari
+++ b/Dockerfile-ocrd_calamari
@@ -1,8 +1,10 @@
 FROM my_ocrd_workflow-core
 
+ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
+
 
 # Build pip installable stuff
-RUN pip3 install --no-cache-dir \
+RUN ${PIP_INSTALL} \
 # Resolve conflicts early:
         'tensorflow-gpu == 1.15.*' \
         'calamari-ocr == 0.3.5' \
diff --git a/Dockerfile-ocrd_olena b/Dockerfile-ocrd_olena
index 25b447d..fc135e6 100644
--- a/Dockerfile-ocrd_olena
+++ b/Dockerfile-ocrd_olena
@@ -1,7 +1,9 @@
 FROM my_ocrd_workflow-core
 
+ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
 ENV OCRD_OLENA_VERSION 1.2.0
 
+
 # Build ocrd_olena
 RUN apt-get update && \
     apt-get install -y \
@@ -19,7 +21,7 @@ RUN curl -sSL --retry 3 -o ocrd_olena.tar.gz https://github.com/OCR-D/ocrd_olena
    tar xvz -C ocrd_olena --strip-components=1 -f ocrd_olena.tar.gz && \
    cd ocrd_olena && \
    sed -i 's/^install: deps$/install:/' Makefile && \
-   pip3 install --no-cache-dir --use-feature=2020-resolver ocrd && \
+   ${PIP_INSTALL} ocrd && \
    make install PREFIX=/usr/local && \
    cd .. && rm -rf ocrd_olena ocrd_olena.tar.gz
 
diff --git a/Dockerfile-ocrd_tesserocr b/Dockerfile-ocrd_tesserocr
index 92cb263..18be723 100644
--- a/Dockerfile-ocrd_tesserocr
+++ b/Dockerfile-ocrd_tesserocr
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-
+ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
 ENV TESSDATA_BEST_VERSION 4.0.0
 ENV TESSDATA_PREFIX /usr/local/share/tessdata
 
@@ -22,7 +22,7 @@ COPY data/tesseract-models/GT4HistOCR/GT4HistOCR_2000000.traineddata $TESSDATA_P
 
 
 # Build pip installable stuff
-RUN pip3 install --no-cache-dir \
+RUN ${PIP_INSTALL} \
 # Now the real stuff:
     'ocrd_tesserocr >= 0.9.0'
 
diff --git a/Dockerfile-sbb_textline_detector b/Dockerfile-sbb_textline_detector
index cc9f8ac..b6fd79b 100644
--- a/Dockerfile-sbb_textline_detector
+++ b/Dockerfile-sbb_textline_detector
@@ -1,11 +1,11 @@
 FROM my_ocrd_workflow-core
 
-
+ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
 ENV SBB_TEXTLINE_DETECTOR_COMMIT 0f09f4a
 
 
 # Build pip installable stuff
-RUN pip3 install --no-cache-dir \
+RUN ${PIP_INSTALL} \
 # Now the real stuff:
     https://github.com/qurator-spk/sbb_textline_detector/archive/$SBB_TEXTLINE_DETECTOR_COMMIT.tar.gz