Add supported versions of clickhouse. Fix 24.10 base #17876
Merged
+17
−2
Conversation
This file contains 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 18488c9:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 37c2135..cdbec6a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,24 @@
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: 8f3278549dd6ac2832287c18c6a35a5f90eb3394
+GitCommit: e991ffaf2d96bab935a248d5701c58f637d3040e
-Tags: latest, jammy, 24, 24-jammy, 24.10, 24.10-jammy, 24.10.1, 24.10.1-jammy, 24.10.1.2812, 24.10.1.2812-jammy
+Tags: 24.3, 24.3-focal, 24.3.13, 24.3.13-focal, 24.3.13.40, 24.3.13.40-focal
+Architectures: amd64, arm64v8
+Directory: server/24.3.13.40
+File: Dockerfile.ubuntu
+
+Tags: 24.9, 24.9-focal, 24.9.2, 24.9.2-focal, 24.9.2.42, 24.9.2.42-focal
+Architectures: amd64, arm64v8
+Directory: server/24.9.2.42
+File: Dockerfile.ubuntu
+
+Tags: latest, focal, 24, 24-focal, 24.10, 24.10-focal, 24.10.1, 24.10.1-focal, 24.10.1.2812, 24.10.1.2812-focal
Architectures: amd64, arm64v8
Directory: server/24.10.1.2812
File: Dockerfile.ubuntu
+
+Tags: lts, focal-lts, 24.8, 24.8-focal, 24.8.6, 24.8.6-focal, 24.8.6.70, 24.8.6.70-focal
+Architectures: amd64, arm64v8
+Directory: server/24.8.6.70
+File: Dockerfile.ubuntu
diff --git a/_bashbrew-list b/_bashbrew-list
index 9047fc8..70c2919 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,10 +1,30 @@
clickhouse:24
-clickhouse:24-jammy
+clickhouse:24-focal
+clickhouse:24.3
+clickhouse:24.3-focal
+clickhouse:24.3.13
+clickhouse:24.3.13-focal
+clickhouse:24.3.13.40
+clickhouse:24.3.13.40-focal
+clickhouse:24.8
+clickhouse:24.8-focal
+clickhouse:24.8.6
+clickhouse:24.8.6-focal
+clickhouse:24.8.6.70
+clickhouse:24.8.6.70-focal
+clickhouse:24.9
+clickhouse:24.9-focal
+clickhouse:24.9.2
+clickhouse:24.9.2-focal
+clickhouse:24.9.2.42
+clickhouse:24.9.2.42-focal
clickhouse:24.10
-clickhouse:24.10-jammy
+clickhouse:24.10-focal
clickhouse:24.10.1
-clickhouse:24.10.1-jammy
+clickhouse:24.10.1-focal
clickhouse:24.10.1.2812
-clickhouse:24.10.1.2812-jammy
-clickhouse:jammy
+clickhouse:24.10.1.2812-focal
+clickhouse:focal
+clickhouse:focal-lts
clickhouse:latest
+clickhouse:lts
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 669c034..ab8ecfe 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1 +1,4 @@
-clickhouse:24.10.1.2812-jammy
+clickhouse:24.3.13.40-focal
+clickhouse:24.8.6.70-focal
+clickhouse:24.9.2.42-focal
+clickhouse:24.10.1.2812-focal
diff --git a/clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu b/clickhouse_24.10.1.2812-focal/Dockerfile.ubuntu
similarity index 93%
copy from clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu
copy to clickhouse_24.10.1.2812-focal/Dockerfile.ubuntu
index 54b9722..499e76f 100644
--- a/clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu
+++ b/clickhouse_24.10.1.2812-focal/Dockerfile.ubuntu
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:20.04
# see https://github.com/moby/moby/issues/4032#issuecomment-192327844
# It could be removed after we move on a version 23:04+
@@ -58,7 +58,9 @@ RUN clickhouse local -q 'SELECT 1' >/dev/null 2>&1 && exit 0 || : \
/var/lib/apt/lists/* \
/var/cache/debconf \
/tmp/* \
- && apt-get autoremove --purge -yq dirmngr gnupg2
+ && apt-get autoremove --purge -yq dirmngr gnupg2 \
+ && chmod ugo+Xrw -R /etc/clickhouse-server /etc/clickhouse-client
+# The last chmod is here to make the next one is No-op in docker official library Dockerfile
# post install
# we need to allow "others" access to clickhouse folder, because docker container
diff --git a/clickhouse_24.10.1.2812-jammy/docker_related_config.xml b/clickhouse_24.10.1.2812-focal/docker_related_config.xml
similarity index 100%
copy from clickhouse_24.10.1.2812-jammy/docker_related_config.xml
copy to clickhouse_24.10.1.2812-focal/docker_related_config.xml
diff --git a/clickhouse_24.10.1.2812-jammy/entrypoint.sh b/clickhouse_24.10.1.2812-focal/entrypoint.sh
similarity index 100%
copy from clickhouse_24.10.1.2812-jammy/entrypoint.sh
copy to clickhouse_24.10.1.2812-focal/entrypoint.sh
diff --git a/clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu b/clickhouse_24.3.13.40-focal/Dockerfile.ubuntu
similarity index 92%
copy from clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu
copy to clickhouse_24.3.13.40-focal/Dockerfile.ubuntu
index 54b9722..8fdb5ae 100644
--- a/clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu
+++ b/clickhouse_24.3.13.40-focal/Dockerfile.ubuntu
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:20.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.1.2812"
+ARG VERSION="24.3.13.40"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
@@ -58,7 +58,9 @@ RUN clickhouse local -q 'SELECT 1' >/dev/null 2>&1 && exit 0 || : \
/var/lib/apt/lists/* \
/var/cache/debconf \
/tmp/* \
- && apt-get autoremove --purge -yq dirmngr gnupg2
+ && apt-get autoremove --purge -yq dirmngr gnupg2 \
+ && chmod ugo+Xrw -R /etc/clickhouse-server /etc/clickhouse-client
+# The last chmod is here to make the next one is No-op in docker official library Dockerfile
# post install
# we need to allow "others" access to clickhouse folder, because docker container
diff --git a/clickhouse_24.10.1.2812-jammy/docker_related_config.xml b/clickhouse_24.3.13.40-focal/docker_related_config.xml
similarity index 100%
copy from clickhouse_24.10.1.2812-jammy/docker_related_config.xml
copy to clickhouse_24.3.13.40-focal/docker_related_config.xml
diff --git a/clickhouse_24.10.1.2812-jammy/entrypoint.sh b/clickhouse_24.3.13.40-focal/entrypoint.sh
similarity index 100%
copy from clickhouse_24.10.1.2812-jammy/entrypoint.sh
copy to clickhouse_24.3.13.40-focal/entrypoint.sh
diff --git a/clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu b/clickhouse_24.8.6.70-focal/Dockerfile.ubuntu
similarity index 92%
copy from clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu
copy to clickhouse_24.8.6.70-focal/Dockerfile.ubuntu
index 54b9722..d26bd9e 100644
--- a/clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu
+++ b/clickhouse_24.8.6.70-focal/Dockerfile.ubuntu
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:20.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.1.2812"
+ARG VERSION="24.8.6.70"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
@@ -58,7 +58,9 @@ RUN clickhouse local -q 'SELECT 1' >/dev/null 2>&1 && exit 0 || : \
/var/lib/apt/lists/* \
/var/cache/debconf \
/tmp/* \
- && apt-get autoremove --purge -yq dirmngr gnupg2
+ && apt-get autoremove --purge -yq dirmngr gnupg2 \
+ && chmod ugo+Xrw -R /etc/clickhouse-server /etc/clickhouse-client
+# The last chmod is here to make the next one is No-op in docker official library Dockerfile
# post install
# we need to allow "others" access to clickhouse folder, because docker container
diff --git a/clickhouse_24.10.1.2812-jammy/docker_related_config.xml b/clickhouse_24.8.6.70-focal/docker_related_config.xml
similarity index 100%
copy from clickhouse_24.10.1.2812-jammy/docker_related_config.xml
copy to clickhouse_24.8.6.70-focal/docker_related_config.xml
diff --git a/clickhouse_24.10.1.2812-jammy/entrypoint.sh b/clickhouse_24.8.6.70-focal/entrypoint.sh
similarity index 100%
copy from clickhouse_24.10.1.2812-jammy/entrypoint.sh
copy to clickhouse_24.8.6.70-focal/entrypoint.sh
diff --git a/clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu b/clickhouse_24.9.2.42-focal/Dockerfile.ubuntu
similarity index 92%
rename from clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu
rename to clickhouse_24.9.2.42-focal/Dockerfile.ubuntu
index 54b9722..f14866c 100644
--- a/clickhouse_24.10.1.2812-jammy/Dockerfile.ubuntu
+++ b/clickhouse_24.9.2.42-focal/Dockerfile.ubuntu
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:20.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.1.2812"
+ARG VERSION="24.9.2.42"
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
@@ -58,7 +58,9 @@ RUN clickhouse local -q 'SELECT 1' >/dev/null 2>&1 && exit 0 || : \
/var/lib/apt/lists/* \
/var/cache/debconf \
/tmp/* \
- && apt-get autoremove --purge -yq dirmngr gnupg2
+ && apt-get autoremove --purge -yq dirmngr gnupg2 \
+ && chmod ugo+Xrw -R /etc/clickhouse-server /etc/clickhouse-client
+# The last chmod is here to make the next one is No-op in docker official library Dockerfile
# post install
# we need to allow "others" access to clickhouse folder, because docker container
diff --git a/clickhouse_24.10.1.2812-jammy/docker_related_config.xml b/clickhouse_24.9.2.42-focal/docker_related_config.xml
similarity index 100%
rename from clickhouse_24.10.1.2812-jammy/docker_related_config.xml
rename to clickhouse_24.9.2.42-focal/docker_related_config.xml
diff --git a/clickhouse_24.10.1.2812-jammy/entrypoint.sh b/clickhouse_24.9.2.42-focal/entrypoint.sh
similarity index 100%
rename from clickhouse_24.10.1.2812-jammy/entrypoint.sh
rename to clickhouse_24.9.2.42-focal/entrypoint.shRelevant Maintainers: |
- && apt-get autoremove --purge -yq dirmngr gnupg2
+ && apt-get autoremove --purge -yq dirmngr gnupg2 \
+ && chmod ugo+Xrw -R /etc/clickhouse-server /etc/clickhouse-client
+# The last chmod is here to make the next one is No-op in docker official library DockerfileThis part is related to the note from @yosifkit in #15846 (comment) The |
yosifkit
approved these changes
Nov 12, 2024
21 tasks
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.
Regenerate 24.10 image to use ubuntu 20.04 base.
Add
chmodto the installation step to not change files later.Add all supported versions.