From a31f76cb14f13fab4ff9f4fe7bef9a67c8df8f25 Mon Sep 17 00:00:00 2001 From: Christopher Desiniotis Date: Mon, 8 Jul 2024 13:13:27 -0700 Subject: [PATCH] Add dependabot rule for updating CUDA base images Signed-off-by: Christopher Desiniotis --- .github/dependabot.yml | 6 ++++++ base/Dockerfile | 6 ++---- centos7/Dockerfile | 3 +-- coreos/Dockerfile | 3 +-- fedora/Dockerfile | 4 +--- photon3.0/Dockerfile | 3 +-- rhel8/Dockerfile | 5 ++--- rhel8/precompiled/Dockerfile | 4 +--- rhel9/Dockerfile | 5 ++--- rhel9/precompiled/Dockerfile | 4 +--- sle15/Dockerfile | 3 +-- ubuntu18.04/Dockerfile | 3 +-- ubuntu20.04/Dockerfile | 5 ++--- ubuntu20.04/precompiled/Dockerfile | 3 +-- ubuntu22.04/Dockerfile | 5 ++--- ubuntu22.04/precompiled/Dockerfile | 3 +-- vgpu-manager/rhel8/Dockerfile | 3 +-- vgpu-manager/ubuntu20.04/Dockerfile | 3 +-- vgpu-manager/ubuntu22.04/Dockerfile | 3 +-- 19 files changed, 29 insertions(+), 45 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fd6d36b8..c37b5174 100644 --- 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 index 27118eba..1528bb17 100644 --- 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 index 06641257..d4833ec6 100644 --- 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 index 9bae661f..4f8ecf82 100644 --- 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 index e1e96d25..57a2cba2 100644 --- 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 index f4752a76..72c8e100 100644 --- 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 index bd5f0de5..a7deaa1e 100644 --- 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 index 5563a500..fcf1c5d2 100644 --- 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 index e932fd4e..98c48e5f 100644 --- 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 index 7f330016..ecd7b8d3 100644 --- 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,7 +65,7 @@ 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' @@ -74,7 +73,6 @@ 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 index 749f0295..30ee5c3e 100644 --- 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 index 1333663d..c111237f 100644 --- 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 index 339c8055..4a00ecfe 100644 --- 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 index 7d1554bd..047cc348 100644 --- 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 index 2670a4f5..3ac8bac3 100644 --- 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 index a0d91f68..e779a6b4 100644 --- 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 index 75754acd..4b06a538 100644 --- 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 index c946a5be..37e6d4e1 100644 --- 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 index 2bee7f0d..3f9915bc 100644 --- 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