Upgrade default Docker image.

konstantin-s-bogom · gvisor-bot · commit 66d1e209bb50 · 2025-08-29T16:47:23.000-07:00
PiperOrigin-RevId: 798372077
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -8,7 +8,8 @@ clear_docker_containers
 # deleted on an ongoing basis. Such partial deletion can break the cache state.
 # Using per day cache will ensure that builds triggered on a certain day have
 # the full bazel remote cache to use. TTL of the cache must be >1 day.
-export BAZEL_REMOTE_CACHE="--remote_cache=https://storage.googleapis.com/gvisor-buildkite-bazel-cache/cache-$(date +%Y-%m-%d) --google_default_credentials"
+BAZEL_VERSION="$(cat images/default/bazelversion)"
+export BAZEL_REMOTE_CACHE="--remote_cache=https://storage.googleapis.com/gvisor-buildkite-bazel-cache/${BAZEL_VERSION}/$(date +%Y-%m-%d) --google_default_credentials"
 
 if POSIXLY_CORRECT=true df --local --output=pcent,ipcent,target | grep -vE '/snap/' | grep -qE '9[4-9]%|100%'; then
   echo "Disk usage has reached critical level, node is bad." >&2
diff --git a/images/default/Dockerfile b/images/default/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND="noninteractive"
 
@@ -7,14 +7,14 @@ ENV DEBIAN_FRONTEND="noninteractive"
 #       equivalents for your distribution:
 #-------------------------------------------------------------------------------
 RUN apt-get update && apt-get install -y curl gnupg2 git \
-        python-is-python3 python3 python3-distutils python3-pip \
+        python-is-python3 python3 python3-setuptools python3-pip \
         build-essential crossbuild-essential-arm64 qemu-user-static \
         openjdk-11-jdk-headless zip unzip \
         apt-transport-https ca-certificates gnupg-agent \
         software-properties-common \
         pkg-config libffi-dev patch diffutils libssl-dev iptables kmod \
         clang crossbuild-essential-amd64 erofs-utils busybox-static libbpf-dev \
-        iproute2 netcat libnuma-dev
+        iproute2 netcat-openbsd libnuma-dev
 
 # This package is needed to build eBPF on amd64, but not on arm64 where it
 # doesn't exist.
@@ -33,7 +33,7 @@ RUN add-apt-repository \
 RUN apt-get -y install docker-ce-cli
 
 # Install gcloud.
-RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-410.0.0-linux-x86_64.tar.gz | \
+RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-535.0.0-linux-x86_64.tar.gz | \
     tar zxf - google-cloud-sdk && \
     google-cloud-sdk/install.sh --quiet && \
     ln -s /google-cloud-sdk/bin/gcloud /usr/bin/gcloud
diff --git a/images/gpu/cuda-tests-12-8/Dockerfile b/images/gpu/cuda-tests-12-8/Dockerfile
@@ -1,4 +1,4 @@
-FROM nvidia/cuda:12.8.1-devel-ubuntu22.04
+FROM nvidia/cuda:12.8.1-devel-ubuntu24.04
 
 WORKDIR /
 ENV PATH=$PATH:/usr/local/nvidia/bin
@@ -7,7 +7,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     apt-get install -y \
       build-essential \
       cmake \
-      freeglut3 freeglut3-dev \
+      freeglut3-dev \
       git \
       golang \
       imagemagick \
@@ -28,6 +28,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
       xdotool \
       xvfb \
       zlib1g zlib1g-dev \
+      cuda-cccl-devel \
       && apt -y purge 'golang*'
 
 RUN git clone --depth=1 --branch=v12.8 --single-branch \
diff --git a/images/gpu/cuda-tests/Dockerfile b/images/gpu/cuda-tests/Dockerfile
@@ -1,8 +1,8 @@
-FROM nvidia/cuda:12.2.2-devel-ubuntu22.04
+FROM nvidia/cuda:12.5.1-devel-ubuntu24.04
 
 # From: https://github.com/NVIDIA/cuda-samples/releases
 # Ideally, pick a release that matches the CUDA version of the image above.
-ARG CUDA_SAMPLES_VERSION=v12.2
+ARG CUDA_SAMPLES_VERSION=v12.5
 
 WORKDIR /
 COPY *.cu *.h *.sh *.go *.cc /
@@ -12,7 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     apt-get install -y \
       build-essential \
       cmake \
-      freeglut3 freeglut3-dev \
+      freeglut3-dev \
       git \
       golang \
       imagemagick \
@@ -31,6 +31,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
       xdotool \
       xvfb \
       zlib1g zlib1g-dev \
