diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 4172e977..5bf6fb05 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=nvidia/cuda:12.8.1-cudnn-devel-ubuntu22.04 \ +ARG BASE_IMAGE=nvidia/cuda:12.8.1-devel-ubuntu22.04 \ CONDA_VERSION=latest \ PYTHON_VERSION=3.12 @@ -11,7 +11,8 @@ ENV DEBIAN_FRONTEND=noninteractive \ TensorRT_ROOT=/opt/TensorRT-10.12.0.36 \ CONDA_VERSION="${CONDA_VERSION}" \ PATH="/workspace/miniconda3/bin:${PATH}" \ - PYTHON_VERSION="${PYTHON_VERSION}" + PYTHON_VERSION="${PYTHON_VERSION}" \ + LD_LIBRARY_PATH="/workspace/miniconda3/envs/comfystream/lib:${LD_LIBRARY_PATH}" # System dependencies RUN apt update && apt install -yqq --no-install-recommends \ @@ -48,6 +49,7 @@ conda run -n comfystream --no-capture-output pip install wheel RUN apt-get remove --purge -y libcudnn9-cuda-12 libcudnn9-dev-cuda-12 || true && \ apt-get autoremove -y && \ + rm -rf /usr/local/cuda/lib64/libcudnn* /usr/lib/x86_64-linux-gnu/libcudnn* && \ rm -rf /var/lib/apt/lists/* # Install numpy<2.0.0 first diff --git a/docker/Dockerfile.opencv b/docker/Dockerfile.opencv index 848db1fe..2c526859 100644 --- a/docker/Dockerfile.opencv +++ b/docker/Dockerfile.opencv @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=nvidia/cuda:12.8.1-cudnn-devel-ubuntu22.04 \ +ARG BASE_IMAGE=nvidia/cuda:12.8.1-devel-ubuntu22.04 \ CONDA_VERSION=latest \ PYTHON_VERSION=3.12 \ CUDA_VERSION=12.8 @@ -112,7 +112,7 @@ RUN cd /workspace/opencv/build && \ -D HAVE_opencv_python3=ON \ -D WITH_NVCUVID=OFF \ -D WITH_NVCUVENC=OFF \ - .. && \ + .. && \ make -j$(nproc) && \ make install && \ ldconfig