Merge pull request NVIDIA#46 from NVIDIA/cuda-image-updates

cdesiniotis · web-flow · commit a09c4af07c00 · 2024-07-08T16:17:31.000-07:00
Add dependabot rule for updating CUDA base images
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -16,3 +16,9 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+
+  - package-ecosystem: "docker"
+    directories:
+      - "*"
+    schedule:
+      interval: "daily"
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -1,7 +1,5 @@
-ARG CUDA_VERSION
-
 # Ubuntu 22.04
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu22.04 as jammy
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu22.04 as jammy
 
 SHELL ["/bin/bash", "-c"]
 
@@ -36,7 +34,7 @@ RUN chmod +x /usr/local/bin/generate-ci-config && \
 ENTRYPOINT ["/usr/bin/sleep","1000"]
 
 # Ubuntu 20.04
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04 as focal
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu20.04 as focal
 
 SHELL ["/bin/bash", "-c"]
 
diff --git a/centos7/Dockerfile b/centos7/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-centos7
+FROM nvcr.io/nvidia/cuda:12.4.0-base-centos7
 
 ENV NVIDIA_VISIBLE_DEVICES=void
 
diff --git a/coreos/Dockerfile b/coreos/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION=11.7.0
-FROM nvcr.io/nvidia/cuda:$CUDA_VERSION-base-ubi8 as license
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubi8 as license
 
 # Build nvidia-container-runtime binary
 FROM golang:1.11.2 as build-runtime
diff --git a/fedora/Dockerfile b/fedora/Dockerfile
@@ -1,7 +1,6 @@
 ARG FEDORA_VERSION=36
-ARG CUDA_VERSION
 
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubi8 as build
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubi8 as build
 
 ARG TARGETARCH
 
@@ -26,7 +25,6 @@ RUN git clone https://github.com/NVIDIA/gpu-driver-container driver && \
     mv vgpu-util /work
 
 ARG FEDORA_VERSION=36
-ARG CUDA_VERSION=11.7.0
 
 FROM fedora:${FEDORA_VERSION}
 
diff --git a/photon3.0/Dockerfile b/photon3.0/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION=11.7.0
-FROM nvcr.io/nvidia/cuda:$CUDA_VERSION-base-ubi8 as license
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubi8 as license
 
 FROM photon:3.0
 
diff --git a/rhel8/Dockerfile b/rhel8/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubi8 as build
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubi8 as build
 
 ARG TARGETARCH
 
@@ -23,7 +22,7 @@ RUN git clone https://github.com/NVIDIA/gpu-driver-container driver && \
     go build -o vgpu-util && \
     mv vgpu-util /work
 
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubi8
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubi8
 
 ARG TARGETARCH
 ENV TARGETARCH=$TARGETARCH
diff --git a/rhel8/precompiled/Dockerfile b/rhel8/precompiled/Dockerfile
@@ -1,5 +1,4 @@
 ARG DRIVER_TOOLKIT_IMAGE=''
-ARG CUDA_VERSION=''
 ARG CUDA_DIST=''
 
 FROM ${DRIVER_TOOLKIT_IMAGE} as builder
@@ -50,11 +49,10 @@ RUN export KVER=$(echo ${KERNEL_VERSION} | cut -d '-' -f 1) \
         --define "driver_branch ${DRIVER_STREAM}" \
         -v -bb SPECS/kmod-nvidia.spec
 
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-${CUDA_DIST}
+FROM nvcr.io/nvidia/cuda:12.5.0-base-${CUDA_DIST}
 
 ARG KERNEL_VERSION=''
 ARG RHEL_VERSION=''
-ARG CUDA_VERSION=''
 
 ARG DRIVER_TYPE=passthrough
 ENV DRIVER_TYPE=${DRIVER_TYPE}
diff --git a/rhel9/Dockerfile b/rhel9/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubi9 as build
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubi9 as build
 
 ARG TARGETARCH
 
