From c1163405c440d2734a22b95c7a38d6e67c9338b9 Mon Sep 17 00:00:00 2001
From: "Gerber, Mike" <mike.gerber@sbb.spk-berlin.de>
Date: Thu, 19 Nov 2020 18:25:10 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20s/pip3/pip/g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile-core                                | 4 ++--
 Dockerfile-dinglehopper                        | 4 ++--
 Dockerfile-ocrd_calamari                       | 4 ++--
 Dockerfile-ocrd_calamari-feat-update-calamari1 | 6 +++---
 Dockerfile-ocrd_cis                            | 4 ++--
 Dockerfile-ocrd_fileformat                     | 2 +-
 Dockerfile-ocrd_olena                          | 4 ++--
 Dockerfile-ocrd_tesserocr                      | 4 ++--
 Dockerfile-sbb_binarization                    | 4 ++--
 Dockerfile-sbb_textline_detector               | 4 ++--
 my_ocrd_workflow                               | 2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Dockerfile-core b/Dockerfile-core
index d0779ef..56c2c13 100644
--- a/Dockerfile-core
+++ b/Dockerfile-core
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
 ARG OCRD_VERSION_MINIMUM="2.18.1"
 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
 ENV PIP_DEFAULT_TIMEOUT=120
@@ -42,7 +42,7 @@ RUN ${PIP_INSTALL} \
 
 
 # Check pip dependencies
-RUN pip3 check
+RUN pip check
 
 
 WORKDIR /data
diff --git a/Dockerfile-dinglehopper b/Dockerfile-dinglehopper
index 3ab6d7d..a95d487 100644
--- a/Dockerfile-dinglehopper
+++ b/Dockerfile-dinglehopper
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
 ARG DINGLEHOPPER_COMMIT="6e47acd"
 
 
@@ -11,7 +11,7 @@ RUN ${PIP_INSTALL} \
 
 
 # Check pip dependencies
-RUN pip3 check
+RUN pip check
 
 
 # Default command
diff --git a/Dockerfile-ocrd_calamari b/Dockerfile-ocrd_calamari
index 0484c7f..0528737 100644
--- a/Dockerfile-ocrd_calamari
+++ b/Dockerfile-ocrd_calamari
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
 
 
 # Build pip installable stuff
@@ -19,7 +19,7 @@ COPY data/calamari-models/GT4HistOCR/2019-07-22T15_49+0200 /var/lib/calamari-mod
 
 
 # Check pip dependencies
-RUN pip3 check
+RUN pip check
 
 
 # Default command
diff --git a/Dockerfile-ocrd_calamari-feat-update-calamari1 b/Dockerfile-ocrd_calamari-feat-update-calamari1
index ce73ed2..0e45131 100644
--- a/Dockerfile-ocrd_calamari-feat-update-calamari1
+++ b/Dockerfile-ocrd_calamari-feat-update-calamari1
@@ -2,8 +2,8 @@ FROM my_ocrd_workflow-core
 
 
 # XXX https://github.com/OCR-D/core/issues/642
-#ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
-ARG PIP_INSTALL="pip3 install --no-cache-dir"
+#ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 
 
 # Build pip installable stuff
@@ -19,7 +19,7 @@ COPY data/calamari-models/GT4HistOCR/2019-12-11T11_10+0100 /var/lib/calamari-mod
 
 # Check pip dependencies
 # XXX https://github.com/OCR-D/core/issues/642
-#RUN pip3 check
+#RUN pip check
 
 
 # Default command
diff --git a/Dockerfile-ocrd_cis b/Dockerfile-ocrd_cis
index 73ccb76..9cb02bd 100644
--- a/Dockerfile-ocrd_cis
+++ b/Dockerfile-ocrd_cis
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
 ARG OCRD_CIS_VERSION="0.1.5"
 
 
@@ -11,7 +11,7 @@ RUN ${PIP_INSTALL} \
 
 
 # Check pip dependencies
-RUN pip3 check
+RUN pip check
 
 
 # Default command
diff --git a/Dockerfile-ocrd_fileformat b/Dockerfile-ocrd_fileformat
index 8981cf3..c1a2180 100644
--- a/Dockerfile-ocrd_fileformat
+++ b/Dockerfile-ocrd_fileformat
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
 ARG OCRD_FILEFORMAT_VERSION="0.1.1"
 
 
diff --git a/Dockerfile-ocrd_olena b/Dockerfile-ocrd_olena
index da45673..644ad4e 100644
--- a/Dockerfile-ocrd_olena
+++ b/Dockerfile-ocrd_olena
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
 ARG OCRD_OLENA_VERSION="1.2.0"
 
 
@@ -27,7 +27,7 @@ RUN curl -sSL --retry 3 -o ocrd_olena.tar.gz https://github.com/OCR-D/ocrd_olena
 
 
 # Check pip dependencies
-RUN pip3 check
+RUN pip check
 
 
 # Default command
diff --git a/Dockerfile-ocrd_tesserocr b/Dockerfile-ocrd_tesserocr
index b9aca74..d16f1f7 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"
+ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
 ARG TESSDATA_BEST_VERSION="4.0.0"
 ENV TESSDATA_PREFIX /usr/local/share/tessdata
 
@@ -28,7 +28,7 @@ RUN ${PIP_INSTALL} \
 
 
 # Check pip dependencies
-RUN pip3 check
+RUN pip check
 
 
 # Default command
diff --git a/Dockerfile-sbb_binarization b/Dockerfile-sbb_binarization
index ca903bc..6ee301d 100644
--- a/Dockerfile-sbb_binarization
+++ b/Dockerfile-sbb_binarization
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
 ARG SBB_BINARIZATION_COMMIT="4d145cc"
 
 
@@ -15,7 +15,7 @@ COPY data/sbb_binarization /var/lib/sbb_binarization
 
 
 # Check pip dependencies
-RUN pip3 check
+RUN pip check
 
 
 # Default command
diff --git a/Dockerfile-sbb_textline_detector b/Dockerfile-sbb_textline_detector
index 47022c4..d445bb8 100644
--- a/Dockerfile-sbb_textline_detector
+++ b/Dockerfile-sbb_textline_detector
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
 ARG SBB_TEXTLINE_DETECTOR_COMMIT="247d5f9"
 
 
@@ -16,7 +16,7 @@ COPY data/textline_detection /var/lib/textline_detection
 
 
 # Check pip dependencies
-RUN pip3 check
+RUN pip check
 
 
 # Default command
diff --git a/my_ocrd_workflow b/my_ocrd_workflow
index a032678..50d2724 100755
--- a/my_ocrd_workflow
+++ b/my_ocrd_workflow
@@ -85,7 +85,7 @@ main() {
 
 
 if [ "$LOG_LEVEL" = "DEBUG" -o "$LOG_LEVEL" = "TRACE" ]; then
-  pip3 list || true
+  pip list || true
 fi
 main