From e7bfe00d5d483bfe1516de2edd8f1ed93584dabe Mon Sep 17 00:00:00 2001 From: Holden Date: Sun, 14 Jun 2026 18:55:50 +0000 Subject: [PATCH 1/2] build: bump amd64 rocm and cpu bases to Ubuntu 26.04 22.04 non-GPU amd64 bases were never updated when arm64 moved to 24.04. Python 3.13 is still pulled from deadsnakes PPA (26.04 ships 3.14 natively). intel stays on 22.04: the Intel GPU repo URL is pinned to the "jammy" codename and cannot be bumped until Intel publishes 26.04 packages. --- Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c890d21..b25d5c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,17 @@ # ── Base images ─────────────────────────────────────────────────────────────── # amd64 + gpu: NVIDIA CUDA 12.8 + cuDNN (GPU acceleration via NVIDIA Container Toolkit) -# amd64 + rocm: Ubuntu 22.04 (AMD GPU via ROCm — pass /dev/kfd and /dev/dri) +# amd64 + rocm: Ubuntu 26.04 (AMD GPU via ROCm — pass /dev/kfd and /dev/dri) # amd64 + intel: Ubuntu 22.04 (Intel Arc / iGPU via OpenVINO — pass /dev/dri) -# amd64 + cpu: Ubuntu 22.04 (CPU-only, ~2 GB smaller image) +# Note: intel stays on 22.04 until Intel's GPU repo ships 26.04 packages +# amd64 + cpu: Ubuntu 26.04 (CPU-only, ~2 GB smaller image) # arm64: Ubuntu 24.04 (CPU-only; no CUDA/ROCm wheels on ARM) ARG VARIANT=gpu FROM --platform=$BUILDPLATFORM nvidia/cuda:12.8.1-cudnn-runtime-ubuntu22.04 AS base-amd64-gpu -FROM ubuntu:22.04 AS base-amd64-rocm +FROM ubuntu:26.04 AS base-amd64-rocm FROM ubuntu:22.04 AS base-amd64-intel -FROM ubuntu:22.04 AS base-amd64-cpu +FROM ubuntu:26.04 AS base-amd64-cpu FROM ubuntu:24.04 AS base-arm64-gpu FROM ubuntu:24.04 AS base-arm64-rocm FROM ubuntu:24.04 AS base-arm64-intel @@ -24,8 +25,9 @@ FROM base-${TARGETARCH}-${VARIANT} AS build ARG VARIANT=gpu ENV DEBIAN_FRONTEND=noninteractive -# Both Ubuntu 22.04 and 24.04 get Python 3.13 from the deadsnakes PPA. -# GNUPGHOME is isolated so gpg never contacts an agent socket under QEMU. +# All base images get Python 3.13 from the deadsnakes PPA (26.04 ships 3.14 natively; +# 3.13 is used to keep dependencies tested and aligned). GNUPGHOME is isolated +# so gpg never contacts an agent socket under QEMU. RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl gnupg software-properties-common \ && GNUPGHOME=$(mktemp -d) add-apt-repository ppa:deadsnakes/ppa -y \ From 237dd2091b68f59b8196bc2d48a886a628cd48a0 Mon Sep 17 00:00:00 2001 From: Holden Date: Sun, 14 Jun 2026 19:17:13 +0000 Subject: [PATCH 2/2] build: bump amd64 gpu base to NVIDIA CUDA ubuntu24.04 Highest Ubuntu version NVIDIA currently publishes for CUDA 12.8.1. 26.04 not yet available from NVIDIA's image registry. --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b25d5c9..08026cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ # ── Base images ─────────────────────────────────────────────────────────────── -# amd64 + gpu: NVIDIA CUDA 12.8 + cuDNN (GPU acceleration via NVIDIA Container Toolkit) +# amd64 + gpu: NVIDIA CUDA 12.8 + cuDNN on Ubuntu 24.04 (highest Ubuntu NVIDIA publishes) # amd64 + rocm: Ubuntu 26.04 (AMD GPU via ROCm — pass /dev/kfd and /dev/dri) # amd64 + intel: Ubuntu 22.04 (Intel Arc / iGPU via OpenVINO — pass /dev/dri) -# Note: intel stays on 22.04 until Intel's GPU repo ships 26.04 packages +# Note: intel stays on 22.04 — Intel's GPU repo only publishes for jammy # amd64 + cpu: Ubuntu 26.04 (CPU-only, ~2 GB smaller image) # arm64: Ubuntu 24.04 (CPU-only; no CUDA/ROCm wheels on ARM) ARG VARIANT=gpu -FROM --platform=$BUILDPLATFORM nvidia/cuda:12.8.1-cudnn-runtime-ubuntu22.04 AS base-amd64-gpu +FROM --platform=$BUILDPLATFORM nvidia/cuda:12.8.1-cudnn-runtime-ubuntu24.04 AS base-amd64-gpu FROM ubuntu:26.04 AS base-amd64-rocm FROM ubuntu:22.04 AS base-amd64-intel FROM ubuntu:26.04 AS base-amd64-cpu