From f429a642f4ca6827af40e37a45a0280a0edb18b2 Mon Sep 17 00:00:00 2001 From: openeuler_bot Date: Sat, 23 Aug 2025 00:30:24 +0000 Subject: [PATCH] 24.03-lts-sp1 update tdengine to 3.3.7.4 --- .../tdengine/3.3.7.4/24.03-lts-sp1/Dockerfile | 18 +++++++++++++++++ .../tdengine/3.3.7.4/24.03-lts-sp1/build.sh | 7 +++++++ .../24.03-lts-sp1/curl_CMakeLists.txt.in | 20 +++++++++++++++++++ Database/tdengine/README.md | 1 + Database/tdengine/doc/image-info.yml | 1 + Database/tdengine/meta.yml | 4 +++- 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Database/tdengine/3.3.7.4/24.03-lts-sp1/Dockerfile create mode 100644 Database/tdengine/3.3.7.4/24.03-lts-sp1/build.sh create mode 100644 Database/tdengine/3.3.7.4/24.03-lts-sp1/curl_CMakeLists.txt.in diff --git a/Database/tdengine/3.3.7.4/24.03-lts-sp1/Dockerfile b/Database/tdengine/3.3.7.4/24.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..bf18b8e2 --- /dev/null +++ b/Database/tdengine/3.3.7.4/24.03-lts-sp1/Dockerfile @@ -0,0 +1,18 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp1 +FROM ${BASE} + +ARG VERSION=3.3.7.4 + +RUN yum install -y git cmake gcc gcc-c++ make pkgconfig openssl-devel maven golang \ + zlib-devel zlib-static snappy-devel xz-devel jansson-devel \ + libatomic-static libstdc++-static tree autoconf automake && \ + yum clean all + +RUN git clone -b ver-${VERSION} https://github.com/taosdata/TDengine.git + +COPY build.sh /TDengine/build.sh +COPY curl_CMakeLists.txt.in /TDengine/cmake/curl_CMakeLists.txt.in + +RUN cd TDengine && \ + chmod 755 build.sh && \ + ./build.sh \ No newline at end of file diff --git a/Database/tdengine/3.3.7.4/24.03-lts-sp1/build.sh b/Database/tdengine/3.3.7.4/24.03-lts-sp1/build.sh new file mode 100644 index 00000000..46555cb4 --- /dev/null +++ b/Database/tdengine/3.3.7.4/24.03-lts-sp1/build.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +if [ ! -d debug ]; then + mkdir debug || echo -e "failed to make directory for build" +fi + +cd debug && cmake .. -DJEMALLOC_ENABLED=ON -DBUILD_TOOLS=true -DBUILD_HTTP=false && make -j4 diff --git a/Database/tdengine/3.3.7.4/24.03-lts-sp1/curl_CMakeLists.txt.in b/Database/tdengine/3.3.7.4/24.03-lts-sp1/curl_CMakeLists.txt.in new file mode 100644 index 00000000..8239e472 --- /dev/null +++ b/Database/tdengine/3.3.7.4/24.03-lts-sp1/curl_CMakeLists.txt.in @@ -0,0 +1,20 @@ +# curl +ExternalProject_Add(curl2 + URL https://github.com/curl/curl/releases/download/curl-8_2_1/curl-8.2.1.tar.gz + #URL https://curl.se/download/curl-8.2.1.tar.gz + URL_HASH MD5=b25588a43556068be05e1624e0e74d41 + DOWNLOAD_NO_PROGRESS 1 + DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download" + #GIT_REPOSITORY https://github.com/curl/curl.git + #GIT_TAG curl-7_88_1 + SOURCE_DIR "${TD_CONTRIB_DIR}/curl2" + DEPENDS openssl + BUILD_IN_SOURCE TRUE + BUILD_ALWAYS 1 + UPDATE_COMMAND "" + CONFIGURE_COMMAND ${CONTRIB_CONFIG_ENV} CFLAGS+=-fPIC ./configure CXXFLAGS="-fPIC" --prefix=$ENV{HOME}/.cos-local.2 --with-ssl=$ENV{HOME}/.cos-local.2 --enable-websockets --enable-shared=no --disable-ldap --disable-ldaps --without-brotli --without-zstd --without-libidn2 --without-nghttp2 --without-libpsl --without-librtmp #--enable-debug + BUILD_COMMAND make -j + INSTALL_COMMAND make install + TEST_COMMAND "" + GIT_SHALLOW true +) \ No newline at end of file diff --git a/Database/tdengine/README.md b/Database/tdengine/README.md index e66d409c..e3597e86 100644 --- a/Database/tdengine/README.md +++ b/Database/tdengine/README.md @@ -16,6 +16,7 @@ For more information about tdengine, please visit [https://tdengine.com/](https: The tag of each tdengine docker image is consist of the version of tdengine and the version of basic image. The details are as follows | Tags | Currently | Architectures| |--|--|--| +|[3.3.7.4-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/tdengine/3.3.7.4/24.03-lts-sp1/Dockerfile) | tdengine 3.3.7.4 on openEuler 24.03-LTS-SP1 | amd64, arm64 | |[3.3.6.0-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Bigdata/tdengine/3.3.6.0/24.03-lts-sp1/Dockerfile)| tdengine 3.3.6.0 on openEuler 24.03-LTS-SP1 | amd64, arm64 | # Usage diff --git a/Database/tdengine/doc/image-info.yml b/Database/tdengine/doc/image-info.yml index 5da162b3..0e5a1454 100644 --- a/Database/tdengine/doc/image-info.yml +++ b/Database/tdengine/doc/image-info.yml @@ -11,6 +11,7 @@ tags: | | Tag | Currently | Architectures | |----------|-------------|------------------| + |[3.3.7.4-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/tdengine/3.3.7.4/24.03-lts-sp1/Dockerfile) | tdengine 3.3.7.4 on openEuler 24.03-LTS-SP1 | amd64, arm64 | |[3.3.6.0-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Bigdata/tdengine/3.3.6.0/24.03-lts-sp1/Dockerfile)| tdengine 3.3.6.0 on openEuler 24.03-LTS-SP1 | amd64, arm64 | download: | diff --git a/Database/tdengine/meta.yml b/Database/tdengine/meta.yml index fbbf9a41..b772abdd 100644 --- a/Database/tdengine/meta.yml +++ b/Database/tdengine/meta.yml @@ -1,2 +1,4 @@ 3.3.6.0-oe2403sp1: - path: 3.3.6.0/24.03-lts-sp1/Dockerfile \ No newline at end of file + path: 3.3.6.0/24.03-lts-sp1/Dockerfile +3.3.7.4-oe2403sp1: + path: 3.3.7.4/24.03-lts-sp1/Dockerfile \ No newline at end of file -- Gitee