+      cuda-cccl-devel \
     && \
     chmod 555 /*.sh && \
     git clone --depth=1 --branch="$CUDA_SAMPLES_VERSION" --single-branch \
diff --git a/images/gpu/nccl-tests/Dockerfile b/images/gpu/nccl-tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM nvidia/cuda:12.5.0-devel-ubuntu22.04
+FROM nvidia/cuda:12.8.1-devel-ubuntu24.04
 
 RUN apt-get update && apt-get install git -y
 
diff --git a/images/gpu/pytorch/Dockerfile.x86_64 b/images/gpu/pytorch/Dockerfile.x86_64
@@ -1,7 +1,7 @@
-FROM nvidia/cuda:12.4.0-devel-ubuntu22.04
+FROM nvidia/cuda:12.8.1-devel-ubuntu24.04
 
 # Used for determining the correct pip index URL below.
-ENV CUDA_VERSION=12.4
+ENV CUDA_VERSION=12.8
 
 ENV PYTORCH_DATASETS_DIR=/pytorch-data
 ENV TORCH_HOME=/pytorch-home
@@ -10,16 +10,21 @@ RUN mkdir -p "$TORCH_HOME" && \
 
 RUN apt-get update && \
     apt-get install --yes \
-        libgl1-mesa-glx libglib2.0-0 \
+        libgl1 libglx-mesa0 libglib2.0-0 \
         pkg-config \
         python3 \
-        python3-distutils \
+        python3-setuptools \
         python3-pip \
+        python3-venv \
         clang \
         wget \
         vim \
         git
 
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
 RUN PIP_INDEX_URL="https://download.pytorch.org/whl/cu$(echo "$CUDA_VERSION" | sed 's~\.~~g')" && \
     python3 -m pip install --ignore-installed \
         boto3 \
diff --git a/images/gpu/stable-diffusion-xl/Dockerfile.x86_64 b/images/gpu/stable-diffusion-xl/Dockerfile.x86_64
@@ -1,19 +1,19 @@
-FROM nvidia/cuda:12.3.1-devel-ubuntu22.04
+FROM nvidia/cuda:12.8.1-devel-ubuntu24.04
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --yes \
       python3 \
-      python3-distutils \
+      python3-setuptools \
       python3-pip \
       clang \
       wget \
       vim \
       git \
       libgl1 \
       libglib2.0-0 \
-      libgl1-mesa-glx \
+      libgl1 libglx-mesa0 \
       golang
 
-RUN python3 -m pip install --ignore-installed \
+RUN python3 -m pip install --ignore-installed --break-system-packages \
       "clang~=$(clang --version | grep -oP 'clang version [.0-9]+' | cut -d' ' -f3)" \
       diffusers \
       transformers \
diff --git a/images/runtimes/java21/Dockerfile.x86_64 b/images/runtimes/java21/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:24.04
 
 RUN apt-get update && apt-get install -y \
   autoconf \
diff --git a/images/runtimes/nodejs22.2.0/Dockerfile.x86_64 b/images/runtimes/nodejs22.2.0/Dockerfile.x86_64
@@ -1,10 +1,12 @@
-FROM ubuntu:jammy
+FROM ubuntu:24.04
 RUN apt-get update && apt-get install -y \
   curl \
   dumb-init \
   g++ \
   make \
-  python3.10
+  python3
+
+RUN ln -s /usr/bin/python3 /usr/bin/python
 
 WORKDIR /root
 ARG VERSION=v22.2.0
diff --git a/images/runtimes/php8.3.7/Dockerfile.x86_64 b/images/runtimes/php8.3.7/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:24.04
 RUN apt-get update && apt-get install -y \
   autoconf \
   automake \
diff --git a/images/runtimes/python3.12.3/Dockerfile.x86_64 b/images/runtimes/python3.12.3/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:24.04
 RUN apt-get update && apt-get install -y \
   curl \
   gcc \
diff --git a/test/kubernetes/tests/cuda_test_lib.go b/test/kubernetes/tests/cuda_test_lib.go
@@ -33,9 +33,9 @@ import (
 
 var (
 	// For some reason, nvidia removed nvidia-smi from the nvidia/cuda image.
-	// So we use the nvidia/cuda:12.6.3-base-ubuntu22.04 image which has nvidia-smi.
+	// So we use the nvidia/cuda:12.6.3-base-ubuntu24.04 image which has nvidia-smi.
 	// This image is a few MB instead of GB.
-	nvidiaSMIImage   = "nvidia/cuda:12.6.3-base-ubuntu22.04"
+	nvidiaSMIImage   = "nvidia/cuda:12.6.3-base-ubuntu24.04"
 	cudaTestImage122 = k8s.ImageRepoPrefix + "gpu/cuda-tests_x86_64"
 	cudaTestImage128 = k8s.ImageRepoPrefix + "gpu/cuda-tests-12-8_x86_64"
 
diff --git a/test/syscalls/linux/xattr.cc b/test/syscalls/linux/xattr.cc
@@ -114,7 +114,7 @@ TEST_F(XattrTest, SecurityCapacityXattr) {
   EXPECT_THAT(lsetxattr(path, name, &val, val.size(), 0),
               SyscallFailsWithErrno(EOPNOTSUPP));
   int buf = 0;
-  EXPECT_THAT(lgetxattr(path, name, &buf, /*size=*/128),
+  EXPECT_THAT(lgetxattr(path, name, &buf, /*size=*/4),
               SyscallFailsWithErrno(AnyOf(ENODATA, EOPNOTSUPP)));
   EXPECT_THAT(lremovexattr(path, name), SyscallFailsWithErrno(EOPNOTSUPP));
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nvidia/cuda:12.5.0-devel-ubuntu22.04`
	`1`	`+FROM nvidia/cuda:12.8.1-devel-ubuntu24.04`
`2`	`2`
`3`	`3`	`RUN apt-get update && apt-get install git -y`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:jammy`
	`1`	`+FROM ubuntu:24.04`
`2`	`2`
`3`	`3`	`RUN apt-get update && apt-get install -y \`
`4`	`4`	`autoconf \`