-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Update clickhouse to the latest state #20373
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
robot-clickhouse
wants to merge
1
commit into
docker-library:master
Choose a base branch
from
ClickHouse:ClickHouse-docker-library
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Update clickhouse to the latest state #20373
robot-clickhouse
wants to merge
1
commit into
docker-library:master
from
ClickHouse:ClickHouse-docker-library
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
Diff for d43874d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e2de664..73b113f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,24 +1,29 @@
Maintainers: Misha f. Shiryaev <[email protected]> (@Felixoid), Max Kainov <[email protected]> (@mkaynov), Alexander Tokmakov <[email protected]> (@tavplubix), Alexander Sapin <[email protected]> (@alesapin)
GitRepo: https://github.com/ClickHouse/docker-library.git
GitFetch: refs/heads/main
-GitCommit: 2dbcfdb9cc31c10427dacd9a41484fda9dbc2426
+GitCommit: 6985df8e1aeee10d3ee4698630f4fd040314bbe5
-Tags: 25.3, 25.3-jammy, 25.3.8, 25.3.8-jammy, 25.3.8.23, 25.3.8.23-jammy
+Tags: 25.3, 25.3-jammy, 25.3.9, 25.3.9-jammy, 25.3.9.72, 25.3.9.72-jammy
Architectures: amd64, arm64v8
-Directory: server/25.3.8.23
+Directory: server/25.3.9.72
File: Dockerfile.ubuntu
-Tags: 25.9, 25.9-jammy, 25.9.5, 25.9.5-jammy, 25.9.5.21, 25.9.5.21-jammy
+Tags: 25.9, 25.9-jammy, 25.9.6, 25.9.6-jammy, 25.9.6.117, 25.9.6.117-jammy
Architectures: amd64, arm64v8
-Directory: server/25.9.5.21
+Directory: server/25.9.6.117
File: Dockerfile.ubuntu
-Tags: latest, jammy, 25.10, 25.10-jammy, 25.10.2, 25.10.2-jammy, 25.10.2.65, 25.10.2.65-jammy
+Tags: 25.10, 25.10-jammy, 25.10.3, 25.10.3-jammy, 25.10.3.100, 25.10.3.100-jammy
Architectures: amd64, arm64v8
-Directory: server/25.10.2.65
+Directory: server/25.10.3.100
File: Dockerfile.ubuntu
-Tags: lts, lts-jammy, 25.8, 25.8-jammy, 25.8.11, 25.8.11-jammy, 25.8.11.66, 25.8.11.66-jammy
+Tags: latest, jammy, 25.11, 25.11-jammy, 25.11.1, 25.11.1-jammy, 25.11.1.558, 25.11.1.558-jammy
Architectures: amd64, arm64v8
-Directory: server/25.8.11.66
+Directory: server/25.11.1.558
+File: Dockerfile.ubuntu
+
+Tags: lts, lts-jammy, 25.8, 25.8-jammy, 25.8.12, 25.8.12-jammy, 25.8.12.129, 25.8.12.129-jammy
+Architectures: amd64, arm64v8
+Directory: server/25.8.12.129
File: Dockerfile.ubuntu
diff --git a/_bashbrew-list b/_bashbrew-list
index 61c8b90..1392cd1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,27 +1,33 @@
clickhouse:25.3
clickhouse:25.3-jammy
-clickhouse:25.3.8
-clickhouse:25.3.8-jammy
-clickhouse:25.3.8.23
-clickhouse:25.3.8.23-jammy
+clickhouse:25.3.9
+clickhouse:25.3.9-jammy
+clickhouse:25.3.9.72
+clickhouse:25.3.9.72-jammy
clickhouse:25.8
clickhouse:25.8-jammy
-clickhouse:25.8.11
-clickhouse:25.8.11-jammy
-clickhouse:25.8.11.66
-clickhouse:25.8.11.66-jammy
+clickhouse:25.8.12
+clickhouse:25.8.12-jammy
+clickhouse:25.8.12.129
+clickhouse:25.8.12.129-jammy
clickhouse:25.9
clickhouse:25.9-jammy
-clickhouse:25.9.5
-clickhouse:25.9.5-jammy
-clickhouse:25.9.5.21
-clickhouse:25.9.5.21-jammy
+clickhouse:25.9.6
+clickhouse:25.9.6-jammy
+clickhouse:25.9.6.117
+clickhouse:25.9.6.117-jammy
clickhouse:25.10
clickhouse:25.10-jammy
-clickhouse:25.10.2
-clickhouse:25.10.2-jammy
-clickhouse:25.10.2.65
-clickhouse:25.10.2.65-jammy
+clickhouse:25.10.3
+clickhouse:25.10.3-jammy
+clickhouse:25.10.3.100
+clickhouse:25.10.3.100-jammy
+clickhouse:25.11
+clickhouse:25.11-jammy
+clickhouse:25.11.1
+clickhouse:25.11.1-jammy
+clickhouse:25.11.1.558
+clickhouse:25.11.1.558-jammy
clickhouse:jammy
clickhouse:latest
clickhouse:lts
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c671480..6e0e07c 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,4 +1,5 @@
-clickhouse:25.3.8.23-jammy
-clickhouse:25.8.11.66-jammy
-clickhouse:25.9.5.21-jammy
-clickhouse:25.10.2.65-jammy
+clickhouse:25.3.9.72-jammy
+clickhouse:25.8.12.129-jammy
+clickhouse:25.9.6.117-jammy
+clickhouse:25.10.3.100-jammy
+clickhouse:25.11.1.558-jammy
diff --git a/clickhouse_25.8.11.66-jammy/Dockerfile.ubuntu b/clickhouse_25.10.3.100-jammy/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_25.8.11.66-jammy/Dockerfile.ubuntu
rename to clickhouse_25.10.3.100-jammy/Dockerfile.ubuntu
index dfd373c..80cbdd0 100644
--- a/clickhouse_25.8.11.66-jammy/Dockerfile.ubuntu
+++ b/clickhouse_25.10.3.100-jammy/Dockerfile.ubuntu
@@ -30,7 +30,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.8.11.66"
+ARG VERSION="25.10.3.100"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
diff --git a/clickhouse_25.10.2.65-jammy/docker_related_config.xml b/clickhouse_25.10.3.100-jammy/docker_related_config.xml
similarity index 100%
copy from clickhouse_25.10.2.65-jammy/docker_related_config.xml
copy to clickhouse_25.10.3.100-jammy/docker_related_config.xml
diff --git a/clickhouse_25.10.2.65-jammy/entrypoint.sh b/clickhouse_25.10.3.100-jammy/entrypoint.sh
similarity index 100%
rename from clickhouse_25.10.2.65-jammy/entrypoint.sh
rename to clickhouse_25.10.3.100-jammy/entrypoint.sh
diff --git a/clickhouse_25.9.5.21-jammy/Dockerfile.ubuntu b/clickhouse_25.11.1.558-jammy/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_25.9.5.21-jammy/Dockerfile.ubuntu
rename to clickhouse_25.11.1.558-jammy/Dockerfile.ubuntu
index 5fd2ec9..53f5d30 100644
--- a/clickhouse_25.9.5.21-jammy/Dockerfile.ubuntu
+++ b/clickhouse_25.11.1.558-jammy/Dockerfile.ubuntu
@@ -30,7 +30,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.9.5.21"
+ARG VERSION="25.11.1.558"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
diff --git a/clickhouse_25.3.8.23-jammy/docker_related_config.xml b/clickhouse_25.11.1.558-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_25.3.8.23-jammy/docker_related_config.xml
rename to clickhouse_25.11.1.558-jammy/docker_related_config.xml
diff --git a/clickhouse_25.8.11.66-jammy/entrypoint.sh b/clickhouse_25.11.1.558-jammy/entrypoint.sh
similarity index 98%
copy from clickhouse_25.8.11.66-jammy/entrypoint.sh
copy to clickhouse_25.11.1.558-jammy/entrypoint.sh
index f4e39ef..e080451 100755
--- a/clickhouse_25.8.11.66-jammy/entrypoint.sh
+++ b/clickhouse_25.11.1.558-jammy/entrypoint.sh
@@ -179,6 +179,7 @@ function init_clickhouse_db() {
# port is needed to check if clickhouse-server is ready for connections
HTTP_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=http_port --try)"
HTTPS_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=https_port --try)"
+ NATIVE_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=tcp_port --try)"
if [ -n "$HTTP_PORT" ]; then
URL="http://127.0.0.1:$HTTP_PORT/ping"
@@ -202,7 +203,7 @@ function init_clickhouse_db() {
sleep 1
done
- clickhouseclient=( clickhouse-client --multiquery --host "127.0.0.1" -u "$CLICKHOUSE_USER" --password "$CLICKHOUSE_PASSWORD" )
+ clickhouseclient=( clickhouse-client --multiquery --host "127.0.0.1" --port "$NATIVE_PORT" -u "$CLICKHOUSE_USER" --password "$CLICKHOUSE_PASSWORD" )
echo
diff --git a/clickhouse_25.3.8.23-jammy/Dockerfile.ubuntu b/clickhouse_25.3.9.72-jammy/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_25.3.8.23-jammy/Dockerfile.ubuntu
rename to clickhouse_25.3.9.72-jammy/Dockerfile.ubuntu
index df69867..cbabd8a 100644
--- a/clickhouse_25.3.8.23-jammy/Dockerfile.ubuntu
+++ b/clickhouse_25.3.9.72-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.8.23"
+ARG VERSION="25.3.9.72"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
diff --git a/clickhouse_25.8.11.66-jammy/docker_related_config.xml b/clickhouse_25.3.9.72-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_25.8.11.66-jammy/docker_related_config.xml
rename to clickhouse_25.3.9.72-jammy/docker_related_config.xml
diff --git a/clickhouse_25.3.8.23-jammy/entrypoint.sh b/clickhouse_25.3.9.72-jammy/entrypoint.sh
similarity index 100%
rename from clickhouse_25.3.8.23-jammy/entrypoint.sh
rename to clickhouse_25.3.9.72-jammy/entrypoint.sh
diff --git a/clickhouse_25.10.2.65-jammy/Dockerfile.ubuntu b/clickhouse_25.8.12.129-jammy/Dockerfile.ubuntu
similarity index 99%
copy from clickhouse_25.10.2.65-jammy/Dockerfile.ubuntu
copy to clickhouse_25.8.12.129-jammy/Dockerfile.ubuntu
index c192e34..9ec9555 100644
--- a/clickhouse_25.10.2.65-jammy/Dockerfile.ubuntu
+++ b/clickhouse_25.8.12.129-jammy/Dockerfile.ubuntu
@@ -30,7 +30,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.10.2.65"
+ARG VERSION="25.8.12.129"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
diff --git a/clickhouse_25.9.5.21-jammy/docker_related_config.xml b/clickhouse_25.8.12.129-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_25.9.5.21-jammy/docker_related_config.xml
rename to clickhouse_25.8.12.129-jammy/docker_related_config.xml
diff --git a/clickhouse_25.8.11.66-jammy/entrypoint.sh b/clickhouse_25.8.12.129-jammy/entrypoint.sh
similarity index 100%
rename from clickhouse_25.8.11.66-jammy/entrypoint.sh
rename to clickhouse_25.8.12.129-jammy/entrypoint.sh
diff --git a/clickhouse_25.10.2.65-jammy/Dockerfile.ubuntu b/clickhouse_25.9.6.117-jammy/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_25.10.2.65-jammy/Dockerfile.ubuntu
rename to clickhouse_25.9.6.117-jammy/Dockerfile.ubuntu
index c192e34..24eb9f2 100644
--- a/clickhouse_25.10.2.65-jammy/Dockerfile.ubuntu
+++ b/clickhouse_25.9.6.117-jammy/Dockerfile.ubuntu
@@ -30,7 +30,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.10.2.65"
+ARG VERSION="25.9.6.117"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
diff --git a/clickhouse_25.10.2.65-jammy/docker_related_config.xml b/clickhouse_25.9.6.117-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_25.10.2.65-jammy/docker_related_config.xml
rename to clickhouse_25.9.6.117-jammy/docker_related_config.xml
diff --git a/clickhouse_25.9.5.21-jammy/entrypoint.sh b/clickhouse_25.9.6.117-jammy/entrypoint.sh
similarity index 100%
rename from clickhouse_25.9.5.21-jammy/entrypoint.sh
rename to clickhouse_25.9.6.117-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 Tokmakov [email protected] (@tavplubix),
Alexander Sapin [email protected] (@alesapin)