Skip to content

Commit 8719ef5

Browse files
Merge branch 'master' into format-settings-parsing
2 parents 278f2bb + 4eeb59e commit 8719ef5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1112
-190
lines changed

cmake/target.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ if (CMAKE_CROSSCOMPILING)
8484
message (FATAL_ERROR "Trying to cross-compile to unsupported system: ${CMAKE_SYSTEM_NAME}!")
8585
endif ()
8686

87-
message (STATUS "Cross-compiling for target: ${CMAKE_CXX_COMPILE_TARGET}")
87+
message (STATUS "Cross-compiling for target: ${CMAKE_CXX_COMPILER_TARGET}")
8888
endif ()

docker/keeper/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN arch=${TARGETARCH:-amd64} \
3434
# lts / testing / prestable / etc
3535
ARG REPO_CHANNEL="stable"
3636
ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
37-
ARG VERSION="24.6.1.4423"
37+
ARG VERSION="24.6.2.17"
3838
ARG PACKAGES="clickhouse-keeper"
3939
ARG DIRECT_DOWNLOAD_URLS=""
4040

docker/reqgenerator.py

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#!/usr/bin/env python3
2+
# To run this script you must install docker and piddeptree python package
3+
#
4+
5+
import subprocess
6+
import os
7+
import sys
8+
9+
10+
def build_docker_deps(image_name, imagedir):
11+
cmd = f"""docker run --entrypoint "/bin/bash" {image_name} -c "pip install pipdeptree 2>/dev/null 1>/dev/null && pipdeptree --freeze --warn silence | sed 's/ \+//g' | sort | uniq" > {imagedir}/requirements.txt"""
12+
subprocess.check_call(cmd, shell=True)
13+
14+
15+
def check_docker_file_install_with_pip(filepath):
16+
image_name = None
17+
with open(filepath, "r") as f:
18+
for line in f:
19+
if "docker build" in line:
20+
arr = line.split(" ")
21+
if len(arr) > 4:
22+
image_name = arr[4]
23+
if "pip3 install" in line or "pip install" in line:
24+
return image_name, True
25+
return image_name, False
26+
27+
28+
def process_affected_images(images_dir):
29+
for root, _dirs, files in os.walk(images_dir):
30+
for f in files:
31+
if f == "Dockerfile":
32+
docker_file_path = os.path.join(root, f)
33+
print("Checking image on path", docker_file_path)
34+
image_name, has_pip = check_docker_file_install_with_pip(
35+
docker_file_path
36+
)
37+
if has_pip:
38+
print("Find pip in", image_name)
39+
try:
40+
build_docker_deps(image_name, root)
41+
except Exception as ex:
42+
print(ex)
43+
else:
44+
print("Pip not found in", docker_file_path)
45+
46+
47+
process_affected_images(sys.argv[1])

docker/server/Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN arch=${TARGETARCH:-amd64} \
3232
# lts / testing / prestable / etc
3333
ARG REPO_CHANNEL="stable"
3434
ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
35-
ARG VERSION="24.6.1.4423"
35+
ARG VERSION="24.6.2.17"
3636
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
3737
ARG DIRECT_DOWNLOAD_URLS=""
3838

docker/server/Dockerfile.ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
2828

2929
ARG REPO_CHANNEL="stable"
3030
ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
31-
ARG VERSION="24.6.1.4423"
31+
ARG VERSION="24.6.2.17"
3232
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
3333

3434
#docker-official-library:off

docker/test/fasttest/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ RUN apt-get update \
1919
odbcinst \
2020
psmisc \
2121
python3 \
22-
python3-lxml \
2322
python3-pip \
24-
python3-requests \
25-
python3-termcolor \
2623
unixodbc \
2724
pv \
2825
jq \
@@ -31,14 +28,19 @@ RUN apt-get update \
3128
&& apt-get clean \
3229
&& rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
3330

34-
RUN pip3 install numpy==1.26.3 scipy==1.12.0 pandas==1.5.3 Jinja2==3.1.3
31+
COPY requirements.txt /
32+
RUN pip3 install --no-cache-dir -r /requirements.txt
3533

