diff --git a/cuda/base/Dockerfile b/cuda/base/Dockerfile index cf848bb..8a117da 100644 --- a/cuda/base/Dockerfile +++ b/cuda/base/Dockerfile @@ -13,7 +13,7 @@ ENV NVIDIA_VISIBLE_DEVICES=all \ RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources && \ apt-get update && apt-get install -y --no-install-recommends gnupg2 curl ca-certificates && \ curl -fsSLO https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/${NVARCH}/cuda-keyring_1.1-1_all.deb && \ - dpkg -i cuda-keyring_1.0-1_all.deb && rm cuda-keyring_1.0-1_all.deb && \ + dpkg -i cuda-keyring_1.1-1_all.deb && rm cuda-keyring_1.1-1_all.deb &&\ # # For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a apt-get update && apt-get install -y --no-install-recommends \ cuda-cudart-12-4=${NV_CUDA_CUDART_VERSION} \ diff --git a/cuda/devel/Dockerfile b/cuda/devel/Dockerfile index fe18e74..6dc2909 100644 --- a/cuda/devel/Dockerfile +++ b/cuda/devel/Dockerfile @@ -1,15 +1,16 @@ FROM eoelab.org:1027/ben0i0d/gpu:cuda_runtime -ARG NV_CUDA_CUDART_DEV_VERSION = 12.4.127-1 \ - NV_NVML_DEV_VERSION = 12.4.127-1 \ - NV_LIBCUSPARSE_DEV_VERSION = 12.3.1.170-1 \ - NV_LIBNPP_DEV_PACKAGE = "libnpp-dev-12-4=12.2.5.30-1" \ - NV_LIBCUBLAS_DEV_PACKAGE_NAME = libcublas-dev-12-4 \ - NV_LIBCUBLAS_DEV_PACKAGE = "libcublas-dev-12-4=12.4.5.8-1" \ - NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE = "cuda-nsight-compute-12-4=12.4.1-1" \ - NV_NVPROF_DEV_PACKAGE = "cuda-nvprof-12-4=12.4.127-1" \ - NV_LIBNCCL_DEV_PACKAGE_NAME = libnccl-dev \ - NV_LIBNCCL_DEV_PACKAGE = "libnccl-dev=2.21.5-1+cuda12.4" +ARG NV_CUDA_LIB_VERSION=12.4.1-1 \ + NV_CUDA_CUDART_DEV_VERSION=12.4.127-1 \ + NV_NVML_DEV_VERSION=12.4.127-1 \ + NV_LIBCUSPARSE_DEV_VERSION=12.3.1.170-1 \ + NV_LIBNPP_DEV_PACKAGE="libnpp-dev-12-4=12.2.5.30-1" \ + NV_LIBCUBLAS_DEV_PACKAGE_NAME=libcublas-dev-12-4 \ + NV_LIBCUBLAS_DEV_PACKAGE="libcublas-dev-12-4=12.4.5.8-1" \ + NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE="cuda-nsight-compute-12-4=12.4.1-1" \ + NV_NVPROF_DEV_PACKAGE="cuda-nvprof-12-4=12.4.127-1" \ + NV_LIBNCCL_DEV_PACKAGE_NAME=libnccl-dev \ + NV_LIBNCCL_DEV_PACKAGE="libnccl-dev=2.21.5-1+cuda12.4" ENV LIBRARY_PATH=/usr/local/cuda/lib64/stubs:$LIBRARY_PATH @@ -25,7 +26,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ${NV_LIBCUBLAS_DEV_PACKAGE} \ ${NV_LIBNCCL_DEV_PACKAGE} \ ${NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE} &&\ - apt-get clean && rm -rf /var/lib/apt/lists/* && \ # Keep apt from auto upgrading the cublas and nccl packages. See https://gitlab.com/nvidia/container-images/cuda/-/issues/88 apt-mark hold ${NV_LIBCUBLAS_DEV_PACKAGE_NAME} ${NV_LIBNCCL_DEV_PACKAGE_NAME} diff --git a/cuda/runtime/Dockerfile b/cuda/runtime/Dockerfile index 3c7fe0b..9786458 100644 --- a/cuda/runtime/Dockerfile +++ b/cuda/runtime/Dockerfile @@ -1,12 +1,13 @@ FROM eoelab.org:1027/ben0i0d/gpu:cuda_base -ARG NV_NVTX_VERSION = 12.4.127-1 \ - NV_LIBNPP_PACKAGE = "libnpp-12-4=12.2.5.30-1" \ - NV_LIBCUSPARSE_VERSION = 12.3.1.170-1 \ - NV_LIBCUBLAS_PACKAGE_NAME = libcublas-12-4 \ - NV_LIBCUBLAS_PACKAGE = "libcublas-12-4=12.4.5.8-1" \ - NV_LIBNCCL_PACKAGE_NAME = libnccl2 \ - NV_LIBNCCL_PACKAGE = "libnccl2=2.21.5-1+cuda12.4" +ARG NV_CUDA_LIB_VERSION=12.4.1-1 \ + NV_NVTX_VERSION=12.4.127-1 \ + NV_LIBNPP_PACKAGE="libnpp-12-4=12.2.5.30-1" \ + NV_LIBCUSPARSE_VERSION=12.3.1.170-1 \ + NV_LIBCUBLAS_PACKAGE_NAME=libcublas-12-4 \ + NV_LIBCUBLAS_PACKAGE="libcublas-12-4=12.4.5.8-1" \ + NV_LIBNCCL_PACKAGE_NAME=libnccl2 \ + NV_LIBNCCL_PACKAGE="libnccl2=2.21.5-1+cuda12.4" # Add entrypoint items COPY entrypoint.d/ /opt/nvidia/entrypoint.d/ @@ -20,7 +21,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ${NV_LIBCUBLAS_PACKAGE} \ ${NV_LIBNCCL_PACKAGE} && \ apt-get clean && rm -rf /var/lib/apt/lists/* && \ - # Keep apt from auto upgrading the cublas and nccl packages. See https://gitlab.com/nvidia/container-images/cuda/-/issues/88 apt-mark hold ${NV_LIBCUBLAS_PACKAGE_NAME} ${NV_LIBNCCL_PACKAGE_NAME}