@@ -23,7 +22,7 @@ RUN git clone https://github.com/NVIDIA/gpu-driver-container driver && \
     go build -o vgpu-util && \
     mv vgpu-util /work
 
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubi9
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubi9
 
 ARG TARGETARCH
 ENV TARGETARCH=$TARGETARCH
diff --git a/rhel9/precompiled/Dockerfile b/rhel9/precompiled/Dockerfile
@@ -1,5 +1,4 @@
 ARG DRIVER_TOOLKIT_IMAGE=''
-ARG CUDA_VERSION=''
 ARG CUDA_DIST=''
 
 FROM ${DRIVER_TOOLKIT_IMAGE} as builder
@@ -66,15 +65,14 @@ RUN export KVER=$(echo ${KERNEL_VERSION} | cut -d '-' -f 1) \
         --define "driver_branch ${DRIVER_STREAM}" \
         -v -bb SPECS/kmod-nvidia.spec
 
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-${CUDA_DIST}
+FROM nvcr.io/nvidia/cuda:12.5.0-base-${CUDA_DIST}
 
 ARG BASE_URL='https://us.download.nvidia.com/tesla'
 
 ARG KERNEL_VERSION=''
 ARG KERNEL_VERSION_NOARCH=''
 ARG RHEL_VERSION=''
 
-ARG CUDA_VERSION=''
 ARG DRIVER_STREAM_TYPE=''
 
 ARG DRIVER_TYPE=passthrough
diff --git a/sle15/Dockerfile b/sle15/Dockerfile
@@ -1,6 +1,5 @@
 ARG SLES_VERSION
-ARG CUDA_VERSION=11.7.0
-FROM nvcr.io/nvidia/cuda:$CUDA_VERSION-base-ubi8 as license
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubi8 as license
 
 FROM registry.suse.com/bci/golang:1.17 as build
 
diff --git a/ubuntu18.04/Dockerfile b/ubuntu18.04/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu18.04
+FROM nvcr.io/nvidia/cuda:12.1.0-base-ubuntu18.04
 
 #ARG BASE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64
 ARG BASE_URL=https://us.download.nvidia.com/tesla
diff --git a/ubuntu20.04/Dockerfile b/ubuntu20.04/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04 as build
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu20.04 as build
 
 ARG TARGETARCH
 
@@ -34,7 +33,7 @@ RUN git clone https://github.com/NVIDIA/gpu-driver-container driver && \
     go build -o vgpu-util && \
     mv vgpu-util /work
 
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu20.04
 
 SHELL ["/bin/bash", "-c"]
 
diff --git a/ubuntu20.04/precompiled/Dockerfile b/ubuntu20.04/precompiled/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu20.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/ubuntu22.04/Dockerfile b/ubuntu22.04/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu22.04 as build
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu22.04 as build
 
 ARG TARGETARCH
 
@@ -34,7 +33,7 @@ RUN git clone https://github.com/NVIDIA/gpu-driver-container driver && \
     go build -o vgpu-util && \
     mv vgpu-util /work
 
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu22.04
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu22.04
 
 SHELL ["/bin/bash", "-c"]
 
diff --git a/ubuntu22.04/precompiled/Dockerfile b/ubuntu22.04/precompiled/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu22.04
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/vgpu-manager/rhel8/Dockerfile b/vgpu-manager/rhel8/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubi8
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubi8
 
 ARG DRIVER_VERSION
 ENV DRIVER_VERSION=$DRIVER_VERSION
diff --git a/vgpu-manager/ubuntu20.04/Dockerfile b/vgpu-manager/ubuntu20.04/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu20.04
 
 ARG DRIVER_VERSION
 ENV DRIVER_VERSION=$DRIVER_VERSION
diff --git a/vgpu-manager/ubuntu22.04/Dockerfile b/vgpu-manager/ubuntu22.04/Dockerfile
@@ -1,5 +1,4 @@
-ARG CUDA_VERSION
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu22.04
+FROM nvcr.io/nvidia/cuda:12.5.0-base-ubuntu22.04
 
 ARG DRIVER_VERSION
 ENV DRIVER_VERSION=$DRIVER_VERSION
