From f1baf29e003d221cf6e66263a0991861486e36b4 Mon Sep 17 00:00:00 2001
From: Tariq Ibrahim <tibrahim@nvidia.com>
Date: Thu, 30 Jul 2026 14:28:09 -0700
Subject: [PATCH] [e2e] avoid use of unpinned ubuntu base image

This commit fixes the failing e2e tests observed in the main branch,
The root cause is the use of the unpinned "ubuntu" base image which has
moved to `resolute` (Ubuntu 26.04) which has new assumptions when it comes
to setting up a C build environment.

Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>
---
 tests/e2e/nvidia-container-toolkit_test.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/nvidia-container-toolkit_test.go b/tests/e2e/nvidia-container-toolkit_test.go
index fffbfa72d..8ebd2af23 100644
--- a/tests/e2e/nvidia-container-toolkit_test.go
+++ b/tests/e2e/nvidia-container-toolkit_test.go
@@ -456,7 +456,7 @@ var _ = Describe("docker", Ordered, ContinueOnFailure, func() {
             --build-arg RM_VERSION="$(basename $(ls -d /lib/firmware/nvidia/*.*))" \
             --build-arg CURRENT_DIR="` + outputDir + `" \
             - <<EOF
-FROM ubuntu
+FROM ubuntu:24.04
 RUN mkdir -p /lib/firmware/nvidia/
 ARG RM_VERSION
 ARG CURRENT_DIR
@@ -538,14 +538,14 @@ EOF`)
 
 			// Create the local Dockerfile
 			_, _, err = runner.Run(`cat <<EOF > Dockerfile.nvidiascape
-FROM ubuntu AS build
+FROM ubuntu:24.04 AS build
 RUN apt-get update && \
-	apt-get install -y gcc \
+	apt-get install -y gcc libc6-dev \
 	&& \
 	rm -rf /var/lib/apt/lists/*
 ADD poc.c .
 RUN gcc -shared -fPIC -o poc.so poc.c
-FROM ubuntu
+FROM ubuntu:24.04
 ENV LD_PRELOAD=/proc/self/cwd/poc.so
 COPY --from=build poc.so /
 EOF`)
@@ -627,7 +627,7 @@ EOF`)
 		BeforeAll(func(ctx context.Context) {
 			_, _, err := runner.Run(`docker build -t libordering \
             - <<EOF
-FROM ubuntu
+FROM ubuntu:24.04
 ENV NVIDIA_VISIBLE_DEVICES=all
 RUN mkdir -p /extra/lib
 RUN cp /usr/lib/$(uname -m)-linux-gnu/libc.so.? /extra/lib/