Skip to content

Commit 1462a66

Browse files
robot-clickhouserobot-clickhouse
committed
Backport #83039 to 25.6: Partially revert changes from #81061 
1 parent c276eb5 commit 1462a66

File tree

7 files changed

+16
-17
lines changed

7 files changed

+16
-17
lines changed

‎ci/docker/fasttest/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM ubuntu:22.04
33

44
# ARG for quick switch to a given ubuntu mirror
5-
ARG apt_archive="https://archive.ubuntu.com"
5+
ARG apt_archive="http://archive.ubuntu.com"
66
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
77
ARG LLVM_APT_VERSION="1:19.1.4"
88

‎ci/docker/sqlancer-test/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM ubuntu:22.04
33

44
# ARG for quick switch to a given ubuntu mirror
5-
ARG apt_archive="https://archive.ubuntu.com"
5+
ARG apt_archive="http://archive.ubuntu.com"
66
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
77

88
# We need ca-certificates first to be able to update all repos. This is why it's run twice

‎docker/server/Dockerfile.ubuntu‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,26 @@ FROM ubuntu:22.04
55
ARG DEBIAN_FRONTEND=noninteractive
66

77
# ARG for quick switch to a given ubuntu mirror
8-
ARG apt_archive="https://archive.ubuntu.com"
8+
ARG apt_archive="http://archive.ubuntu.com"
99

1010
# We shouldn't use `apt upgrade` to not change the upstream image. It's updated biweekly
1111

12-
# We need ca-certificates first to be able to update all repos. This is why it's run twice
13-
RUN apt-get update \
14-
&& apt-get install ca-certificates --yes --no-install-recommends --verbose-versions
15-
16-
1712
# user/group precreated explicitly with fixed uid/gid on purpose.
1813
# It is especially important for rootless containers: in that case entrypoint
1914
# can't do chown and owners of mounted volumes should be configured externally.
2015
# We do that in advance at the begining of Dockerfile before any packages will be
2116
# installed to prevent picking those uid / gid by some unrelated software.
2217
# The same uid / gid (101) is used both for alpine and ubuntu.
23-
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 \
18+
RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list \
2419
&& groupadd -r clickhouse --gid=101 \
2520
&& useradd -r -g clickhouse --uid=101 --home-dir=/var/lib/clickhouse --shell=/bin/bash clickhouse \
2621
&& apt-get update \
2722
&& apt-get install --yes --no-install-recommends \
23+
ca-certificates \
2824
locales \
2925
tzdata \
30-
wget
26+
wget \
27+
&& rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
3128

3229
ARG REPO_CHANNEL="stable"
3330
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 || : \
120117
&& chmod ugo+Xrw -R /etc/clickhouse-server /etc/clickhouse-client
121118
# The last chmod is here to make the next one is No-op in docker official library Dockerfile
122119

123-
# Cleanup
124-
RUN rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
125-
126120
# post install
127121
# we need to allow "others" access to clickhouse folder, because docker container
128122
# can be started with arbitrary uid (openshift usecase)

‎docker/test/integration/runner/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG FROM_TAG=latest
33
FROM clickhouse/test-util:$FROM_TAG
44

55
# ARG for quick switch to a given ubuntu mirror
6-
ARG apt_archive="https://archive.ubuntu.com"
6+
ARG apt_archive="http://archive.ubuntu.com"
77

88
RUN sed -i "s|https://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
99

‎docker/test/libfuzzer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG FROM_TAG=latest
33
FROM clickhouse/test-base:$FROM_TAG
44

55
# ARG for quick switch to a given ubuntu mirror
6-
ARG apt_archive="https://archive.ubuntu.com"
6+
ARG apt_archive="http://archive.ubuntu.com"
77
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
88

99
ENV LANG=C.UTF-8

‎docker/test/util/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM ubuntu:22.04
33

44
# ARG for quick switch to a given ubuntu mirror
5-
ARG apt_archive="https://archive.ubuntu.com"
5+
ARG apt_archive="http://archive.ubuntu.com"
66
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
77
ARG LLVM_APT_VERSION="1:19.1.4"
88

‎tests/ci/official_docker.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
)
2828

2929
UBUNTU_NAMES = {
30-
"20.04": "focal",
3130
"22.04": "jammy",
3231
}
3332

@@ -263,10 +262,16 @@ def generate_tree(args: argparse.Namespace) -> None:
263262
versions = get_versions_greater(args.min_version)
264263
else:
265264
versions = get_supported_versions()
265+
266+
# XXX: Version 24.8 is not supported by docker-library, so we must skip it
267+
# https://github.com/docker-library/official-images/pull/19167#issuecomment-2934925239
268+
versions = {v for v in versions if v > get_version_from_string("24.9.1.1")}
269+
# TODO: remove the block after 25.8 is released
266270
logging.info(
267271
"The versions to generate:\n %s",
268272
"\n ".join(v.string for v in sorted(versions)),
269273
)
274+
270275
directory = (args.directory / args.image_type).resolve() # type: Path
271276
if args.clean:
272277
try:

0 commit comments

Comments
 (0)