Merge pull request #28328 from taosdata/packaging/merge_main.20240929

merge main.20240929

packaging/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:22.04
 
 WORKDIR /root
 

packaging/docker/bin/entrypoint.sh

@@ -10,6 +10,12 @@ fi
 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
+
 # to get mnodeEpSet from data dir
 DATA_DIR=$(taosd -C|grep -E 'dataDir.*(\S+)' -o |head -n1|sed 's/dataDir *//')
 DATA_DIR=${DATA_DIR:-/var/lib/taos}
@@ -33,26 +39,18 @@ ulimit -c unlimited
 sysctl -w kernel.core_pattern=/corefile/core-$FQDN-%e-%p >/dev/null >&1
 set -e
 
-if [ "$DISABLE_ADAPTER" = "0" ]; then
-    which taosadapter >/dev/null && taosadapter &
-    # wait for 6041 port ready
-    for _ in $(seq 1 20); do
-        nc -z localhost 6041 && break
-        sleep 0.5
-    done
-fi
+
 
 # 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" ] ||
     [ "$TAOS_FQDN" = "$FIRST_EP_HOST" ]; then
-    $@
+    $@ &
 # others will first wait the first ep ready.
 else
     if [ "$TAOS_FIRST_EP" = "" ]; then
         echo "run TDengine with single node."
-        $@
-        exit $?
+        $@ &
     fi
     while true; do
         es=$(taos -h $FIRST_EP_HOST -P $FIRST_EP_PORT --check | grep "^[0-9]*:")
@@ -64,5 +62,36 @@ else
         fi
         sleep 1s
     done
-    $@
+    if ps aux | grep -v grep | grep taosd > dev/null; then
+        echo "TDengine is running"
+      else
+        $@ &
+    fi
 fi
+
+if [ "$DISABLE_ADAPTER" = "0" ]; then
+    which taosadapter >/dev/null && taosadapter &
+    # 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
+
+
+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

packaging/tools/TDengine.pkgproj

@@ -663,7 +663,19 @@
 			<key>SUMMARY</key>
 			<dict>
 				<key>LOCALIZATIONS</key>
-				<array/>
+				<array>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>English</string>
+						<key>VALUE</key>
+						<dict>
+							<key>PATH</key>
+							<string>/opt/taos/TDengine/packaging/tools/mac_install_summary.txt</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</dict>
+				</array>
 			</dict>
 			<key>TITLE</key>
 			<dict>

packaging/tools/mac_install_summary.txt

@@ -0,0 +1,13 @@
+TDengine is installed successfully. Please open an Mac terminal and execute the commands below:
+
+To configure TDengine, sudo vi /etc/taos/taos.cfg
+To configure taosadapter, sudo vi /etc/taos/taoadapter.toml
+To configure taos-explorer, sudo vi /etc/taos/explorer.toml
+To start service, sudo launchctl start com.tdengine.taosd
+To start Taos Adapter, sudo launchctl start com.tdengine.taosadapter
+To start Taos Explorer, sudo launchctl start com.tdengine.taos-explorer
+
+To start all the components, sudo start-all.sh
+To access TDengine Commnd Line Interface, taos -h YourServerName
+To access TDengine Graphic User Interface, http://YourServerName:6060
+To read the user manual, http://YourServerName:6060/docs-en