Switch to base images instead of devel

This change swithes to the CUDA base images and installs
the required development dependencies in this instead of relying on
the devel image. This keeps the image size small and makes the
build process less prone to CI failures.

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

deployments/container/Dockerfile.ubi9

@@ -12,18 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubi9 AS builder
+FROM nvcr.io/nvidia/cuda:12.9.1-base-ubi9 AS builder
 
 ARG CUDA_VERSION
 RUN dnf install -y --allowerasing  \
-        curl cmake \
+        cmake \
+        cuda-cudart-devel-12-9 \
+        cuda-nvcc-12-9 \
+        g++ \
+        curl \
     && \
     dnf clean all
 
 WORKDIR /build
 
 ARG SAMPLE_NAME
-ENV SAMPLE_NAME ${SAMPLE_NAME}
+ENV SAMPLE_NAME=${SAMPLE_NAME}
 ARG CUDA_SAMPLES_VERSION=v12.9
 RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${CUDA_SAMPLES_VERSION} | \
     tar -xzvf - --strip-components=1 --wildcards */${SAMPLE_NAME}/* --wildcards */Common/* && \

deployments/container/Dockerfile.ubuntu

@@ -12,14 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubuntu22.04 AS builder
+FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04 AS builder
 
 ARG SAMPLE_NAME
-ENV SAMPLE_NAME ${SAMPLE_NAME}
+ENV SAMPLE_NAME=${SAMPLE_NAME}
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        curl cmake \
+        build-essential \
+        cmake \
+        cuda-nvcc-12-9 \
+        g++ \
+        curl \
     && \
         rm -rf /var/lib/apt/lists/*
 
@@ -36,7 +40,7 @@ RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${C
     cp ${SAMPLE_NAME} /build/${SAMPLE_NAME}
 
 FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04
-ARG SAMPLE_NAME=nbody
+ARG SAMPLE_NAME
 LABEL io.k8s.display-name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL vendor="NVIDIA"

deployments/container/nbody/Dockerfile

@@ -12,21 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubuntu22.04 AS builder
+FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04 AS builder
 
 ARG SAMPLE_NAME=nbody
 ENV SAMPLE_NAME=${SAMPLE_NAME}
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        cuda-nvcc-12-6 \
         build-essential \
+        cmake \
+        cuda-nvcc-12-9 \
         g++ \
         curl \
         freeglut3-dev \
         libgl1-mesa-dev \
         libglu1-mesa-dev \
-        cmake \
     && \
         rm -rf /var/lib/apt/lists/*
 
@@ -43,7 +43,7 @@ RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${C
     cp ${SAMPLE_NAME} /build/${SAMPLE_NAME}
 
 FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04
-ARG SAMPLE_NAME
+ARG SAMPLE_NAME=nbody
 LABEL io.k8s.display-name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL vendor="NVIDIA"

deployments/container/nvbandwidth/Dockerfile

@@ -12,22 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubuntu22.04 AS builder
-
-ENV DEBIAN_FRONTEND=noninteractive
+FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04 AS builder
 
+ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    git \
-    cmake \
-    g++ \
-    gcc \
-    make \
-    libboost-program-options-dev \
-    openmpi-bin \
-    openmpi-common \
-    libopenmpi-dev && \
-    rm -rf /var/lib/apt/lists/*
+        build-essential \
+        cmake \
+        cuda-nvcc-12-9 \
+        cuda-nvml-dev-12-9 \
+        g++ \
+        git \
+        gcc \
+        make \
+        libboost-program-options-dev \
+        openmpi-bin \
+        openmpi-common \
+        libopenmpi-dev \
+    && \
+        rm -rf /var/lib/apt/lists/*
 
 WORKDIR /bandwidthtest