Commit graph

104 commits

Author SHA1 Message Date
chenhaoran
fb6eccc411 fix(docker): remove openjdk-17-jre-headless entry from Dockerfile.base 2025-10-31 17:06:26 +08:00
WANG Xu
3a90b2da1e
Merge pull request #33311 from taosdata/enh/main-docker
feat(docker): add Dockerfile for TDengine and improve entrypoint script
2025-10-31 16:28:14 +08:00
WANG Xu
0da5cabbd6
refactor: comment in dockerfile 2025-10-31 16:26:46 +08:00
chenhaoran
9d16ef12e3 fix(docker): specify version for base image in Dockerfile and remove duplicate openjdk-17-jre-headless entry in Dockerfile.base 2025-10-31 16:18:51 +08:00
chenhaoran
6c856616f3 fix(docker): remove duplicate openjdk-17-jre-headless entry in Dockerfile.base 2025-10-31 16:16:40 +08:00
chenhaoran
91436e083a feat(docker): add build-docker.sh script for building TDengine Docker images 2025-10-31 15:14:29 +08:00
chenhaoran
b6b045d20e fix(docker): correct entrypoint path in Dockerfile-cd and remove unused build args in Dockerfile.base 2025-10-28 21:00:24 +08:00
chenhaoran
31d541431f fix(docker): correct typo in comment and format valgrind line in Dockerfile 2025-10-27 14:10:44 +08:00
chenhaoran
97aed9793c fix(docker): remove unnecessary apt-get upgrade step in Dockerfile 2025-10-27 14:09:41 +08:00
chenhaoran
58525df6ef feat(docker): add base Dockerfile for TDengine with essential dependencies 2025-10-24 17:30:27 +08:00
huohong
8ef7ad067e
enh: add fastdtw installation to install.sh (#33357) 2025-10-24 13:42:41 +08:00
chenhaoran
3fc76660f0 fix(docker): refine condition for restoring original apt sources 2025-10-21 18:25:51 +08:00
chenhaoran
c42437da67 fix(docker): remove unnecessary variable expansion in LD_LIBRARY_PATH 2025-10-21 11:34:30 +08:00
chenhaoran
c3b115ef37 feat(docker): add netcat-openbsd to the base image dependencies 2025-10-21 11:33:35 +08:00
chenhaoran
ddce25e8e8 fix: update health check endpoints from /status to /metrics for taosadapter, taoskeeper, and taos-explorer 2025-10-20 20:09:03 +08:00
chenhaoran
1524084418 feat(docker): add Dockerfile for TDengine and improve entrypoint script 2025-10-20 14:19:57 +08:00
huohong
0b4e9dd20d
Update packaging/docker/entrypoint.sh
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2025-10-13 14:44:08 +08:00
huohong
f5999515f4 fix: fix tdgpt timemoe model directory 2025-10-11 10:54:20 +08:00
huohong
adac2b6883
enh: add installation of prophet library in install.sh (#33069) 2025-09-25 10:49:30 +08:00
huohong
6ea60b148d
test: TDgpt docker opt (#32949) 2025-09-12 10:00:23 +08:00
WANG Xu
abb6d77e8f
Update packaging/docker/Dockerfile 2025-09-11 19:26:51 +08:00
jiajingbin
e8b3ca4611 fix: format Dockerfile 2025-09-11 19:23:40 +08:00
WANG Xu
d67052727a
refactor: expose ports in Dockerfile
Signed-off-by: WANG Xu <feici02@outlook.com>
2025-09-10 15:10:27 +08:00
Haojun Liao
17145d8f38
fix(gpt): support download model for docker. (#32773) 2025-08-27 19:21:28 +08:00
WANG Xu
02b77b9d5c
Merge pull request #32345 from taosdata/enh/main/docker-create-snode
feat(entrypoint): add wait for serverPort and create snode on dnode
2025-07-30 16:08:39 +08:00
jiajingbin
2ebdc5fe44 enh: set queryUseMemoryPool to 0 2025-07-29 10:56:07 +08:00
chenhaoran
f156610721 fix(entrypoint): move snode creation command after serverPort readiness check 2025-07-28 20:11:43 +08:00
chenhaoran
c86894cf50 feat(entrypoint): add wait for serverPort and create snode on dnode 2025-07-28 19:52:48 +08:00
蟑螂·魂
b3fb6862c9
fix: 避免while循环打印无效日志
将while true; do sleep 1000; done替换为tail -f /dev/null执行,避免无效日志的打印,同时在保活的情况下降低执行占用。对脚本各命令进行了反复执行测试,未发现影响。
2025-06-30 10:26:33 +08:00
WANG Xu
516eb1eb90
refactor: remove sleep 3 2025-06-10 16:28:01 +08:00
蟑螂·魂
45bffe11f4
fix: 修正因DISABLE_EXPLORER定义未使用,导致无法控制taos-explorer启动与否。
fix: 修正因DISABLE_EXPLORER定义未使用,导致无法控制taos-explorer启动与否。
2025-06-06 14:08:02 +08:00
蟑螂·魂
02433a95e6
fix: 修正LD_LIBRARY_PATH定义时存在空路径问题。 (#31156)
style: 调整apt-get为apt方式;还有就是bin目录下的entrypoint.sh脚本文件,换行符目前是Windows的,建议调整为Unix(LF)格式。
2025-05-23 13:49:10 +08:00
蟑螂·魂
1f3c9d712a
fix: 修正变量DATA_DIR的大小写使用问题。 (#31157) 2025-05-23 13:46:42 +08:00
Linhe Huo
bcf55deb00
feat(docker): support initialization scripts [ci skip] (#31062) 2025-05-13 11:03:55 +08:00
guichuan zhang
e6afe17382
fix(packaging): update docker entrypoint DATA_DIR,FQDN,FIRSET_EP,SERVER_PORT (#31004) 2025-05-08 11:25:28 +08:00
freemine
6267763e85
Freemine.cmake.3.0 (#30663)
* chore(ci): with cmake verbose, temporarily

* chore(cmake): prefer Threads::Threads

* fix(cmake): debug building gtest on ubuntu 20.04 for the moment

* fix(cmake): try adding Threads::Threads

* fix(cmake): debug building gtest on ubuntu 20.04 for the moment

* fix(cmake): revert taosd-ci-build.yml

* fix(cmake): debug building on ubuntu 20.04 for the moment

* fix(cmake): debug building on ubuntu 20.04 for the moment

* fix(cmake): debug building on ubuntu 20.04 for the moment, adding dl right after DEP_ext_libuv

* fix(cmake): debug building on ubuntu 20.04 for the moment, try full run

* fix(cmake): fix building on ubuntu 20.04

* fix(cmake): dl is only valid in non-windows platform

* fix(cmake): dl order

* refactor(cmake): adjust option/cache variables for external dependencies

* refactor(cmake): mv patch files from contrib/ to cmake/

* refactor(cmake): typo

* refactor(cmake): adding cache on ci

* refactor(cmake):
1. ext_lzma2 is only used by Linux
2. fix bug in taosd-ci-build.yml

* enh: adding functionalities of build.sh

* fix(ci): `cmake -B` shall maintain consistency

* refactor(cmake): LOCAL_REPO/LOCAL_URL as cache variable

* refactor(cmake): taosadapter to be built in main build directory rather than .externals

* refactor(cmake): adding rpath for taosadapter, linux now

* refactor(cmake): adding rpath for taosadapter, macos now

* chore(cmake): remove some comments

* debug(ci): bypass TD_EXTERNALS_USE_ONLY

* debug(ci): bypass .externals caching for the moment

* fix(cmake): temporarily use taosadapter/main branch because this branch(freemine.cmake.3.0) has not include taos_fetch_fields_e from upstream

* refactor(cmake): clean GIT_TAG/GIT_SHALLOW pairs

* enh(ci): use build.sh rather than hard-coded in taosd-ci-build.yml, linux for now

* debug(ci): undefined __isoc23_strtoull

* debug(ci): benchmarkTest

* debug(ci): what if use_only = off

* debug(ci): remove .externals to make a refresh build

* debug(ci): back to cache, and ls files of gtest

* debug(ci): remove find coz {} not escaped

* debug(ci): cache key seems missing "matrix.os"

* refactor(ci): fixed cache key and reopen macos/windows

* chore(ci): literally -j4

* chore(ci): Trigger GitHub Actions re-run

* chore(ci): Trigger GitHub Actions re-run

* fix(ci): typo

* chore(ci): JOBS calculated by build.sh itself

* refactor(ci): enable WEBSOCKET in build.sh by default

* refactor(ci): enable WEBSOCKET in build.sh by default, macOS

* chore(cmake): remove obsoletes

* refactor(ci): stop service before running taosd

* chore(ci): `./build.sh install` just install TDengine, you will have to start taosd by `./build.sh start`

* refactor(cmake): adding source code found on http://emfisis.physics.uiowa.edu/Software/C/libargp/

* refactor(cmake): moving jansson/snappy/avro to .externals, and porting BUILD_TEST/WEBSOCKET on Windows

* refactor(cmake): porting linux

* refactor(cmake): porting macos
1. check argp.h
2. re-enable building taosdump

* refactor(cmake): porting linux
1. adjust CMAKE_C/CXX_FLAGS

* refactor(cmake): porting windows, adjust CMAKE_C/CXX_FLAGS

* refactor(cmake): use cmake_parse_arguments in macro INIT_EXT

* refactor(cmake): format ci cache directives

* refactor(cmake): adding comments for ci externals-cache directives

* refactor(cmake): adding check_env.cmake to checking libraries installed on the system

* refactor(cmake): porting linux, make homebrew-installed-libs available

* refactor(cmake): remove BYPRODUCTS from INIT_EXT macro

* refactor(cmake): INC_DIR is oneValueArg

* refactor(cmake): taosdump depends on ext_xz(LZMA)

* refactor(cmake): add copy_pthreadVC3 target on windows

* refactor(cmake): mv taosd-ci-build.yml to tdengine-build.yml

* chore(ci): try to fix yml syntax error

* refactor(cmake): use brew --prefix to get HomeBrew's install path

* refactor(cmake): typo

* debug(ci): build and cache externals first

* debug(ci): adding -Wno-stringop-overread for the moment

* debug(ci): make Threads::Threads public from os target

* debug(ci): make os public

* debug(ci): re-enable start and test

* debug(ci): let it go even if taosBenchmark failed

* debug(ci): copy logic from TDengine/main

* debug(ci): try ./build.sh start/test

* debug(ci): revert to original simple test logic in ci, taosBenchark/taos

* chore(cmake): code-convention and ci-logic

* debug(ci): show versions

* debug(ci): forcefully use specific GIT_TAG by commit-id for taos-connector-rust.git and taosadapter.git

* refactor(cmake): remove empty lines

* debug(ci): typo

* debug(ci): set supportVnodes to 256 before starting taosd

* debug(ci): fix: sudo and pipe

* debug(ci): cat /etc/taos/taos.cfg to check if supportVnodes effective

* debug(ci): cat forceReadConfig to taos.cfg

* debug(ci): adding taos -s "show dnodes"

* debug(ci): print more info

* debug(ci):
1. git log .... in an independant step
2. sleep 3 deliberately

* build: release ver-3.3.6.0

* chore(ci): comment and remove unnecessary code

* refactor(ci): cleanup tools/CMakeLists.txt
1. remove unnecessary or uneffective codes
2. better approach to pass compile flags to go

* chore(cmake): remove unnecessary code

* merge(cmake): porting linux

* merge(cmake): porting macOS

* merge(cmake): porting windows

* merge(cmake): pitfall fix: use literal format string instead

* merge(cmake): ver-3.3.6.0 for both taosadatper and taosws

* merge(cmake): adjust ci for debug purposes

* merge(cmake): add dependenices to make sure native built

* merge(main): link os

* merge(main): revert to main

* chore(cmake): remove freemine'd comments

* chore(cmake): make github ci to run with empty change

* refactor(cmake): remove unnecessaries

* refactor(cmake): remove unnecessaries

* chore(cmake):
1. remove taosudf in build.sh::do_purge
2. packaging taosBenchmark

* chore(cmake):
1. typo corrections
2. add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to bypass compatibility check imposed by latest cmake since 4.0

* chore(cmake): show cmake version

* chore(cmake): add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to bypass compatibility check imposed by latest cmake since 4.0

* chore(cmake): typo

* chore(cmake): remove unnecessaries

* cmake: debug enterprise compilation

* refactor: preparatory work before merging the freemin PR

* refactor(cmake): revert to d91205594a

* refactor(cmake): optimize by adjusting cache key

* chore(cmake): make github ci to run with empty change

* refactor(cmake): move libs3 and azure to external.cmake

* refactor(cmake): porting macOS

* refactor(cmake): move cos to external.cmake

* refactor(cmake): bypass s3/azure/cos on windows for the moment

* refactor(cmake): try find_package(Threads)

* refactor(cmake): add dl/pthread in libs3

* refactor(cmake): enable s3/azure for the moment, hard-coded

* refactor(cmake): adjust BUILD_WITH_ANALYSIS option

* refactor(cmake):
1. enum AVROTYPE => enum enAVROTYPE
2. remove INSTALL(CODE ...) from tools/taos-tools/CMakeLists.txt

* refactor(cmake): portint macOS and typo

* refactor(cmake): ticking external cache key to force refresh external building

* refactor(cmake): remove obsoletes

* refactor(cmake): remove obsoletes

* refactor(cmake): remove obsoletes, contrib/deps-download related

* refactor(cmake): adding build.bat, and use build.bat in .github/workflows/tdengine-build.yml

* refactor(cmake):
1. call .\build.bat
2. remove POST_BUILD which is not valid in this signature of add_custom_command

* refactor(ci): use 'NMake Makefiles JOM'

* refactor(ci): typo

* refactor(ci): debug

* refactor(ci): debug

* refactor(ci): debug

* refactor(ci): use call on windows

* refactor(cmake): move utils/TSZ to contrib/TSZ

* chore(cmake): make github ci to run with empty change

* refactor(cmake): mv cmake.* -> *.cmake and related in CMakeLists.txt

* refactor(cmake): debugging integrating community

* refactor(cmake): debugging integrating community

* chore(cmake): make github ci to run with empty change

* refactor(cmake): revert geos.git back to 3.12.0

* refactor(cmake): revert doc/** to main branch

* refactor(cmake): revert tests/** to main branch, except tests/taosc_test/CMakeLists.txt

* refactor(cmake): revert test/cases/** to main branch

* refactor(cmake): revert test/docs/** to main branch

* refactor(cmake): revert tools/taos-tools/deps/{avro,jansson,libargp,snappy,zlib-1.2.13} to main branch, which need to be removed later

* refactor(ci): revert .github/workflows/{deploy-case-docs.yml,tdengine-doc-build.yml} to main branch

* refactor(cmake): revert tcommon.h and related to main branch

* refactor(cmake): revert test/* stuffs back to main branch

* refactor(cmake): revert libuv.git back to v1.49.2

* refactor(cmake): revert .h/.c and related to main branch

* refactor(cmake): typo format string

* refactor(cmake): typo correction, incorrect use of macro `assert`

* refactor(cmake): adding /wd4028 to bypass thttp.c under enterprise build for the moment

* refactor(cmake):
1. adding some rules to .gitignore for the last resort to save
2. adding source files manually to source/libs/parser/CMakeLists.txt to exclude potential sql.c generated by old build system

* refactor(cmake): add -Wno-unused-result for the moment

* refactor(cmake): adjust target dependencies

* refactor(cmake): tweaking building of mxml

* refactor(cmake): adjust externals CMAKE_ARGS to save compilation time

* refactor(cmake): temporarily use tomchon-patch-3

* refactor(cmake): temporarily adding dumpbin directives

* refactor(cmake): adding NODEFAULTLIB temporarily for debugging purpose

* refactor(cmake): adding NODEFAULTLIB:libcpmt temporarily for debugging purpose

* refactor(cmake): adding NODEFAULTLIB:cpmt temporarily for debugging purpose

* chore(cmake): make github ci to run with empty change

* chore(cmake): make github ci to run with empty change

* refactor(ci): use freemine.debug branch for the moment

* refactor(ci): revert back to use run-tests-on-windows.yml of tomchon-patch-3 branch

* chore(cmake): make github ci to run with empty change

* refactor(cmake): remove temporary debug directives

* refactor(cmake): move cmake_policy(..CMP0135..) to the root of this project

* refactor(cmake): Remove temporary debugging conditional and restore original logic

* chore(cmake): adding -B in army tests

* chore(cmake): make github ci to run with empty change

* chore(cmake): revert: adding -B in army tests

* refactor(cmake):
1. use ver-3.3.6.3 of taosadapter
2. pitfall fix: do not link with taosws for taos shell

* refactor(cmake): revert taosadapter to ver-3.3.6.0

* chore(cmake): adding logging message in more detail

* chore(cmake): adding logging message in more detail

* chore(ci): debugging by using ls -l

* chore(ci): typo

* chore(ci): typo

* refactor(cmake): revert to remove debug code, and taosadapter to ver-3.3.6.3

* refactor(cmake): remove DEP_ext_taosws

* chore(cmake): make github ci to run with empty change

* chore(cmake): make github ci to run with empty change

* chore(cmake): make github ci to run with empty change

* chore(cmake): make github ci to run with empty change

* chore(cmake): typo correction: utils/test/c/sml_test.c

* debug(cmake): test cases debug

* chore(cmake): make github ci to run with empty change

* chore(ci): using tomchon-patch-3 branch for run-tests-on-linux for the moment

* chore(cmake): make github ci to run with empty change

* debug(test): revert utils/test/c/sml_test.c back to tdengine/main branch

* debug(test): adding VERBOSE=1 and gcc --version

* debug(test): revert tests/parallel_test/cases.task back to tdengine/main branch

* debug: add log in run_case.sh

* fix: test log

* fix: docker run privileged

* tes: add debug test in  cases.task

* refactor(cmake): remove ref to \contrib\<dep-name> and ~/.cos-local-{1,2} from CMakeLists.txt(s)

* refactor(cmake): make taosudf link with libtaos.so

* chore(cmake): fix compiler warning as error problem

* refactor(cmake): revert 7d7f03832d

* chore(cmake): only udf.sim and udfpy.sim for the moment

* debug(ci): debug udf.sim for the moment

* debug(ci): debug udf.sim for the moment

* debug(ci): debug udf.sim for the moment

* debug(ci): debug only udf.sim for the moment

* debug(ci): debug only udf.sim for the moment, using tee

* debug(ci): debug only udf.sim for the moment, revert using tee

* debug(ci): debug only udf.sim for the moment, adding TAOS_LIB again

* debug(cmake): adding -rdynamic for the moment

* debug(cmake): re-adding udfpy.sim

* debug(cmake): do NOT run with Sanitizer for udfpy.sim for the moment

* chore(cmake): revert cases.task, and remove ubuntu-20.04 from tdengine-build.yml

* refactor(cmake): using ENABLE_EXPORTS to export symbols in taosudf

* chore(cmake): make github ci to run with empty change

* chore(cmake): remove stuffs for debug purpose and revert

---------

Co-authored-by: support-platform <it@taosdata.com>
Co-authored-by: Simon Guan <slguan@taosdata.com>
Co-authored-by: Simon Guan <guanshengliang@qq.com>
Co-authored-by: haoranchen <haoran920c@163.com>
2025-04-19 14:03:29 +08:00
ahjxxcr
1403c81825
Update entrypoint.sh
grep taosd 进程时候需要排除 entrypoint.sh ,否则会grep出tini entrypoint.sh taosd的进程,误判为taosd以启动。
2025-04-02 12:33:48 +08:00
ahjxxcr
95f94a7416
Update entrypoint.sh
缺少 / 符号,导致无论是否grep到 taosd 进程,都会错误返回1,从而进行 taosd 启动
2025-04-02 10:09:29 +08:00
jiajingbin
38e607ee8b enh: rm built-in parameters 2025-03-27 18:59:50 +08:00
jiajingbin
eb8a937940 enh: add default value 2025-03-27 17:51:38 +08:00
jiajingbin
970b961398 fix: typo 2025-03-27 17:23:10 +08:00
jiajingbin
1d1a6f7049 fix: fix issue of using buildkitsandbox with fqdn 2025-03-27 17:13:10 +08:00
jiajingbin
8ffc652494 fix: Modify regular expression 2025-03-27 17:09:38 +08:00
jiajingbin
7a1191ef89 enh: update DockerfileTDgpt and run-shell 2025-03-25 15:38:59 +08:00
jiajingbin
6648d2a502 enh: remove moe 2025-03-24 20:32:35 +08:00
jiajingbin
3924c5a043 enh: update for timer-moe 2025-03-24 19:16:03 +08:00
jiajingbin
8e3b0fbfa9 enh: adjust seq and add timer-moe model 2025-03-24 19:05:19 +08:00
jiajingbin
0e8317c569 enh: rename and change path 2025-03-24 19:05:19 +08:00
haoranchen
8dd6683490
fix: set dir in packaging dockerfile 2025-03-03 17:30:44 +08:00
haoranchen
ffc9e0d27f
fix: set dir in packaging dockerfile 2025-03-03 16:44:38 +08:00