Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update the official library to the latest versions #18244

Merged
merged 1 commit into from
Jan 15, 2025
Merged

Update the official library to the latest versions #18244

merged 1 commit into from
Jan 15, 2025

Conversation

Felixoid
Copy link
Contributor

Here are the updated docker images.

Dear colleagues, our users also ask what's necessary to get the clickhouse in the Docker's ECR mirror?

@Felixoid Felixoid requested a review from a team as a code owner January 15, 2025 12:35
@github-actions GitHub Actions
Copy link

Diff for 2a496bf: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b1d549d..488fd2f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,24 +1,29 @@
 Maintainers: Misha f. Shiryaev <felixoid@clickhouse.com> (@Felixoid), Max Kainov <max.kainov@clickhouse.com> (@mkaynov), Alexander Sapin <alesapin@clickhouse.com> (@alesapin)
 GitRepo: /~https://github.com/ClickHouse/docker-library.git
 GitFetch: refs/heads/main
-GitCommit: 5e5cd0415e8ba326f35f5066ab1b3b7314df153d
+GitCommit: 25d5c4edc570e79103921d61916e8ddbc2a3b82f
 
-Tags: 24.3, 24.3-focal, 24.3.14, 24.3.14-focal, 24.3.14.35, 24.3.14.35-focal
+Tags: 24.3, 24.3-focal, 24.3.15, 24.3.15-focal, 24.3.15.72, 24.3.15.72-focal
 Architectures: amd64, arm64v8
-Directory: server/24.3.14.35
+Directory: server/24.3.15.72
 File: Dockerfile.ubuntu
 
-Tags: 24.9, 24.9-focal, 24.9.3, 24.9.3-focal, 24.9.3.128, 24.9.3.128-focal
+Tags: 24.10, 24.10-focal, 24.10.4, 24.10.4-focal, 24.10.4.191, 24.10.4.191-focal
 Architectures: amd64, arm64v8
-Directory: server/24.9.3.128
+Directory: server/24.10.4.191
 File: Dockerfile.ubuntu
 
-Tags: latest, focal, 24, 24-focal, 24.10, 24.10-focal, 24.10.2, 24.10.2-focal, 24.10.2.80, 24.10.2.80-focal
+Tags: 24.11, 24.11-jammy, 24.11.3, 24.11.3-jammy, 24.11.3.66, 24.11.3.66-jammy
 Architectures: amd64, arm64v8
-Directory: server/24.10.2.80
+Directory: server/24.11.3.66
 File: Dockerfile.ubuntu
 
-Tags: lts, lts-focal, 24.8, 24.8-focal, 24.8.7, 24.8.7-focal, 24.8.7.41, 24.8.7.41-focal
+Tags: latest, jammy, 24.12, 24.12-jammy, 24.12.3, 24.12.3-jammy, 24.12.3.47, 24.12.3.47-jammy
 Architectures: amd64, arm64v8
-Directory: server/24.8.7.41
+Directory: server/24.12.3.47
+File: Dockerfile.ubuntu
+
+Tags: lts, lts-focal, 24.8, 24.8-focal, 24.8.12, 24.8.12-focal, 24.8.12.28, 24.8.12.28-focal
+Architectures: amd64, arm64v8
+Directory: server/24.8.12.28
 File: Dockerfile.ubuntu
diff --git a/_bashbrew-list b/_bashbrew-list
index 5b2aece..7578a33 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,30 +1,34 @@
-clickhouse:24
-clickhouse:24-focal
 clickhouse:24.3
 clickhouse:24.3-focal
-clickhouse:24.3.14
-clickhouse:24.3.14-focal
-clickhouse:24.3.14.35
-clickhouse:24.3.14.35-focal
+clickhouse:24.3.15
+clickhouse:24.3.15-focal
+clickhouse:24.3.15.72
+clickhouse:24.3.15.72-focal
 clickhouse:24.8
 clickhouse:24.8-focal
-clickhouse:24.8.7
-clickhouse:24.8.7-focal
-clickhouse:24.8.7.41
-clickhouse:24.8.7.41-focal
-clickhouse:24.9
-clickhouse:24.9-focal
-clickhouse:24.9.3
-clickhouse:24.9.3-focal
-clickhouse:24.9.3.128
-clickhouse:24.9.3.128-focal
+clickhouse:24.8.12
+clickhouse:24.8.12-focal
+clickhouse:24.8.12.28
+clickhouse:24.8.12.28-focal
 clickhouse:24.10
 clickhouse:24.10-focal
