diff --git a/Database/tdengine/3.3.7.3/24.03-lts-sp2/Dockerfile b/Database/tdengine/3.3.7.3/24.03-lts-sp2/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..fa1f60b625f937dad10fec38ec155666df97f481 --- /dev/null +++ b/Database/tdengine/3.3.7.3/24.03-lts-sp2/Dockerfile @@ -0,0 +1,19 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} +ARG VERSION=3.3.7.3 + +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.3/24.03-lts-sp2/build.sh b/Database/tdengine/3.3.7.3/24.03-lts-sp2/build.sh new file mode 100644 index 0000000000000000000000000000000000000000..3c9d0b21563efda21d6010a36a88e3f3d9cf066f --- /dev/null +++ b/Database/tdengine/3.3.7.3/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.3/24.03-lts-sp2/cmake_curl.patch b/Database/tdengine/3.3.7.3/24.03-lts-sp2/cmake_curl.patch new file mode 100644 index 0000000000000000000000000000000000000000..ebcf269da3ed9941adafebcd391d9f5d22773b40 --- /dev/null +++ b/Database/tdengine/3.3.7.3/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 e66d409cf9d4efda45a65bf3a82d165c1c295ad9..deea92318a92ce74b7c9ef608385a46eb4bcc8c2 100644 --- a/Database/tdengine/README.md +++ b/Database/tdengine/README.md @@ -14,9 +14,11 @@ For more information about tdengine, please visit [https://tdengine.com/](https: # Supported tags and respective Dockerfile links 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.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 | + +| Tags | Currently | Architectures | +|----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|---------------| +| [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 | # Usage diff --git a/Database/tdengine/doc/image-info.yml b/Database/tdengine/doc/image-info.yml index 5da162b386351540ee707b0af0846f7db5c4d576..5ac0685b51d178a593266f82d78823c0e1eb7328 100644 --- a/Database/tdengine/doc/image-info.yml +++ b/Database/tdengine/doc/image-info.yml @@ -9,9 +9,11 @@ environment: | tags: | tdengine镜像的Tag由其版本信息和基础镜像版本信息组成，详细内容如下 - | Tag | Currently | Architectures | - |----------|-------------|------------------| - |[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 | + | Tags | Currently | Architectures | + |----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|---------------| + | [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 | + download: | 拉取镜像到本地 diff --git a/Database/tdengine/meta.yml b/Database/tdengine/meta.yml index fbbf9a41dece5f2746a4a5dda9912f840a20cf14..57bb8e6f32d48dc58eede492031361d1e4c030a6 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.3-oe2403sp2: + path: 3.3.7.3/24.03-lts-sp2/Dockerfile \ No newline at end of file