Update clickhouse to the latest state #19395
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
|
The 25.6.2.5 has the same changes as 25.6.1.3206. They are fixed in ClickHouse/ClickHouse#83039 and backported to ClickHouse/ClickHouse#83090, but unfortunately, 25.6.3 hasn't been released yesterday due CI failures. I'll revert And, hooray-hooray, no 24.8 with focal anymore. |
1 task
Felixoid
force-pushed
the
ClickHouse-docker-library
branch
from
769ee34 to
045bff0
Compare
Diff for 045bff0:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 08365e9..8f47f00 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,24 +1,24 @@
Maintainers: Misha f. Shiryaev <[email protected]> (@Felixoid), Max Kainov <[email protected]> (@mkaynov), Alexander Sapin <[email protected]> (@alesapin)
GitRepo: https://github.com/ClickHouse/docker-library.git
GitFetch: refs/heads/main
-GitCommit: 100a02a77ed1b4d8cdee2db2504c7674b6ab2bfd
+GitCommit: 47c5d99dd7c86a0fe9e8702d756e815b61392390
-Tags: 25.4, 25.4-jammy, 25.4.7, 25.4.7-jammy, 25.4.7.66, 25.4.7.66-jammy
+Tags: 25.4, 25.4-jammy, 25.4.9, 25.4.9-jammy, 25.4.9.14, 25.4.9.14-jammy
Architectures: amd64, arm64v8
-Directory: server/25.4.7.66
+Directory: server/25.4.9.14
File: Dockerfile.ubuntu
-Tags: 25.5, 25.5-jammy, 25.5.4, 25.5.4-jammy, 25.5.4.38, 25.5.4.38-jammy
+Tags: 25.5, 25.5-jammy, 25.5.6, 25.5.6-jammy, 25.5.6.14, 25.5.6.14-jammy
Architectures: amd64, arm64v8
-Directory: server/25.5.4.38
+Directory: server/25.5.6.14
File: Dockerfile.ubuntu
-Tags: latest, jammy, 25.6, 25.6-jammy, 25.6.1, 25.6.1-jammy, 25.6.1.3206, 25.6.1.3206-jammy
+Tags: latest, jammy, 25.6, 25.6-jammy, 25.6.2, 25.6.2-jammy, 25.6.2.5, 25.6.2.5-jammy
Architectures: amd64, arm64v8
-Directory: server/25.6.1.3206
+Directory: server/25.6.2.5
File: Dockerfile.ubuntu
-Tags: lts, lts-jammy, 25.3, 25.3-jammy, 25.3.4, 25.3.4-jammy, 25.3.4.190, 25.3.4.190-jammy
+Tags: lts, lts-jammy, 25.3, 25.3-jammy, 25.3.5, 25.3.5-jammy, 25.3.5.42, 25.3.5.42-jammy
Architectures: amd64, arm64v8
-Directory: server/25.3.4.190
+Directory: server/25.3.5.42
File: Dockerfile.ubuntu
diff --git a/_bashbrew-list b/_bashbrew-list
index 1cd2856..ef5eaf1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,27 +1,27 @@
clickhouse:25.3
clickhouse:25.3-jammy
-clickhouse:25.3.4
-clickhouse:25.3.4-jammy
-clickhouse:25.3.4.190
-clickhouse:25.3.4.190-jammy
+clickhouse:25.3.5
+clickhouse:25.3.5-jammy
+clickhouse:25.3.5.42
+clickhouse:25.3.5.42-jammy
clickhouse:25.4
clickhouse:25.4-jammy
-clickhouse:25.4.7
-clickhouse:25.4.7-jammy
-clickhouse:25.4.7.66
-clickhouse:25.4.7.66-jammy
+clickhouse:25.4.9
+clickhouse:25.4.9-jammy
+clickhouse:25.4.9.14
+clickhouse:25.4.9.14-jammy
clickhouse:25.5
clickhouse:25.5-jammy
-clickhouse:25.5.4
-clickhouse:25.5.4-jammy
-clickhouse:25.5.4.38
-clickhouse:25.5.4.38-jammy
+clickhouse:25.5.6
+clickhouse:25.5.6-jammy
+clickhouse:25.5.6.14
+clickhouse:25.5.6.14-jammy
clickhouse:25.6
clickhouse:25.6-jammy
-clickhouse:25.6.1
-clickhouse:25.6.1-jammy
-clickhouse:25.6.1.3206
-clickhouse:25.6.1.3206-jammy
+clickhouse:25.6.2
+clickhouse:25.6.2-jammy
+clickhouse:25.6.2.5
+clickhouse:25.6.2.5-jammy
clickhouse:jammy
clickhouse:latest
clickhouse:lts
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 0acf29a..991aae1 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,4 +1,4 @@
-clickhouse:25.3.4.190-jammy
-clickhouse:25.4.7.66-jammy
-clickhouse:25.5.4.38-jammy
-clickhouse:25.6.1.3206-jammy
+clickhouse:25.3.5.42-jammy
+clickhouse:25.4.9.14-jammy
+clickhouse:25.5.6.14-jammy
+clickhouse:25.6.2.5-jammy
diff --git a/clickhouse_25.5.4.38-jammy/Dockerfile.ubuntu b/clickhouse_25.3.5.42-jammy/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_25.5.4.38-jammy/Dockerfile.ubuntu
rename to clickhouse_25.3.5.42-jammy/Dockerfile.ubuntu
index 67c144a..3ae705d 100644
--- a/clickhouse_25.5.4.38-jammy/Dockerfile.ubuntu
+++ b/clickhouse_25.3.5.42-jammy/Dockerfile.ubuntu
@@ -28,7 +28,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
ARG REPO_CHANNEL="stable"
ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION="25.5.4.38"
+ARG VERSION="25.3.5.42"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
diff --git a/clickhouse_25.3.4.190-jammy/docker_related_config.xml b/clickhouse_25.3.5.42-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_25.3.4.190-jammy/docker_related_config.xml
rename to clickhouse_25.3.5.42-jammy/docker_related_config.xml
diff --git a/clickhouse_25.3.4.190-jammy/entrypoint.sh b/clickhouse_25.3.5.42-jammy/entrypoint.sh
similarity index 100%
rename from clickhouse_25.3.4.190-jammy/entrypoint.sh
rename to clickhouse_25.3.5.42-jammy/entrypoint.sh
diff --git a/clickhouse_25.4.7.66-jammy/Dockerfile.ubuntu b/clickhouse_25.4.9.14-jammy/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_25.4.7.66-jammy/Dockerfile.ubuntu
rename to clickhouse_25.4.9.14-jammy/Dockerfile.ubuntu
index 2610366..5278583 100644
--- a/clickhouse_25.4.7.66-jammy/Dockerfile.ubuntu
+++ b/clickhouse_25.4.9.14-jammy/Dockerfile.ubuntu
@@ -28,7 +28,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
ARG REPO_CHANNEL="stable"
ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION="25.4.7.66"
+ARG VERSION="25.4.9.14"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
diff --git a/clickhouse_25.4.7.66-jammy/docker_related_config.xml b/clickhouse_25.4.9.14-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_25.4.7.66-jammy/docker_related_config.xml
rename to clickhouse_25.4.9.14-jammy/docker_related_config.xml
diff --git a/clickhouse_25.4.7.66-jammy/entrypoint.sh b/clickhouse_25.4.9.14-jammy/entrypoint.sh
similarity index 100%
rename from clickhouse_25.4.7.66-jammy/entrypoint.sh
rename to clickhouse_25.4.9.14-jammy/entrypoint.sh
diff --git a/clickhouse_25.3.4.190-jammy/Dockerfile.ubuntu b/clickhouse_25.5.6.14-jammy/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_25.3.4.190-jammy/Dockerfile.ubuntu
rename to clickhouse_25.5.6.14-jammy/Dockerfile.ubuntu
index 9e96cea..4de312d 100644
--- a/clickhouse_25.3.4.190-jammy/Dockerfile.ubuntu
+++ b/clickhouse_25.5.6.14-jammy/Dockerfile.ubuntu
@@ -28,7 +28,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
ARG REPO_CHANNEL="stable"
ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION="25.3.4.190"
+ARG VERSION="25.5.6.14"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
diff --git a/clickhouse_25.5.4.38-jammy/docker_related_config.xml b/clickhouse_25.5.6.14-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_25.5.4.38-jammy/docker_related_config.xml
rename to clickhouse_25.5.6.14-jammy/docker_related_config.xml
diff --git a/clickhouse_25.5.4.38-jammy/entrypoint.sh b/clickhouse_25.5.6.14-jammy/entrypoint.sh
similarity index 100%
rename from clickhouse_25.5.4.38-jammy/entrypoint.sh
rename to clickhouse_25.5.6.14-jammy/entrypoint.sh
diff --git a/clickhouse_25.6.1.3206-jammy/Dockerfile.ubuntu b/clickhouse_25.6.2.5-jammy/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_25.6.1.3206-jammy/Dockerfile.ubuntu
rename to clickhouse_25.6.2.5-jammy/Dockerfile.ubuntu
index 84bfb54..54f1590 100644
--- a/clickhouse_25.6.1.3206-jammy/Dockerfile.ubuntu
+++ b/clickhouse_25.6.2.5-jammy/Dockerfile.ubuntu
@@ -28,7 +28,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
ARG REPO_CHANNEL="stable"
ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION="25.6.1.3206"
+ARG VERSION="25.6.2.5"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
diff --git a/clickhouse_25.6.1.3206-jammy/docker_related_config.xml b/clickhouse_25.6.2.5-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_25.6.1.3206-jammy/docker_related_config.xml
rename to clickhouse_25.6.2.5-jammy/docker_related_config.xml
diff --git a/clickhouse_25.6.1.3206-jammy/entrypoint.sh b/clickhouse_25.6.2.5-jammy/entrypoint.sh
similarity index 100%
rename from clickhouse_25.6.1.3206-jammy/entrypoint.sh
rename to clickhouse_25.6.2.5-jammy/entrypoint.shRelevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic PR to update
clickhouseaccording to the latest releases.Maintainers: Misha f. Shiryaev [email protected] (@Felixoid),
Max Kainov [email protected] (@mkaynov),
Alexander Sapin [email protected] (@alesapin)