From 8d908e1374bf38818cea103a1850dc01fbaa80fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
Date: Mon, 10 Aug 2026 18:25:28 +0200
Subject: [PATCH] Drop Ubuntu 25.10 Questing as EOL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ubuntu 25.10 "questing" reached EOL on July 9, 2026:
https://lists.ubuntu.com/archives/ubuntu-announce/2026-July/000325.html

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
---
 deb/Makefile                   |  2 +-
 deb/ubuntu-questing/Dockerfile | 45 ----------------------------------
 distros.json                   | 11 ---------
 3 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 deb/ubuntu-questing/Dockerfile

diff --git a/deb/Makefile b/deb/Makefile
index cfa3ee125a..7a709756af 100644
--- a/deb/Makefile
+++ b/deb/Makefile
@@ -54,7 +54,7 @@ RUN?=docker run --rm \
 	debbuild-$@/$(ARCH)
 
 DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm debian-trixie
-UBUNTU_VERSIONS ?= ubuntu-jammy ubuntu-noble ubuntu-questing ubuntu-resolute
+UBUNTU_VERSIONS ?= ubuntu-jammy ubuntu-noble ubuntu-resolute
 RASPBIAN_VERSIONS ?= raspbian-bullseye raspbian-bookworm
 DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
 
diff --git a/deb/ubuntu-questing/Dockerfile b/deb/ubuntu-questing/Dockerfile
deleted file mode 100644
index 28516fd287..0000000000
--- a/deb/ubuntu-questing/Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-# syntax=docker/dockerfile:1
-
-ARG GO_IMAGE=golang:latest
-ARG DISTRO=ubuntu
-ARG SUITE=questing
-ARG VERSION_ID=25.10
-ARG BUILD_IMAGE=${DISTRO}:${SUITE}
-
-FROM ${GO_IMAGE} AS golang
-
-FROM ${BUILD_IMAGE}
-
-# Remove diverted man binary to prevent man-pages being replaced with "minimized" message. See docker/for-linux#639
-RUN if  [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then \
-        rm -f /usr/bin/man; \
-        dpkg-divert --quiet --remove --rename /usr/bin/man; \
-    fi
-
-RUN apt-get update && apt-get install -y curl devscripts equivs git
-
-ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=on
-ENV GOPATH=/go
-ENV GOTOOLCHAIN=local
-ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
-
-ARG COMMON_FILES
-COPY --link ${COMMON_FILES} /root/build-deb/debian
-RUN apt-get update \
- && mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control
-
-COPY --link sources/ /sources
-ARG DISTRO
-ARG SUITE
-ARG VERSION_ID
-ENV DISTRO=${DISTRO}
-ENV SUITE=${SUITE}
-ENV VERSION_ID=${VERSION_ID}
-
-COPY --link --from=golang /usr/local/go /usr/local/go
-
-WORKDIR /root/build-deb
-COPY build-deb /root/build-deb/build-deb
-
-ENTRYPOINT ["/root/build-deb/build-deb"]
diff --git a/distros.json b/distros.json
index af4fdf86dc..06d424e494 100644
--- a/distros.json
+++ b/distros.json
@@ -82,17 +82,6 @@
         "end_of_life": "04-2034",
         "end_of_support": "06-2029"
     },
-    "ubuntu-questing": {
-        "image": "ubuntu:questing",
-        "arches": [
-            "amd64",
-            "aarch64",
-            "armhf"
-        ],
-        "description": "Ubuntu 25.10",
-        "end_of_life": "26-06-2026",
-        "end_of_support": "26-06-2026"
-    },
     "ubuntu-resolute": {
         "image": "ubuntu:resolute",
         "arches": [