diff --git a/Dockerfile-core b/Dockerfile-core index c4b62fe..c8b60c2 100644 --- a/Dockerfile-core +++ b/Dockerfile-core @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:22.04 ARG PIP_INSTALL="pip install --no-cache-dir" ARG OCRD_VERSION_MINIMUM="2.47.0" diff --git a/Dockerfile-core-cuda10.1 b/Dockerfile-core-cuda10.1 deleted file mode 100644 index bcc48b7..0000000 --- a/Dockerfile-core-cuda10.1 +++ /dev/null @@ -1,53 +0,0 @@ -FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04 - -ARG PIP_INSTALL="pip install --no-cache-dir" -ARG OCRD_VERSION_MINIMUM="2.47.0" -ENV LC_ALL=C.UTF-8 LANG=C.UTF-8 -ENV PIP_DEFAULT_TIMEOUT=120 - - -RUN echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries && \ - apt-get update && \ - apt-get install -y \ - curl xz-utils \ - build-essential python3-dev \ -# For get-pip.py: - python3-distutils \ -# For add-apt-repository: - software-properties-common \ -# XML utils - libxml2-utils \ - xmlstarlet \ -# OCR-D uses ImageMagick for pixel density estimation - imagemagick \ - && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - - -# Set up OCR-D logging -RUN echo "setOverrideLogLevel(os.getenv('LOG_LEVEL', 'INFO'))" >/etc/ocrd_logging.py - - -# Install pip (and setuptools) -# We use get-pip.py here to avoid -# a. having to upgrade from Ubuntu's pip -# b. the dreaded "old script wrapper" error message -RUN curl -sSL https://bootstrap.pypa.io/pip/3.6/get-pip.py -o get-pip.py && \ - python3 get-pip.py && \ - rm -f get-pip.py - - -# Install pip installable-stuff -RUN ${PIP_INSTALL} \ - "ocrd >= ${OCRD_VERSION_MINIMUM}" - - -# Check pip dependencies -RUN pip check - - -WORKDIR /data - -# Default command -CMD ['ocrd'] diff --git a/Dockerfile-core-cuda10.0 b/Dockerfile-core-cuda12.1 similarity index 95% rename from Dockerfile-core-cuda10.0 rename to Dockerfile-core-cuda12.1 index 984f3f5..190e8dc 100644 --- a/Dockerfile-core-cuda10.0 +++ b/Dockerfile-core-cuda12.1 @@ -1,4 +1,4 @@ -FROM nvidia/cuda:10.0-cudnn7-runtime-ubuntu18.04 +FROM nvidia/cuda:12.1.0-cudnn8-runtime-ubuntu22.04 ARG PIP_INSTALL="pip install --no-cache-dir" ARG OCRD_VERSION_MINIMUM="2.47.0" diff --git a/Dockerfile-eynollah b/Dockerfile-eynollah index 7e6c5d1..80a602f 100644 --- a/Dockerfile-eynollah +++ b/Dockerfile-eynollah @@ -1,5 +1,5 @@ ARG GIT_COMMIT="latest" -FROM quratorspk/ocrd-galley-core-cuda10.0:$GIT_COMMIT +FROM quratorspk/ocrd-galley-core-cuda12.1:$GIT_COMMIT ARG PIP_INSTALL="pip install --no-cache-dir" ARG EYNOLLAH_VERSION="0.0.10" diff --git a/Dockerfile-ocrd_anybaseocr b/Dockerfile-ocrd_anybaseocr index 403bfcc..6ce5d0e 100644 --- a/Dockerfile-ocrd_anybaseocr +++ b/Dockerfile-ocrd_anybaseocr @@ -1,5 +1,5 @@ ARG GIT_COMMIT="latest" -FROM quratorspk/ocrd-galley-core-cuda10.1:$GIT_COMMIT +FROM quratorspk/ocrd-galley-core-cuda12.1:$GIT_COMMIT ARG PIP_INSTALL="pip install --no-cache-dir" ARG OCRD_ANYBASEOCR_VERSION="1.8.2" diff --git a/Dockerfile-ocrd_calamari b/Dockerfile-ocrd_calamari index 7926fb7..3b9d9cc 100644 --- a/Dockerfile-ocrd_calamari +++ b/Dockerfile-ocrd_calamari @@ -1,5 +1,5 @@ ARG GIT_COMMIT="latest" -FROM quratorspk/ocrd-galley-core-cuda10.1:$GIT_COMMIT +FROM quratorspk/ocrd-galley-core-cuda12.1:$GIT_COMMIT # XXX https://github.com/OCR-D/core/issues/642 diff --git a/Dockerfile-ocrd_calamari03 b/Dockerfile-ocrd_calamari03 index 10b0646..5a8be3d 100644 --- a/Dockerfile-ocrd_calamari03 +++ b/Dockerfile-ocrd_calamari03 @@ -1,5 +1,5 @@ ARG GIT_COMMIT="latest" -FROM quratorspk/ocrd-galley-core-cuda10.0:$GIT_COMMIT +FROM quratorspk/ocrd-galley-core-cuda12.1:$GIT_COMMIT ARG PIP_INSTALL="pip install --no-cache-dir" diff --git a/Dockerfile-sbb_binarization b/Dockerfile-sbb_binarization index cb70e95..103b8de 100644 --- a/Dockerfile-sbb_binarization +++ b/Dockerfile-sbb_binarization @@ -1,5 +1,5 @@ ARG GIT_COMMIT="latest" -FROM quratorspk/ocrd-galley-core-cuda10.0:$GIT_COMMIT +FROM quratorspk/ocrd-galley-core-cuda12.1:$GIT_COMMIT ARG PIP_INSTALL="pip install --no-cache-dir" ARG SBB_BINARIZATION_VERSION="0.0.10" diff --git a/Dockerfile-sbb_textline_detector b/Dockerfile-sbb_textline_detector index cf17738..0569ab8 100644 --- a/Dockerfile-sbb_textline_detector +++ b/Dockerfile-sbb_textline_detector @@ -1,5 +1,5 @@ ARG GIT_COMMIT="latest" -FROM quratorspk/ocrd-galley-core-cuda10.0:$GIT_COMMIT +FROM quratorspk/ocrd-galley-core-cuda12.1:$GIT_COMMIT ARG PIP_INSTALL="pip install --no-cache-dir" ARG SBB_TEXTLINE_DETECTOR_COMMIT="c4df3d6" diff --git a/build b/build index 5aab176..96835cb 100755 --- a/build +++ b/build @@ -24,9 +24,8 @@ echo # Update base images if we build a core image if echo "$sub_images" | grep -q core; then - docker pull ubuntu:18.04 - docker pull nvidia/cuda:10.0-cudnn7-runtime-ubuntu18.04 - docker pull nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04 + docker pull ubuntu:22.04 + docker pull nvidia/cuda:12.1.0-cudnn8-runtime-ubuntu22.04 fi for sub_image in $sub_images; do