From f8fab7355df0f6428c7a2de7a21ec83d9406de67 Mon Sep 17 00:00:00 2001 From: openeuler_bot Date: Sat, 20 Sep 2025 00:02:50 +0000 Subject: [PATCH] 24.03-lts-sp2 update tdengine to 3.3.7.8 --- .../tdengine/3.3.7.8/24.03-lts-sp2/Dockerfile | 19 ++++++++++++++++ .../tdengine/3.3.7.8/24.03-lts-sp2/build.sh | 7 ++++++ .../3.3.7.8/24.03-lts-sp2/cmake_curl.patch | 22 +++++++++++++++++++ Database/tdengine/README.md | 1 + Database/tdengine/doc/image-info.yml | 1 + Database/tdengine/meta.yml | 4 +++- 6 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Database/tdengine/3.3.7.8/24.03-lts-sp2/Dockerfile create mode 100644 Database/tdengine/3.3.7.8/24.03-lts-sp2/build.sh create mode 100644 Database/tdengine/3.3.7.8/24.03-lts-sp2/cmake_curl.patch diff --git a/Database/tdengine/3.3.7.8/24.03-lts-sp2/Dockerfile b/Database/tdengine/3.3.7.8/24.03-lts-sp2/Dockerfile new file mode 100644 index 00000000..49ba7d42 --- /dev/null +++ b/Database/tdengine/3.3.7.8/24.03-lts-sp2/Dockerfile @@ -0,0 +1,19 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} +ARG VERSION=3.3.7.8 + +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 patch && \ + yum clean all + +RUN git clone -b ver-${VERSION} https://github.com/taosdata/TDengine.git + +COPY build.sh /TDengine/build.sh +COPY cmake_curl.patch /TDengine/cmake_curl.patch + +WORKDIR TDengine + +RUN patch -Np1 < cmake_curl.patch && \ + chmod 755 build.sh && \ + ./build.sh \ No newline at end of file diff --git a/Database/tdengine/3.3.7.8/24.03-lts-sp2/build.sh b/Database/tdengine/3.3.7.8/24.03-lts-sp2/build.sh new file mode 100644 index 00000000..3c9d0b21 --- /dev/null +++ b/Database/tdengine/3.3.7.8/24.03-lts-sp2/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 .. -DBUILD_TOOLS=true -DBUILD_CONTRIB=true && make -j4 \ No newline at end of file diff --git a/Database/tdengine/3.3.7.8/24.03-lts-sp2/cmake_curl.patch b/Database/tdengine/3.3.7.8/24.03-lts-sp2/cmake_curl.patch new file mode 100644 index 00000000..ebcf269d --- /dev/null +++ b/Database/tdengine/3.3.7.8/24.03-lts-sp2/cmake_curl.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/external.cmake b/cmake/external.cmake +index 2b3e51e076..647c8e26ee 100644 +--- a/cmake/external.cmake ++++ b/cmake/external.cmake +@@ -894,7 +894,7 @@ if(NOT ${TD_WINDOWS}) # { + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${_ins} + CONFIGURE_COMMAND + # COMMAND ./Configure --prefix=$ENV{HOME}/.cos-local.2 no-shared +- COMMAND ./configure --prefix=${_ins} --with-ssl=${ext_ssl_install} ++ COMMAND CFLAGS+=-fPIC CXXFLAGS+="-fPIC" ./configure --prefix=${_ins} --with-ssl=${ext_ssl_install} + --enable-websockets --enable-shared=no --disable-ldap + --disable-ldaps --without-brotli --without-zstd + --without-libidn2 --without-nghttp2 --without-libpsl +@@ -1099,7 +1099,7 @@ if (${BUILD_CONTRIB} OR NOT ${TD_LINUX}) # { + endif() + INIT_EXT(ext_rocksdb + INC_DIR include +- LIB lib/${ext_rocksdb_static} ++ LIB lib64/${ext_rocksdb_static} + ) + # URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz + # URL_HASH MD5=3b4c97ee45df9c8a5517308d31ab008b \ No newline at end of file diff --git a/Database/tdengine/README.md b/Database/tdengine/README.md index deea9231..efa0bf57 100644 --- a/Database/tdengine/README.md +++ b/Database/tdengine/README.md @@ -17,6 +17,7 @@ The tag of each tdengine docker image is consist of the version of tdengine and | Tags | Currently | Architectures | |----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|---------------| +|[3.3.7.8-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/tdengine/3.3.7.8/24.03-lts-sp2/Dockerfile) | tdengine 3.3.7.8 on openEuler 24.03-LTS-SP2 | 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 | | [3.3.7.3-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Bigdata/tdengine/3.3.7.3/24.03-lts-sp2/Dockerfile) | tdengine 3.3.7.3 on openEuler 24.03-LTS-SP2 | amd64, arm64 | diff --git a/Database/tdengine/doc/image-info.yml b/Database/tdengine/doc/image-info.yml index 5ac0685b..c041fa74 100644 --- a/Database/tdengine/doc/image-info.yml +++ b/Database/tdengine/doc/image-info.yml @@ -11,6 +11,7 @@ tags: | | Tags | Currently | Architectures | |----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|---------------| + |[3.3.7.8-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/tdengine/3.3.7.8/24.03-lts-sp2/Dockerfile) | tdengine 3.3.7.8 on openEuler 24.03-LTS-SP2 | 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 | | [3.3.7.3-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Bigdata/tdengine/3.3.7.3/24.03-lts-sp2/Dockerfile) | tdengine 3.3.7.3 on openEuler 24.03-LTS-SP2 | amd64, arm64 | diff --git a/Database/tdengine/meta.yml b/Database/tdengine/meta.yml index 57bb8e6f..3db9b34b 100644 --- a/Database/tdengine/meta.yml +++ b/Database/tdengine/meta.yml @@ -1,4 +1,6 @@ 3.3.6.0-oe2403sp1: path: 3.3.6.0/24.03-lts-sp1/Dockerfile 3.3.7.3-oe2403sp2: - path: 3.3.7.3/24.03-lts-sp2/Dockerfile \ No newline at end of file + path: 3.3.7.3/24.03-lts-sp2/Dockerfile +3.3.7.8-oe2403sp2: + path: 3.3.7.8/24.03-lts-sp2/Dockerfile \ No newline at end of file -- Gitee