-clickhouse:24.10.2
-clickhouse:24.10.2-focal
-clickhouse:24.10.2.80
-clickhouse:24.10.2.80-focal
-clickhouse:focal
+clickhouse:24.10.4
+clickhouse:24.10.4-focal
+clickhouse:24.10.4.191
+clickhouse:24.10.4.191-focal
+clickhouse:24.11
+clickhouse:24.11-jammy
+clickhouse:24.11.3
+clickhouse:24.11.3-jammy
+clickhouse:24.11.3.66
+clickhouse:24.11.3.66-jammy
+clickhouse:24.12
+clickhouse:24.12-jammy
+clickhouse:24.12.3
+clickhouse:24.12.3-jammy
+clickhouse:24.12.3.47
+clickhouse:24.12.3.47-jammy
+clickhouse:jammy
 clickhouse:latest
 clickhouse:lts
 clickhouse:lts-focal
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 5401036..01953e3 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,4 +1,5 @@
-clickhouse:24.3.14.35-focal
-clickhouse:24.8.7.41-focal
-clickhouse:24.9.3.128-focal
-clickhouse:24.10.2.80-focal
+clickhouse:24.3.15.72-focal
+clickhouse:24.8.12.28-focal
+clickhouse:24.10.4.191-focal
+clickhouse:24.11.3.66-jammy
+clickhouse:24.12.3.47-jammy
diff --git a/clickhouse_24.9.3.128-focal/Dockerfile.ubuntu b/clickhouse_24.10.4.191-focal/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_24.9.3.128-focal/Dockerfile.ubuntu
rename to clickhouse_24.10.4.191-focal/Dockerfile.ubuntu
index 878878c..096eef2 100644
--- a/clickhouse_24.9.3.128-focal/Dockerfile.ubuntu
+++ b/clickhouse_24.10.4.191-focal/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="24.9.3.128"
+ARG VERSION="24.10.4.191"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 
diff --git a/clickhouse_24.10.2.80-focal/docker_related_config.xml b/clickhouse_24.10.4.191-focal/docker_related_config.xml
similarity index 100%
copy from clickhouse_24.10.2.80-focal/docker_related_config.xml
copy to clickhouse_24.10.4.191-focal/docker_related_config.xml
diff --git a/clickhouse_24.10.2.80-focal/entrypoint.sh b/clickhouse_24.10.4.191-focal/entrypoint.sh
similarity index 100%
rename from clickhouse_24.10.2.80-focal/entrypoint.sh
rename to clickhouse_24.10.4.191-focal/entrypoint.sh
diff --git a/clickhouse_24.3.14.35-focal/Dockerfile.ubuntu b/clickhouse_24.11.3.66-jammy/Dockerfile.ubuntu
similarity index 98%
rename from clickhouse_24.3.14.35-focal/Dockerfile.ubuntu
rename to clickhouse_24.11.3.66-jammy/Dockerfile.ubuntu
index b0775fa..8943356 100644
--- a/clickhouse_24.3.14.35-focal/Dockerfile.ubuntu
+++ b/clickhouse_24.11.3.66-jammy/Dockerfile.ubuntu
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 # see /~https://github.com/moby/moby/issues/4032#issuecomment-192327844
 # It could be removed after we move on a version 23:04+
@@ -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="24.3.14.35"
+ARG VERSION="24.11.3.66"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 
diff --git a/clickhouse_24.3.14.35-focal/docker_related_config.xml b/clickhouse_24.11.3.66-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_24.3.14.35-focal/docker_related_config.xml
rename to clickhouse_24.11.3.66-jammy/docker_related_config.xml
diff --git a/clickhouse_24.9.3.128-focal/entrypoint.sh b/clickhouse_24.11.3.66-jammy/entrypoint.sh
similarity index 99%
rename from clickhouse_24.9.3.128-focal/entrypoint.sh
rename to clickhouse_24.11.3.66-jammy/entrypoint.sh
index 2f87008..947244d 100755
--- a/clickhouse_24.9.3.128-focal/entrypoint.sh
+++ b/clickhouse_24.11.3.66-jammy/entrypoint.sh
@@ -162,7 +162,7 @@ if [ -n "${RUN_INITDB_SCRIPTS}" ]; then
         tries=${CLICKHOUSE_INIT_TIMEOUT:-1000}
         while ! wget --spider --no-check-certificate -T 1 -q "$URL" 2>/dev/null; do
             if [ "$tries" -le "0" ]; then
-                echo >&2 'ClickHouse init process failed.'
+                echo >&2 'ClickHouse init process timeout.'
                 exit 1
             fi
             tries=$(( tries-1 ))
diff --git a/clickhouse_24.10.2.80-focal/Dockerfile.ubuntu b/clickhouse_24.12.3.47-jammy/Dockerfile.ubuntu
similarity index 98%
copy from clickhouse_24.10.2.80-focal/Dockerfile.ubuntu
copy to clickhouse_24.12.3.47-jammy/Dockerfile.ubuntu
index 7e537eb..6626892 100644
--- a/clickhouse_24.10.2.80-focal/Dockerfile.ubuntu
+++ b/clickhouse_24.12.3.47-jammy/Dockerfile.ubuntu
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 # see /~https://github.com/moby/moby/issues/4032#issuecomment-192327844
 # It could be removed after we move on a version 23:04+
