From 1142c09fc468d3d9d34e02f533c403ff49b38daa Mon Sep 17 00:00:00 2001 From: MyroTk Date: Tue, 26 May 2026 10:42:11 -0400 Subject: [PATCH] upgrade to ubuntu 26 and see what breaks --- docker/keeper/Dockerfile | 2 +- docker/keeper/Dockerfile.distroless | 2 +- docker/server/Dockerfile.alpine | 2 +- docker/server/Dockerfile.distroless | 2 +- docker/server/Dockerfile.ubuntu | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile index aae7fe7b524f..4a967b3e7600 100644 --- a/docker/keeper/Dockerfile +++ b/docker/keeper/Dockerfile @@ -1,7 +1,7 @@ # The Dockerfile.ubuntu exists for the tests/ci/docker_server.py script # If the image is built from Dockerfile.alpine, then the `-alpine` suffix is added automatically, # so the only purpose of Dockerfile.ubuntu is to push `latest`, `head` and so on w/o suffixes -FROM ubuntu:22.04 AS glibc-donor +FROM ubuntu:26.04 AS glibc-donor ARG TARGETARCH RUN arch=${TARGETARCH:-amd64} \ diff --git a/docker/keeper/Dockerfile.distroless b/docker/keeper/Dockerfile.distroless index 9b422b670f6a..50d819c948bc 100644 --- a/docker/keeper/Dockerfile.distroless +++ b/docker/keeper/Dockerfile.distroless @@ -13,7 +13,7 @@ # ────────────────────────────────────────────────────────────────────────────── # Stage 1: Install ClickHouse and assemble the output directory tree. # ────────────────────────────────────────────────────────────────────────────── -FROM ubuntu:22.04 AS ch-builder +FROM ubuntu:26.04 AS ch-builder ARG DEBIAN_FRONTEND=noninteractive ARG apt_archive="http://archive.ubuntu.com" diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine index 4eb936f3c8e7..623e874b2737 100644 --- a/docker/server/Dockerfile.alpine +++ b/docker/server/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 AS glibc-donor +FROM ubuntu:26.04 AS glibc-donor ARG TARGETARCH RUN arch=${TARGETARCH:-amd64} \ diff --git a/docker/server/Dockerfile.distroless b/docker/server/Dockerfile.distroless index 77f5f942409b..9825721c0eaf 100644 --- a/docker/server/Dockerfile.distroless +++ b/docker/server/Dockerfile.distroless @@ -13,7 +13,7 @@ # ────────────────────────────────────────────────────────────────────────────── # Stage 1: Install ClickHouse and assemble the output directory tree. # ────────────────────────────────────────────────────────────────────────────── -FROM ubuntu:22.04 AS ch-builder +FROM ubuntu:26.04 AS ch-builder # see https://github.com/moby/moby/issues/4032#issuecomment-192327844 ARG DEBIAN_FRONTEND=noninteractive diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu index 911389e4e64f..60e0b4c9a1ff 100644 --- a/docker/server/Dockerfile.ubuntu +++ b/docker/server/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:26.04 # see https://github.com/moby/moby/issues/4032#issuecomment-192327844 # It could be removed after we move on a version 23:04+