Merge branch 'pr-1008' into reduce-cuda

Dockerfile

@@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV PYTHONIOENCODING utf8
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
-ENV PIP=pip3
+ENV PIP=pip
 
 WORKDIR /build-ocrd
 COPY ocrd ./ocrd
@@ -25,7 +25,6 @@ RUN apt-get update && apt-get -y install software-properties-common \
     && apt-get update && apt-get -y install \
         ca-certificates \
         python3-dev \
-        python3-pip \
         python3-venv \
         gcc \
         make \
@@ -35,8 +34,9 @@ RUN apt-get update && apt-get -y install software-properties-common \
         sudo \
         git \
     && make deps-ubuntu \
-    && pip3 install --upgrade pip setuptools \
+    && python3 -m venv /usr/local \
     && hash -r \
+    && pip install --upgrade pip setuptools \
     && make install \
     && eval $FIXUP \
     && rm -rf /build-ocrd
@@ -50,14 +50,14 @@ RUN if echo $BASE_IMAGE | fgrep -q cuda; then \
     pip3 install nvidia-cufft-cu11 && \
     pip3 install nvidia-cuda-runtime-cu11 && \
     pip3 install nvidia-cuda-nvrtc-cu11 && \
-    echo /usr/local/lib/python3.8/dist-packages/nvidia/cudnn/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
-    echo /usr/local/lib/python3.8/dist-packages/nvidia/cublas/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
-    echo /usr/local/lib/python3.8/dist-packages/nvidia/cusparse/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
-    echo /usr/local/lib/python3.8/dist-packages/nvidia/cusolver/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
-    echo /usr/local/lib/python3.8/dist-packages/nvidia/curand/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
-    echo /usr/local/lib/python3.8/dist-packages/nvidia/cufft/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
-    echo /usr/local/lib/python3.8/dist-packages/nvidia/cuda_runtime/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
-    echo /usr/local/lib/python3.8/dist-packages/nvidia/cuda_nvrtc/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
+    echo /usr/local/lib/python3.8/site-packages/nvidia/cudnn/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
+    echo /usr/local/lib/python3.8/site-packages/nvidia/cublas/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
+    echo /usr/local/lib/python3.8/site-packages/nvidia/cusparse/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
+    echo /usr/local/lib/python3.8/site-packages/nvidia/cusolver/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
+    echo /usr/local/lib/python3.8/site-packages/nvidia/curand/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
+    echo /usr/local/lib/python3.8/site-packages/nvidia/cufft/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
+    echo /usr/local/lib/python3.8/site-packages/nvidia/cuda_runtime/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
+    echo /usr/local/lib/python3.8/site-packages/nvidia/cuda_nvrtc/lib/ >> /etc/ld.so.conf.d/000_cuda.conf && \
     ldconfig; fi
 
 WORKDIR /data