@@ -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="24.10.2.80"
+ARG VERSION="24.12.3.47"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 
diff --git a/clickhouse_24.8.7.41-focal/docker_related_config.xml b/clickhouse_24.12.3.47-jammy/docker_related_config.xml
similarity index 100%
rename from clickhouse_24.8.7.41-focal/docker_related_config.xml
rename to clickhouse_24.12.3.47-jammy/docker_related_config.xml
diff --git a/clickhouse_24.8.7.41-focal/entrypoint.sh b/clickhouse_24.12.3.47-jammy/entrypoint.sh
similarity index 99%
copy from clickhouse_24.8.7.41-focal/entrypoint.sh
copy to clickhouse_24.12.3.47-jammy/entrypoint.sh
index 2f87008..947244d 100755
--- a/clickhouse_24.8.7.41-focal/entrypoint.sh
+++ b/clickhouse_24.12.3.47-jammy/entrypoint.sh
@@ -162,7 +162,7 @@ if [ -n "${RUN_INITDB_SCRIPTS}" ]; then
         tries=${CLICKHOUSE_INIT_TIMEOUT:-1000}
         while ! wget --spider --no-check-certificate -T 1 -q "$URL" 2>/dev/null; do
             if [ "$tries" -le "0" ]; then
-                echo >&2 'ClickHouse init process failed.'
+                echo >&2 'ClickHouse init process timeout.'
                 exit 1
             fi
             tries=$(( tries-1 ))
diff --git a/clickhouse_24.10.2.80-focal/Dockerfile.ubuntu b/clickhouse_24.3.15.72-focal/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_24.10.2.80-focal/Dockerfile.ubuntu
rename to clickhouse_24.3.15.72-focal/Dockerfile.ubuntu
index 7e537eb..d2b02e4 100644
--- a/clickhouse_24.10.2.80-focal/Dockerfile.ubuntu
+++ b/clickhouse_24.3.15.72-focal/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="24.10.2.80"
+ARG VERSION="24.3.15.72"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 
diff --git a/clickhouse_24.9.3.128-focal/docker_related_config.xml b/clickhouse_24.3.15.72-focal/docker_related_config.xml
similarity index 100%
rename from clickhouse_24.9.3.128-focal/docker_related_config.xml
rename to clickhouse_24.3.15.72-focal/docker_related_config.xml
diff --git a/clickhouse_24.3.14.35-focal/entrypoint.sh b/clickhouse_24.3.15.72-focal/entrypoint.sh
similarity index 100%
rename from clickhouse_24.3.14.35-focal/entrypoint.sh
rename to clickhouse_24.3.15.72-focal/entrypoint.sh
diff --git a/clickhouse_24.8.7.41-focal/Dockerfile.ubuntu b/clickhouse_24.8.12.28-focal/Dockerfile.ubuntu
similarity index 99%
rename from clickhouse_24.8.7.41-focal/Dockerfile.ubuntu
rename to clickhouse_24.8.12.28-focal/Dockerfile.ubuntu
index f410b3c..81e3c2c 100644
--- a/clickhouse_24.8.7.41-focal/Dockerfile.ubuntu
+++ b/clickhouse_24.8.12.28-focal/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="24.8.7.41"
+ARG VERSION="24.8.12.28"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 
diff --git a/clickhouse_24.10.2.80-focal/docker_related_config.xml b/clickhouse_24.8.12.28-focal/docker_related_config.xml
similarity index 100%
rename from clickhouse_24.10.2.80-focal/docker_related_config.xml
rename to clickhouse_24.8.12.28-focal/docker_related_config.xml
diff --git a/clickhouse_24.8.7.41-focal/entrypoint.sh b/clickhouse_24.8.12.28-focal/entrypoint.sh
similarity index 100%
rename from clickhouse_24.8.7.41-focal/entrypoint.sh
rename to clickhouse_24.8.12.28-focal/entrypoint.sh

Relevant Maintainers:

@yosifkit
Copy link
Member

Dear colleagues, our users also ask what's necessary to get the clickhouse in the Docker's ECR mirror?

The DOI team doesn't push there directly; I'll poke some folks internally to see what's up.

-clickhouse:24
-clickhouse:24-focal

Did you want to keep either of these image tags (or add a 24-jammy) to point to a newer image?

@Felixoid
Copy link
Contributor Author

Felixoid commented Jan 15, 2025 •
edited
Loading

We discussed it internally, and keeping a "major" release doesn't make sense. Our release cycle is monthly based. 24 under the hood is the same thing as the latest, and it's completely redundant.

Here's the change in our repo ClickHouse/ClickHouse#72176

@Felixoid
Copy link
Contributor Author

BTW, we updated the docs as well to highlight it /~https://github.com/docker-library/docs/pull/2528/files

@yosifkit yosifkit merged commit f2d3345 into docker-library:master Jan 15, 2025
10 checks passed
@Bkblodget
Copy link

@Felixoid thank you for informing us of the user request for the clickhouse/docker ECR mirror! The product management team is discussing roadmap placement for this work. We'll update you at the end of our next planning cycle in February.

@Felixoid
Copy link
Contributor Author

Thanks, Britney! JFYI, here's the link to the question in our public slack https://clickhousedb.slack.com/archives/CU478UEQZ/p1733149025198279

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/clickhouse
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Felixoid @yosifkit @Bkblodget