Backport ClickHouse#83039 to 25.6: Partially revert changes from ClickHouse#81061

Author: robot-clickhouse

ci/docker/fasttest/Dockerfile

@@ -2,7 +2,7 @@
 FROM ubuntu:22.04
 
 # ARG for quick switch to a given ubuntu mirror
-ARG apt_archive="https://archive.ubuntu.com"
+ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i -e "s|http://archive.ubuntu.com|$apt_archive|g" -e "s|https://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 ARG LLVM_APT_VERSION="1:19.1.4"
 

ci/docker/sqlancer-test/Dockerfile

@@ -2,7 +2,7 @@
 FROM ubuntu:22.04
 
 # ARG for quick switch to a given ubuntu mirror
-ARG apt_archive="https://archive.ubuntu.com"
+ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i -e "s|http://archive.ubuntu.com|$apt_archive|g" -e "s|https://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 # We need ca-certificates first to be able to update all repos. This is why it's run twice

docker/server/Dockerfile.ubuntu

@@ -5,29 +5,26 @@ FROM ubuntu:22.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 # ARG for quick switch to a given ubuntu mirror
-ARG apt_archive="https://archive.ubuntu.com"
+ARG apt_archive="http://archive.ubuntu.com"
 
 # We shouldn't use `apt upgrade` to not change the upstream image. It's updated biweekly
 
-# We need ca-certificates first to be able to update all repos. This is why it's run twice
-RUN apt-get update \
-    && apt-get install ca-certificates --yes --no-install-recommends --verbose-versions
-
-
 # user/group precreated explicitly with fixed uid/gid on purpose.
 # It is especially important for rootless containers: in that case entrypoint
 # can't do chown and owners of mounted volumes should be configured externally.
 # We do that in advance at the begining of Dockerfile before any packages will be
 # installed to prevent picking those uid / gid by some unrelated software.
 # The same uid / gid (101) is used both for alpine and ubuntu.
-RUN sed -i -e "s|http://archive.ubuntu.com|${apt_archive}|g" -e "s|https://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list \
+RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list \
     && groupadd -r clickhouse --gid=101 \
     && useradd -r -g clickhouse --uid=101 --home-dir=/var/lib/clickhouse --shell=/bin/bash clickhouse \
     && apt-get update \
     && apt-get install --yes --no-install-recommends \
+        ca-certificates \
         locales \
         tzdata \
-        wget
+        wget \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
@@ -120,9 +117,6 @@ RUN clickhouse local -q 'SELECT 1' >/dev/null 2>&1 && exit 0 || : \
     && chmod ugo+Xrw -R /etc/clickhouse-server /etc/clickhouse-client
 # The last chmod is here to make the next one is No-op in docker official library Dockerfile
 
-# Cleanup
-RUN rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
-
 # post install
 # we need to allow "others" access to clickhouse folder, because docker container
 # can be started with arbitrary uid (openshift usecase)

docker/test/integration/runner/Dockerfile

@@ -3,7 +3,7 @@ ARG FROM_TAG=latest
 FROM clickhouse/test-util:$FROM_TAG
 
 # ARG for quick switch to a given ubuntu mirror
-ARG apt_archive="https://archive.ubuntu.com"
+ARG apt_archive="http://archive.ubuntu.com"
 
 RUN sed -i "s|https://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 

docker/test/libfuzzer/Dockerfile

@@ -3,7 +3,7 @@ ARG FROM_TAG=latest
 FROM clickhouse/test-base:$FROM_TAG
 
 # ARG for quick switch to a given ubuntu mirror
-ARG apt_archive="https://archive.ubuntu.com"
+ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i -e "s|http://archive.ubuntu.com|$apt_archive|g" -e "s|https://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 ENV LANG=C.UTF-8

docker/test/util/Dockerfile

@@ -2,7 +2,7 @@
 FROM ubuntu:22.04
 
 # ARG for quick switch to a given ubuntu mirror
-ARG apt_archive="https://archive.ubuntu.com"
+ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i -e "s|http://archive.ubuntu.com|$apt_archive|g" -e "s|https://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 ARG LLVM_APT_VERSION="1:19.1.4"
 

tests/ci/official_docker.py

@@ -27,7 +27,6 @@
 )
 
 UBUNTU_NAMES = {
-    "20.04": "focal",
     "22.04": "jammy",
 }
 
@@ -263,10 +262,16 @@ def generate_tree(args: argparse.Namespace) -> None:
         versions = get_versions_greater(args.min_version)
     else:
         versions = get_supported_versions()
+
+    # XXX: Version 24.8 is not supported by docker-library, so we must skip it
+    # https://github.com/docker-library/official-images/pull/19167#issuecomment-2934925239
+    versions = {v for v in versions if v > get_version_from_string("24.9.1.1")}
+    # TODO: remove the block after 25.8 is released
     logging.info(
         "The versions to generate:\n  %s",
         "\n  ".join(v.string for v in sorted(versions)),
     )
+
     directory = (args.directory / args.image_type).resolve()  # type: Path
     if args.clean:
         try: