🧹 Don't use pip option --use-feature=2020-resolver anymore

pull/38/head
Gerber, Mike 4 years ago
parent c5088b10e4
commit f05c26232f

@ -1,6 +1,6 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" ARG PIP_INSTALL="pip install --no-cache-dir"
ARG OCRD_VERSION_MINIMUM="2.21.0" ARG OCRD_VERSION_MINIMUM="2.21.0"
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
ENV PIP_DEFAULT_TIMEOUT=120 ENV PIP_DEFAULT_TIMEOUT=120

@ -1,6 +1,6 @@
FROM my_ocrd_workflow-core FROM my_ocrd_workflow-core
ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" ARG PIP_INSTALL="pip install --no-cache-dir"
ARG DINGLEHOPPER_COMMIT="6e47acd" ARG DINGLEHOPPER_COMMIT="6e47acd"

@ -2,7 +2,7 @@ FROM my_ocrd_workflow-core
# XXX https://github.com/OCR-D/core/issues/642 # XXX https://github.com/OCR-D/core/issues/642
#ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" #ARG PIP_INSTALL="pip install --no-cache-dir"
ARG PIP_INSTALL="pip install --no-cache-dir" ARG PIP_INSTALL="pip install --no-cache-dir"
ARG OCRD_CALAMARI_VERSION="1.0.0" ARG OCRD_CALAMARI_VERSION="1.0.0"

@ -1,6 +1,6 @@
FROM my_ocrd_workflow-core FROM my_ocrd_workflow-core
ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" ARG PIP_INSTALL="pip install --no-cache-dir"
# Build pip installable stuff # Build pip installable stuff

@ -1,6 +1,6 @@
FROM my_ocrd_workflow-core FROM my_ocrd_workflow-core
ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" ARG PIP_INSTALL="pip install --no-cache-dir"
ARG OCRD_CIS_VERSION="0.1.5" ARG OCRD_CIS_VERSION="0.1.5"

@ -1,6 +1,6 @@
FROM my_ocrd_workflow-core FROM my_ocrd_workflow-core
ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" ARG PIP_INSTALL="pip install --no-cache-dir"
ARG OCRD_FILEFORMAT_VERSION="0.1.1" ARG OCRD_FILEFORMAT_VERSION="0.1.1"

@ -1,6 +1,6 @@
FROM my_ocrd_workflow-core FROM my_ocrd_workflow-core
ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" ARG PIP_INSTALL="pip install --no-cache-dir"
ARG OCRD_OLENA_VERSION="1.2.0" ARG OCRD_OLENA_VERSION="1.2.0"

@ -1,6 +1,6 @@
FROM my_ocrd_workflow-core FROM my_ocrd_workflow-core
ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" ARG PIP_INSTALL="pip install --no-cache-dir"
ARG TESSDATA_BEST_VERSION="4.0.0" ARG TESSDATA_BEST_VERSION="4.0.0"
ENV TESSDATA_PREFIX /usr/local/share/tessdata ENV TESSDATA_PREFIX /usr/local/share/tessdata

@ -1,6 +1,6 @@
FROM my_ocrd_workflow-core FROM my_ocrd_workflow-core
ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" ARG PIP_INSTALL="pip install --no-cache-dir"
ARG SBB_BINARIZATION_COMMIT="4d145cc" ARG SBB_BINARIZATION_COMMIT="4d145cc"

@ -1,6 +1,6 @@
FROM my_ocrd_workflow-core FROM my_ocrd_workflow-core
ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver" ARG PIP_INSTALL="pip install --no-cache-dir"
ARG SBB_TEXTLINE_DETECTOR_COMMIT="247d5f9" ARG SBB_TEXTLINE_DETECTOR_COMMIT="247d5f9"

Loading…
Cancel
Save