From 7d18635b6f95d63c464dfdd2f3ed8e7164ee4f4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
Date: Wed, 4 Feb 2026 12:03:21 +0100
Subject: [PATCH] Add Ubuntu 26.04
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
---
 deb/ubuntu-resolute/Dockerfile | 46 ++++++++++++++++++++++++++++++++++
 distros.json                   | 11 ++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 deb/ubuntu-resolute/Dockerfile

diff --git a/deb/ubuntu-resolute/Dockerfile b/deb/ubuntu-resolute/Dockerfile
new file mode 100644
index 0000000000..f2807a4302
--- /dev/null
+++ b/deb/ubuntu-resolute/Dockerfile
@@ -0,0 +1,46 @@
+# syntax=docker/dockerfile:1
+
+ARG GO_IMAGE=golang:latest
+ARG DISTRO=ubuntu
+ARG SUITE=resolute
+ARG VERSION_ID=26.04
+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
+
+ARG DEBIAN_FRONTEND=noninteractive
+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 cb88871c76..6dc69400e5 100644
--- a/distros.json
+++ b/distros.json
@@ -112,6 +112,17 @@
         "end_of_life": "26-06-2026",
         "end_of_support": "26-06-2026"
     },
+    "ubuntu-resolute": {
+        "image": "ubuntu:resolute",
+        "arches": [
+            "amd64",
+            "aarch64",
+            "armhf"
+        ],
+        "description": "Ubuntu 26.04 LTS",
+        "end_of_life": "04-2031",
+        "end_of_support": "04-2031"
+    },
     "rhel-8": {
         "image": "registry.access.redhat.com/ubi8/ubi",
         "arches": [