fix: 覆盖 entrypoint.sh 使 taosadapter 读取配置文件

上游镜像的 entrypoint.sh 启动 taosadapter 时缺少 -c 参数，
导致 /etc/taos/taosadapter.toml 配置未生效。

- 新增 deploy/config/entrypoint.sh，在启动 taosadapter 时添加
  -c /etc/taos/taosadapter.toml 参数
- 精简 taosadapter.toml，禁用 keeper 上传和未使用的插件
- 更新 start-tdengine-operator.sh，挂载修改后的 entrypoint.sh

deploy/config/entrypoint.sh

@@ -0,0 +1,164 @@
+#!/bin/bash
+set -ex
+# for TZ awareness
+if [ "$TZ" != "" ]; then
+    ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
+    echo $TZ >/etc/timezone
+fi
+
+TAOS_ROOT_PASSWORD=${TAOS_ROOT_PASSWORD:-taosdata}
+export TAOS_KEEPER_TDENGINE_PASSWORD=${TAOS_ROOT_PASSWORD}
+
+INITDB_DIR=/docker-entrypoint-initdb.d/
+
+# option to disable taosadapter, default is no
+DISABLE_ADAPTER=${TAOS_DISABLE_ADAPTER:-0}
+unset TAOS_DISABLE_ADAPTER
+
+DISABLE_KEEPER=${TAOS_DISABLE_KEEPER:-0}
+unset TAOS_DISABLE_KEEPER
+
+DISABLE_EXPLORER=${TAOS_DISABLE_EXPLORER:-0}
+unset TAOS_DISABLE_EXPLORER
+
+# Get DATA_DIR from taosd -C
+DATA_DIR=$(taosd -C|grep -E 'dataDir\s+(\S+)' -o |head -n1|sed 's/dataDir *//')
+DATA_DIR=${DATA_DIR:-/var/lib/taos}
+
+# Get FQDN from taosd -C
+FQDN=$(taosd -C|grep -E 'fqdn\s+(\S+)' -o |head -n1|sed 's/fqdn *//')
+# ensure the fqdn is resolved as localhost
+grep "$FQDN" /etc/hosts >/dev/null || echo "127.0.0.1 $FQDN" >>/etc/hosts
+
+# Get first ep from taosd -C
+FIRSET_EP=$(taosd -C|grep -E 'firstEp\s+(\S+)' -o |head -n1|sed 's/firstEp *//')
+# parse first ep host and port
+FIRST_EP_HOST=${FIRSET_EP%:*}
+FIRST_EP_PORT=${FIRSET_EP#*:}
+
+# in case of custom server port
+SERVER_PORT=$(taosd -C|grep -E 'serverPort\s+(\S+)' -o |head -n1|sed 's/serverPort *//')
+SERVER_PORT=${SERVER_PORT:-6030}
+
+set +e
+ulimit -c unlimited
+# set core files pattern, maybe failed
+sysctl -w kernel.core_pattern=/corefile/core-$FQDN-%e-%p >/dev/null >&1
+set -e
+
+if [ $# -gt 0 ]; then
+    exec $@
+    exit 0
+fi
+
+NEEDS_INITDB=0
+
+# if dnode has been created or has mnode ep set or the host is first ep or not for cluster, just start.
+if [ -f "$DATA_DIR/dnode/dnode.json" ] ||
+    [ -f "$DATA_DIR/dnode/mnodeEpSet.json" ] ||
+    [ "$FQDN" = "$FIRST_EP_HOST" ]; then
+    echo "start taosd with mnode ep set"
+    taosd &
+    while true; do
+        es=$(taos -h $FIRST_EP_HOST -P $FIRST_EP_PORT --check | grep "^[0-9]*:")
+        echo ${es}
+        if [ "${es%%:*}" -eq 2 ]; then
+
+            # Initialization scripts should only work in first node.
+            if [ "$FQDN" = "$FIRST_EP_HOST" ]; then
+                if [ ! -f "${DATA_DIR}/.docker-entrypoint-root-password-changed" ]; then
+                    if [ "$TAOS_ROOT_PASSWORD" != "taosdata" ]; then
+                        # change default root password
+                        taos -s "ALTER USER root PASS '$TAOS_ROOT_PASSWORD'"
+                        touch "${DATA_DIR}/.docker-entrypoint-root-password-changed"
+                    fi
+                fi
+                # Initialization scripts should only work in first node.
+                if [ ! -f "${DATA_DIR}/.docker-entrypoint-inited" ]; then
+                    NEEDS_INITDB=1
+                fi
+            fi
+
+            break
+        fi
+        sleep 1s
+    done
+# others will first wait the first ep ready.
+else
+    if [ "$TAOS_FIRST_EP" = "" ]; then
+        echo "run TDengine with single node."
+        taosd &
+    fi
+    while true; do
+        es=$(taos -h $FIRST_EP_HOST -P $FIRST_EP_PORT --check | grep "^[0-9]*:")
+        echo ${es}
+        if [ "${es%%:*}" -eq 2 ]; then
+            echo "execute create dnode"
+            sh -c "taos -p'$TAOS_ROOT_PASSWORD' -h $FIRST_EP_HOST -P $FIRST_EP_PORT -s 'create dnode \"$FQDN:$SERVER_PORT\";'"
+            break
+        fi
+        sleep 1s
+    done
+    if ps aux | grep -v grep | grep taosd > dev/null; then
+        echo "TDengine is running"
+      else
+        taosd &
+    fi
+fi
+
+if [ "$DISABLE_ADAPTER" = "0" ]; then
+    which taosadapter >/dev/null && taosadapter -c /etc/taos/taosadapter.toml &
+    # wait for 6041 port ready
+    for _ in $(seq 1 20); do
+        nc -z localhost 6041 && break
+        sleep 0.5
+    done
+fi
+
+if [ "$DISABLE_KEEPER" = "0" ]; then
+    sleep 3
+    which taoskeeper >/dev/null && taoskeeper &
+    # wait for 6043 port ready
+    for _ in $(seq 1 20); do
+        nc -z localhost 6043 && break
+        sleep 0.5
+    done
+fi
+
+if [ "$DISABLE_EXPLORER" = "0" ]; then
+    which taos-explorer >/dev/null && taos-explorer &
+    # wait for 6060 port ready
+    for _ in $(seq 1 20); do
+        nc -z localhost 6060 && break
+        sleep 0.5
+    done
+fi
+
+if [ "$NEEDS_INITDB" = "1" ]; then
+    # check if initdb.d exists
+    if [ -d "${INITDB_DIR}" ]; then
+        # execute initdb scripts in sql
+        for FILE in "$INITDB_DIR"*.sql; do
+            echo "Initialize db with file $FILE"
+            MAX_RETRIES=5
+            RETRY_COUNT=0
+            SUCCESS=0
+            while [ $RETRY_COUNT -lt $MAX_RETRIES ] && [ "$SUCCESS" = "0" ]; do
+                set -x
+                OUTPUT=$(sh -c "taos -f $FILE -p'$TAOS_ROOT_PASSWORD'")
+                set +x
+                echo $OUTPUT
+                if [[ "$OUTPUT" =~ "DB error" ]]; then
+                    echo "Retrying in 2 seconds..."
+                    sleep 2
+                else
+                    SUCCESS=1
+                fi
+            done
+        done
+    fi
+
+    touch "${DATA_DIR}/.docker-entrypoint-inited"
+fi
+
+while true; do sleep 1000; done

deploy/config/taosadapter.toml

@@ -1,96 +1,40 @@
-# taosAdapter configuration file
-# Deployed as independent container for Node.js service REST API access
+# taosAdapter configuration (runs inside tdengine-operator container)
+# Mounted to /etc/taos/taosadapter.toml
 
-debug = true
-taosConfigDir = ""
+debug = false
 port = 6041
 logLevel = "info"
 
 [cors]
 allowAllOrigins = true
 
-[ssl]
-enable = false
-certFile = ""
-keyFile = ""
-
 [log]
 rotationCount = 30
 rotationTime = "24h"
 rotationSize = "1GB"
-enableRecordHttpSql = false
-sqlRotationCount = 2
-sqlRotationTime =  "24h"
-sqlRotationSize = "1GB"
 
-[monitor]
-collectDuration = "3s"
-incgroup = false
-pauseQueryMemoryThreshold = 70
-pauseAllMemoryThreshold = 80
-identity = ""
-writeToTD = false
-user = "root"
-password = "taosdata"
-writeInterval = "30s"
+# Disable keeper upload (keeper is not running)
+[uploadKeeper]
+enable = false
 
+# Disable unused plugins
 [opentsdb]
-enable = true
+enable = false
 
 [influxdb]
-enable = true
+enable = false
 
 [statsd]
 enable = false
-port = 6044
-db = "statsd"
-user = "root"
-password = "taosdata"
-worker = 10
-gatherInterval = "5s"
-protocol = "udp"
-maxTCPConnections = 250
-tcpKeepAlive = false
-allowPendingMessages = 50000
-deleteCounters = true
-deleteGauges = true
-deleteSets = true
-deleteTimings = true
 
 [collectd]
 enable = false
-port = 6045
-db = "collectd"
-user = "root"
-password = "taosdata"
-worker = 10
 
 [opentsdb_telnet]
 enable = false
-maxTCPConnections = 250
-tcpKeepAlive = false
-dbs = ["opentsdb_telnet", "collectd", "icinga2", "tcollector"]
-ports = [6046, 6047, 6048, 6049]
-user = "root"
-password = "taosdata"
-batchSize = 1
-flushInterval = "0s"
 
 [node_exporter]
 enable = false
-db = "node_exporter"
-user = "root"
-password = "taosdata"
-urls = ["http://localhost:9100"]
-responseTimeout = "5s"
-httpUsername = ""
-httpPassword = ""
-httpBearerTokenString = ""
-caCertFile = ""
-certFile = ""
-keyFile = ""
-insecureSkipVerify = true
-gatherDuration = "5s"
 
 [prometheus]
-enable = true
+enable = false

deploy/scripts/start-tdengine-operator.sh

@@ -4,6 +4,8 @@
 # Network: host (required for TDengine FQDN mechanism)
 # taosadapter runs inside this container, listening on host port 6041
 # taoskeeper and taos-explorer are disabled (deployed separately)
+# Note: entrypoint.sh is overridden to add `-c /etc/taos/taosadapter.toml`
+#       because the upstream image starts taosadapter without config flag.
 
 set -e
 
@@ -12,6 +14,8 @@ IMAGE="docker.io/tdengine/tdengine:3.3.6.13"
 DATA_DIR="/mnt/tdengine-operator/data"
 LOG_DIR="/mnt/tdengine-operator/log"
 CFG_FILE="/mnt/tdengine-operator/taos.cfg"
+ADAPTER_CFG="/mnt/iot-platform/config/taosadapter.toml"
+ENTRYPOINT_FILE="/mnt/iot-platform/config/entrypoint.sh"
 
 echo "Starting ${CONTAINER_NAME}..."
 
@@ -27,6 +31,8 @@ podman run -d \
     -v "${DATA_DIR}:/var/lib/taos" \
     -v "${LOG_DIR}:/var/log/taos" \
     -v "${CFG_FILE}:/etc/taos/taos.cfg:ro" \
+    -v "${ADAPTER_CFG}:/etc/taos/taosadapter.toml:ro" \
+    -v "${ENTRYPOINT_FILE}:/usr/bin/entrypoint.sh:ro" \
     "${IMAGE}"
 
 echo "${CONTAINER_NAME} started."