From 9a2a664b045c81b14cd579fb1f19799f0577cf5b Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Wed, 20 Nov 2024 15:12:58 +0100 Subject: [PATCH] Get rid of `major` tags in official docker images --- docker/server/README.md | 6 ++++-- docker/server/README.src/content.md | 6 ++++-- tests/ci/official_docker.py | 12 +----------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/docker/server/README.md b/docker/server/README.md index 5f6144d0633..89566d6eb38 100644 --- a/docker/server/README.md +++ b/docker/server/README.md @@ -16,16 +16,18 @@ ClickHouse works 100-1000x faster than traditional database management systems, For more information and documentation see https://clickhouse.com/. - ## Versions - The `latest` tag points to the latest release of the latest stable branch. - Branch tags like `22.2` point to the latest release of the corresponding branch. -- Full version tags like `22.2.3.5` point to the corresponding release. +- Full version tags like `22.2.3` and `22.2.3.5` point to the corresponding release. + + - The tag `head` is built from the latest commit to the default branch. - Each tag has optional `-alpine` suffix to reflect that it's built on top of `alpine`. + ### Compatibility - The amd64 image requires support for [SSE3 instructions](https://en.wikipedia.org/wiki/SSE3). Virtually all x86 CPUs after 2005 support SSE3. diff --git a/docker/server/README.src/content.md b/docker/server/README.src/content.md index df0b6718d69..d33f5dd29f9 100644 --- a/docker/server/README.src/content.md +++ b/docker/server/README.src/content.md @@ -10,16 +10,18 @@ ClickHouse works 100-1000x faster than traditional database management systems, For more information and documentation see https://clickhouse.com/. - ## Versions - The `latest` tag points to the latest release of the latest stable branch. - Branch tags like `22.2` point to the latest release of the corresponding branch. -- Full version tags like `22.2.3.5` point to the corresponding release. +- Full version tags like `22.2.3` and `22.2.3.5` point to the corresponding release. + + - The tag `head` is built from the latest commit to the default branch. - Each tag has optional `-alpine` suffix to reflect that it's built on top of `alpine`. + ### Compatibility - The amd64 image requires support for [SSE3 instructions](https://en.wikipedia.org/wiki/SSE3). Virtually all x86 CPUs after 2005 support SSE3. diff --git a/tests/ci/official_docker.py b/tests/ci/official_docker.py index f62002ee1d2..ffa8b194018 100644 --- a/tests/ci/official_docker.py +++ b/tests/ci/official_docker.py @@ -299,8 +299,6 @@ class TagAttrs: # Only one latest can exist latest: ClickHouseVersion - # Only one can be a major one (the most fresh per a year) - majors: Dict[int, ClickHouseVersion] # Only one lts version can exist lts: Optional[ClickHouseVersion] @@ -345,14 +343,6 @@ def ldf_tags(version: ClickHouseVersion, distro: str, tag_attrs: TagAttrs) -> st tags.append("lts") tags.append(f"lts-{distro}") - # If the tag `22`, `23`, `24` etc. should be included in the tags - with_major = tag_attrs.majors.get(version.major) in (None, version) - if with_major: - tag_attrs.majors[version.major] = version - if without_distro: - tags.append(f"{version.major}") - tags.append(f"{version.major}-{distro}") - # Add all normal tags for tag in ( f"{version.major}.{version.minor}", @@ -384,7 +374,7 @@ def generate_ldf(args: argparse.Namespace) -> None: args.directory / git_runner(f"git -C {args.directory} rev-parse --show-cdup") ).absolute() lines = ldf_header(git, directory) - tag_attrs = TagAttrs(versions[-1], {}, None) + tag_attrs = TagAttrs(versions[-1], None) # We iterate from the most recent to the oldest version for version in reversed(versions):