Skip to content

Commit

Permalink
Merge pull request #46 from NVIDIA/cuda-image-updates
Browse files Browse the repository at this point in the history
Add dependabot rule for updating CUDA base images
  • Loading branch information
cdesiniotis authored Jul 8, 2024
2 parents 19fe55e + a31f76c commit 9549e60
Show file tree
Hide file tree
Showing 19 changed files with 29 additions and 45 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,9 @@ updates:
directory: "/"
schedule:
interval: "daily"

- package-ecosystem: "docker"
directories:
- "*"
schedule:
interval: "daily"
6 changes: 2 additions & 4 deletions base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]

Expand Down Expand Up @@ -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"]

Expand Down
3 changes: 1 addition & 2 deletions centos7/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 1 addition & 2 deletions coreos/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions fedora/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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}

Expand Down
3 changes: 1 addition & 2 deletions photon3.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 2 additions & 3 deletions rhel8/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions rhel8/precompiled/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG DRIVER_TOOLKIT_IMAGE=''
ARG CUDA_VERSION=''
ARG CUDA_DIST=''

FROM ${DRIVER_TOOLKIT_IMAGE} as builder
Expand Down Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions rhel9/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions rhel9/precompiled/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG DRIVER_TOOLKIT_IMAGE=''
ARG CUDA_VERSION=''
ARG CUDA_DIST=''

FROM ${DRIVER_TOOLKIT_IMAGE} as builder
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions sle15/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 1 addition & 2 deletions ubuntu18.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions ubuntu20.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"]

Expand Down
3 changes: 1 addition & 2 deletions ubuntu20.04/precompiled/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 2 additions & 3 deletions ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"]

Expand Down
3 changes: 1 addition & 2 deletions ubuntu22.04/precompiled/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 1 addition & 2 deletions vgpu-manager/rhel8/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions vgpu-manager/ubuntu20.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions vgpu-manager/ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 9549e60

Please sign in to comment.