From 3924c5a0432775e2e9f0c9444ee71e9a222b7701 Mon Sep 17 00:00:00 2001 From: jiajingbin Date: Mon, 24 Mar 2025 19:16:03 +0800 Subject: [PATCH] enh: update for timer-moe --- packaging/docker/DockerfileTDgpt | 2 +- packaging/docker/entrypoint.sh | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packaging/docker/DockerfileTDgpt b/packaging/docker/DockerfileTDgpt index a381b32ab4..e432dfd5c8 100644 --- a/packaging/docker/DockerfileTDgpt +++ b/packaging/docker/DockerfileTDgpt @@ -12,9 +12,9 @@ ADD ${pkgFile} \ http://${nasIp}/data/nas/TDengine/anode/timer-moe.tar.gz \ /apps/ -ADD ${pkgFile} /apps/ RUN cd ${dirName}/ && /bin/bash install.sh -e no && cd .. && rm -rf ${dirName} COPY entrypoint.sh /usr/local/bin/entrypoint.sh RUN chmod +x /usr/local/bin/entrypoint.sh /apps/taos_ts_server.py EXPOSE 6090 8387 5000 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] + diff --git a/packaging/docker/entrypoint.sh b/packaging/docker/entrypoint.sh index 0bbe631bcb..2410c04d15 100755 --- a/packaging/docker/entrypoint.sh +++ b/packaging/docker/entrypoint.sh @@ -6,17 +6,29 @@ export LC_CTYPE=en_US.UTF-8 export LC_ALL=en_US.UTF-8 CONFIG_FILE="/usr/local/taos/taosanode/cfg/taosanode.ini" +TS_SERVER_FILE="/apps/taos_ts_server.py" +TIMER_POE_FILE="/apps/timer-moe/timer-moe_server.py" + if [ ! -f "$CONFIG_FILE" ]; then echo "Error: Configuration file $CONFIG_FILE not found!" exit 1 fi -echo "Starting taos_ts_server..." -python3 /apps/taos_ts_server.py --action server & +echo "Starting tdtsfm server..." +python3 $TS_SERVER_FILE --action server & TAOS_TS_PID=$! if ! ps -p $TAOS_TS_PID > /dev/null; then - echo "Error: taos_ts_server failed to start!" + echo "Error: tdtsfm server failed to start!" + exit 1 +fi + +echo "Starting timer-moe server..." +python3 $TIMER_POE_FILE --action server & +TIMER_MOE_PID=$! + +if ! ps -p $TIMER_MOE_PID > /dev/null; then + echo "Error: timer-moe server failed to start!" exit 1 fi