From 4bb216396d207271d87f4d19662ad10dcc93c37b Mon Sep 17 00:00:00 2001
From: Shiva Kumar <shiva@nvidia.com>
Date: Tue, 12 May 2026 21:12:52 +0530
Subject: [PATCH] base: replace Ubuntu CUDA base images with native Ubuntu base

Signed-off-by: Shiva Kumar (SW-CLOUD) <shivaku@nvidia.com>
---
 Makefile        |  2 +-
 base/Dockerfile | 46 ++--------------------------------------------
 2 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/Makefile b/Makefile
index 20ad79a97..b74bd4b5a 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 DISTRIBUTIONS := ubuntu22.04 ubuntu24.04 signed_ubuntu22.04 signed_ubuntu24.04 rhel8 rhel9 rhel10 rocky8 rocky9 rocky10 precompiled_rhcos
 RHCOS_VERSIONS := rhcos4.14 rhcos4.15 rhcos4.16 rhcos4.17 rhcos4.18 rhel9.6
 PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
-BASE_FROM := noble jammy focal
+BASE_FROM := noble jammy
 PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
 VGPU_GUEST_DRIVER_PUSH_TARGETS := $(patsubst %, push-vgpuguest-%, $(DISTRIBUTIONS) $(RHCOS_VERSIONS))
 VGPU_HOST_DRIVER_PUSH_TARGETS := $(patsubst %, push-vgpuhost-%, $(DISTRIBUTIONS) $(RHCOS_VERSIONS))
diff --git a/base/Dockerfile b/base/Dockerfile
index 123eae7fd..bcfdec39a 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,5 +1,5 @@
 # Ubuntu 24.04
-FROM nvcr.io/nvidia/cuda:13.2.1-base-ubuntu24.04 AS noble
+FROM ubuntu:noble-20260410 AS noble
 
 SHELL ["/bin/bash", "-c"]
 
@@ -10,9 +10,6 @@ ENV DRIVER_BRANCH=${DRIVER_BRANCH}
 ENV KERNEL_FLAVOR=${KERNEL_FLAVOR}
 ENV LTS_KERNEL=${LTS_KERNEL}
 
-# Remove cuda repository to avoid GPG errors
-RUN rm -f /etc/apt/sources.list.d/cuda*
-
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 ENV NVIDIA_VISIBLE_DEVICES=void
@@ -36,7 +33,7 @@ RUN chmod +x /usr/local/bin/generate-ci-config && \
 ENTRYPOINT ["/usr/bin/sleep","1000"]
 
 # Ubuntu 22.04
-FROM nvcr.io/nvidia/cuda:13.2.1-base-ubuntu22.04 AS jammy
+FROM ubuntu:jammy-20260410 AS jammy
 
 SHELL ["/bin/bash", "-c"]
 
@@ -47,9 +44,6 @@ ENV DRIVER_BRANCH=${DRIVER_BRANCH}
 ENV KERNEL_FLAVOR=${KERNEL_FLAVOR}
 ENV LTS_KERNEL=${LTS_KERNEL}
 
-# Remove cuda repository to avoid GPG errors
-RUN rm -f /etc/apt/sources.list.d/cuda*
-
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 ENV NVIDIA_VISIBLE_DEVICES=void
@@ -71,39 +65,3 @@ RUN chmod +x /usr/local/bin/generate-ci-config && \
     generate-ci-config
 
 ENTRYPOINT ["/usr/bin/sleep","1000"]
-
-# Ubuntu 20.04
-FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu20.04 AS focal
-
-SHELL ["/bin/bash", "-c"]
-
-ARG DRIVER_BRANCH
-ARG KERNEL_FLAVOR
-ARG LTS_KERNEL
-ENV DRIVER_BRANCH=${DRIVER_BRANCH}
-ENV KERNEL_FLAVOR=${KERNEL_FLAVOR}
-ENV LTS_KERNEL=${LTS_KERNEL}
-
-# Remove cuda repository to avoid GPG errors
-RUN rm -f /etc/apt/sources.list.d/cuda*
-
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-
-ENV NVIDIA_VISIBLE_DEVICES=void
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        apt-utils curl git && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main universe" > /etc/apt/sources.list && \
-    echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-updates main universe" >> /etc/apt/sources.list && \
-    echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-security main universe" >> /etc/apt/sources.list && \
-    echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu focal-updates main restricted" >> /etc/apt/sources.list && \
-    echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu focal-security main restricted" >> /etc/apt/sources.list && \
-    usermod -o -u 0 -g 0 _apt
-
-COPY generate-ci-config /usr/local/bin/generate-ci-config
-
-RUN chmod +x /usr/local/bin/generate-ci-config 
-
-ENTRYPOINT ["/usr/bin/sleep","1000"]