3634
# This symlink is required by gcc to find the lld linker
3735
RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
3836
# FIXME: workaround for "The imported target "merge-fdata" references the file" error
3937
# https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/-/commit/992e52c0b156a5ba9c6a8a54f8c4857ddd3d371d
4038
RUN sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|llvm-bolt\|merge-fdata\|MLIR\)/ {s|^|#|}' /usr/lib/llvm-${LLVM_VERSION}/lib/cmake/llvm/LLVMExports-*.cmake
4139

40+
# LLVM changes paths for compiler-rt libraries. For some reason clang-18.1.8 cannot catch up libraries from default install path.
41+
# It's very dirty workaround, better to build compiler and LLVM ourself and use it. Details: https://github.com/llvm/llvm-project/issues/95792
42+
RUN test ! -d /usr/lib/llvm-18/lib/clang/18/lib/x86_64-pc-linux-gnu || ln -s /usr/lib/llvm-18/lib/clang/18/lib/x86_64-pc-linux-gnu /usr/lib/llvm-18/lib/clang/18/lib/x86_64-unknown-linux-gnu
43+
4244
ARG CCACHE_VERSION=4.6.1
4345
RUN mkdir /tmp/ccache \
4446
&& cd /tmp/ccache \
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
Jinja2==3.1.3
2+
MarkupSafe==2.1.5
3+
PyJWT==2.3.0
4+
PyYAML==6.0.1
5+
Pygments==2.11.2
6+
SecretStorage==3.3.1
7+
blinker==1.4
8+
certifi==2020.6.20
9+
chardet==4.0.0
10+
cryptography==3.4.8
11+
dbus-python==1.2.18
12+
distro==1.7.0
13+
httplib2==0.20.2
14+
idna==3.3
15+
importlib-metadata==4.6.4
16+
jeepney==0.7.1
17+
keyring==23.5.0
18+
launchpadlib==1.10.16
19+
lazr.restfulclient==0.14.4
20+
lazr.uri==1.0.6
21+
lxml==4.8.0
22+
more-itertools==8.10.0
23+
numpy==1.26.3
24+
oauthlib==3.2.0
25+
packaging==24.1
26+
pandas==1.5.3
27+
pip==24.1.1
28+
pipdeptree==2.23.0
29+
pyparsing==2.4.7
30+
python-apt==2.4.0+ubuntu3
31+
python-dateutil==2.9.0.post0
32+
pytz==2024.1
33+
requests==2.32.3
34+
scipy==1.12.0
35+
setuptools==59.6.0
36+
six==1.16.0
37+
termcolor==1.1.0
38+
urllib3==1.26.5
39+
wadllib==1.3.6
40+
wheel==0.37.1
41+
zipp==1.0.0

docker/test/fuzzer/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ RUN apt-get update \
3131
&& apt-get clean \
3232
&& rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
3333

34-
RUN pip3 install Jinja2
34+
COPY requirements.txt /
35+
RUN pip3 install --no-cache-dir -r /requirements.txt
3536

3637
COPY * /
3738

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
blinker==1.4
2+
cryptography==3.4.8
3+
dbus-python==1.2.18
4+
distro==1.7.0
5+
httplib2==0.20.2
6+
importlib-metadata==4.6.4
7+
jeepney==0.7.1
8+
Jinja2==3.1.4
9+
keyring==23.5.0
10+
launchpadlib==1.10.16
11+
lazr.restfulclient==0.14.4
12+
lazr.uri==1.0.6
13+
MarkupSafe==2.1.5
14+
more-itertools==8.10.0
15+
oauthlib==3.2.0
16+
packaging==24.1
17+
pip==24.1.1
18+
pipdeptree==2.23.0
19+
PyJWT==2.3.0
20+
pyparsing==2.4.7
21+
python-apt==2.4.0+ubuntu3
22+
SecretStorage==3.3.1
23+
setuptools==59.6.0
24+
six==1.16.0
25+
wadllib==1.3.6
26+
wheel==0.37.1
27+
zipp==1.0.0

docker/test/integration/base/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ RUN apt-get update \
3333
&& apt-get clean \
3434
&& rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
3535

36-
RUN pip3 install pycurl
36+
COPY requirements.txt /
37+
RUN pip3 install --no-cache-dir -r requirements.txt && rm -rf /root/.cache/pip
3738

3839
# Architecture of the image when BuildKit/buildx is used
3940
ARG TARGETARCH

0 commit comments

Comments
 (0)