🚧 Update to CUDA 12.1 (10.x is not available anymore)

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"

Dockerfile-core-cuda10.1

@@ -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']

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"

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"

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"

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

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"
 

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"

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"

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 ubuntu:22.04
-  docker pull nvidia/cuda:10.0-cudnn7-runtime-ubuntu18.04
+  docker pull nvidia/cuda:12.1.0-cudnn8-runtime-ubuntu22.04
-  docker pull nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04
 fi
 
 for sub_image in $sub_images; do