fix: add auto package (#17683)

Co-authored-by: tomchon <haoran920c@163.com>

packaging/docker/DockerfileCloud

@@ -0,0 +1,26 @@
+FROM ubuntu:18.04
+
+WORKDIR /root
+
+ARG pkgFile
+ARG dirName
+ARG cpuType
+RUN echo ${pkgFile} && echo ${dirName}
+
+COPY ${pkgFile} /root/
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${cpuType} /tini
+ENV DEBIAN_FRONTEND=noninteractive
+WORKDIR /root/
+RUN tar -zxf ${pkgFile} && cd /root/${dirName}/ && /bin/bash install.sh -e no && cd /root && rm /root/${pkgFile} && rm -rf /root/${dirName} && apt-get update && apt-get install -y locales tzdata netcat && locale-gen en_US.UTF-8 && apt-get clean && rm -rf /var/lib/apt/lists/ && chmod +x /tini
+
+ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib" \
+    LC_CTYPE=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    LC_ALL=en_US.UTF-8
+COPY ./run.sh /usr/bin/
+COPY ./bin/* /usr/bin/
+
+ENTRYPOINT ["/tini", "--", "/usr/bin/entrypoint.sh"]
+CMD ["bash", "-c", "/usr/bin/run.sh"]
+VOLUME [ "/var/lib/taos", "/var/log/taos", "/corefile" ]

packaging/docker/dockerbuild.sh

@@ -19,8 +19,9 @@ passWord=""
 pkgFile=""
 verType="stable"
 dockerLatest="n"
+cloudBuild="n"
 
-while getopts "hc:n:p:f:V:a:b:" arg
+while getopts "hc:n:p:f:V:a:b:d:" arg
 do
   case $arg in
     c)
@@ -47,6 +48,10 @@ do
       #echo "verType=$OPTARG"
       verType=$(echo $OPTARG)
       ;;
+    d)
+      #echo "cloudBuild=$OPTARG"
+      cloudBuild=$(echo $OPTARG)
+      ;;
     a)
       #echo "dockerLatest=$OPTARG"
       dockerLatest=$(echo $OPTARG)
@@ -58,6 +63,7 @@ do
       echo "                      -V [stable | beta] "
       echo "                      -f [pkg file] "
       echo "                      -a [y | n ]   "
+      echo "                      -d [cloud build ] "
       exit 0
       ;;
     ?) #unknow option 
@@ -83,6 +89,9 @@ else
   echo "unknow verType, nor stabel or beta"
   exit 1
 fi
+if [ "$cloudBuild" == "y" ]; then
+  dockername=cloud-${dockername}
+fi
 
 
 echo "cpuType=${cpuType} version=${version} pkgFile=${pkgFile} verType=${verType} "
@@ -90,10 +99,15 @@ echo "$(pwd)"
 echo "====NOTES: ${pkgFile} must be in the same directory as dockerbuild.sh===="
 
 scriptDir=$(dirname $(readlink -f $0))
-comunityArchiveDir=/nas/TDengine/v$version/community   # community version’package directory
 communityDir=${scriptDir}/../../../community
 DockerfilePath=${communityDir}/packaging/docker/
-Dockerfile=${communityDir}/packaging/docker/Dockerfile
+if [ "$cloudBuild" == "y" ]; then
+  comunityArchiveDir=/nas/TDengine/v$version/cloud
+  Dockerfile=${communityDir}/packaging/docker/DockerfileCloud
+else
+  comunityArchiveDir=/nas/TDengine/v$version/community
+  Dockerfile=${communityDir}/packaging/docker/Dockerfile
+fi
 cd ${scriptDir}
 cp -f ${comunityArchiveDir}/${pkgFile}  .
 
@@ -111,42 +125,15 @@ else
 fi
 
 docker build --rm -f "${Dockerfile}"  --network=host -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName} --build-arg cpuType=${cpuTypeAlias}
-docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
+if [ "$cloudBuild" != "y" ]; then
-docker push tdengine/tdengine-${dockername}:${version}
+  docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
-
+  docker push tdengine/tdengine-${dockername}:${version}
-if [ -n "$(docker ps -aq)" ] ;then 
-  echo "delete docker process"
-  docker stop $(docker ps -aq)
-  docker rm $(docker ps -aq)
 fi
 
-if [  -n "$(pidof taosd)" ] ;then
-   echo "kill taosd "
-   kill -9 $(pidof taosd)
-fi
-
-if [ -n "$(pidof power)" ]  ;then
-  echo "kill power "
-  kill -9 $(pidof power)
-fi
-
-
-echo ">>>>>>>>>>>>> check whether  tdengine/tdengine-${dockername}:${version}  has been published"
-docker run -d --name doctest -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp  tdengine/tdengine-${dockername}:${version}
-sleep 2
-curl -u root:taosdata -d 'show variables;'  127.0.0.1:6041/rest/sql > temp1.data
-data_version=$( cat temp1.data |jq .data| jq '.[]' |grep "version" -A 2 -B 1  | jq ".[1]")
-echo "${data_version}" 
-if [ "${data_version}" == "\"${version}\"" ] ; then
-    echo  "docker version is right "
-else
-    echo  "docker version is wrong "
-    exit 1
-fi
-rm -rf  temp1.data
-
 # set this version to latest version 
-if  [ ${dockerLatest} == 'y' ]  ;then
+if  [ "$cloudBuild" != "y" ] && [ ${dockerLatest} == 'y' ]  ;then
   docker tag tdengine/tdengine-${dockername}:${version} tdengine/tdengine-${dockername}:latest
   docker push tdengine/tdengine-${dockername}:latest
 fi
+
+rm -f ${pkgFile}

packaging/docker/run.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+TAOS_RUN_TAOSBENCHMARK_TEST_ONCE=0
+while ((1))
+do
+    # echo "outer loop: $a"
+    sleep 10
+    output=`taos -k`
+    status=${output:0:1}
+    # echo $output
+    # echo $status
+    if [ "$status"x = "0"x ]
+    then
+        taosd &
+    fi
+    # echo "$status"x "$TAOS_RUN_TAOSBENCHMARK_TEST"x "$TAOS_RUN_TAOSBENCHMARK_TEST_ONCE"x
+    if [ "$status"x = "2"x ] && [ "$TAOS_RUN_TAOSBENCHMARK_TEST"x = "1"x ] && [ "$TAOS_RUN_TAOSBENCHMARK_TEST_ONCE"x = "0"x ]
+    then
+        TAOS_RUN_TAOSBENCHMARK_TEST_ONCE=1
+        # result=`taos -s "show databases;" | grep " test "`
+        # if [ "${result:0:5}"x != " test"x ]
+        # then
+        #     taosBenchmark -y -t 1000 -n 1000 -S 900000
+        # fi
+        taos -s "select stable_name from information_schema.ins_stables where db_name = 'test';"|grep -q -w meters
+        if [ $? -ne 0 ]; then
+            taosBenchmark -y -t 1000 -n 1000 -S 900000
+	    taos -s "create user admin_user pass 'NDS65R6t' sysinfo 0;"
+	    taos -s "GRANT ALL on test.* to admin_user;"
+        fi
+    fi
+    # check taosadapter
+    nc -z localhost 6041
+    if [ $? -ne 0 ]; then
+	taosadapter &
+    fi
+done

packaging/release.sh

@@ -17,7 +17,7 @@ set -e
 #             -H [ false | true]
 
 # set parameters by default value
-verMode=edge    # [cluster, edge]
+verMode=edge    # [cluster, edge, cloud]
 verType=stable  # [stable, beta]
 cpuType=x64     # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
 osType=Linux    # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
@@ -169,7 +169,7 @@ build_time=$(date +"%F %R")
 # get commint id from git
 gitinfo=$(git rev-parse --verify HEAD)
 
-if [[ "$verMode" == "cluster" ]]; then
+if [[ "$verMode" == "cluster" ]] || [[ "$verMode" == "cloud" ]]; then
   enterprise_dir="${top_dir}/../enterprise"
   cd ${enterprise_dir}
   gitinfoOfInternal=$(git rev-parse --verify HEAD)
@@ -205,7 +205,7 @@ else
   BUILD_HTTP=false
 fi
 
-if [[ "$verMode" == "cluster" ]]; then
+if [[ "$verMode" == "cluster" ]] || [[ "$verMode" == "cloud" ]]; then
   BUILD_HTTP=internal
 fi
 
@@ -217,10 +217,12 @@ fi
 
 # check support cpu type
 if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "arm64" ]] || [[ "$cpuType" == "arm32" ]] || [[ "$cpuType" == "mips64" ]]; then
-  if [ "$verMode" != "cluster" ]; then
+  if [ "$verMode" == "edge" ]; then
     # community-version compile
     cmake ../ -DCPUTYPE=${cpuType} -DWEBSOCKET=true -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp} -DPAGMODE=${pagMode} -DBUILD_HTTP=${BUILD_HTTP} -DBUILD_TOOLS=${BUILD_TOOLS} ${allocator_macro}
-  else
+  elif [ "$verMode" == "cloud" ]; then
+    cmake ../../ -DCPUTYPE=${cpuType} -DWEBSOCKET=true -DBUILD_CLOUD=true -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp} -DBUILD_HTTP=${BUILD_HTTP} -DBUILD_TOOLS=${BUILD_TOOLS} ${allocator_macro}
+  elif [ "$verMode" == "cluster" ]; then
     if [[ "$dbName" != "taos" ]]; then
       replace_enterprise_$dbName
     fi
@@ -244,7 +246,7 @@ cd ${curr_dir}
 
 # 3. Call the corresponding script for packaging
 if [ "$osType" != "Darwin" ]; then
-  if [[ "$verMode" != "cluster" ]] && [[ "$pagMode" == "full" ]] && [[ "$cpuType" == "x64" ]] && [[ "$dbName" == "taos" ]]; then
+  if [[ "$verMode" != "cluster" ]] && [[ "$verMode" != "cloud" ]] && [[ "$pagMode" == "full" ]] && [[ "$cpuType" == "x64" ]] && [[ "$dbName" == "taos" ]]; then
     ret='0'
     command -v dpkg >/dev/null 2>&1 || { ret='1'; }
     if [ "$ret" -eq 0 ]; then

packaging/tools/makeclient.sh

@@ -39,6 +39,8 @@ release_dir="${top_dir}/release"
 
 if [ "$verMode" == "cluster" ]; then
   install_dir="${release_dir}/${productName}-enterprise-client-${version}"
+elif [ "$verMode" == "cloud" ]; then
+  install_dir="${release_dir}/${productName}-cloud-client-${version}"
 else
   install_dir="${release_dir}/${productName}-client-${version}"
 fi
@@ -138,6 +140,10 @@ if [ "$verMode" == "cluster" ]; then
   sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install_client.sh >>install_client_temp.sh
   mv install_client_temp.sh ${install_dir}/install_client.sh
 fi
+if [ "$verMode" == "cloud" ]; then
+  sed 's/verMode=edge/verMode=cloud/g' ${install_dir}/install_client.sh >>install_client_temp.sh
+  mv install_client_temp.sh ${install_dir}/install_client.sh
+fi
 
 if [ "$pagMode" == "lite" ]; then
   sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install_client.sh >>install_client_temp.sh
@@ -161,7 +167,7 @@ if [[ $productName == "TDengine" ]]; then
     mkdir -p ${install_dir}/examples/taosbenchmark-json && cp ${examples_dir}/../tools/taos-tools/example/* ${install_dir}/examples/taosbenchmark-json
   fi
 
-  if [ "$verMode" == "cluster" ]; then
+  if [ "$verMode" == "cluster" ] || [ "$verMode" == "cloud" ]; then
       # Copy connector
       connector_dir="${code_dir}/connector"
       mkdir -p ${install_dir}/connector

packaging/tools/makepkg.sh

@@ -39,6 +39,8 @@ release_dir="${top_dir}/release"
 #package_name='linux'
 if [ "$verMode" == "cluster" ]; then
   install_dir="${release_dir}/${productName}-enterprise-server-${version}"
+elif [ "$verMode" == "cloud" ]; then
+  install_dir="${release_dir}/${productName}-cloud-server-${version}"
 else
   install_dir="${release_dir}/${productName}-server-${version}"
 fi
@@ -217,7 +219,10 @@ fi
 if [ "$verMode" == "cluster" ]; then
   sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >>remove_temp.sh
   mv remove_temp.sh ${install_dir}/bin/remove.sh
-
+fi
+if [ "$verMode" == "cloud" ]; then
+  sed 's/verMode=edge/verMode=cloud/g' ${install_dir}/bin/remove.sh >>remove_temp.sh
+  mv remove_temp.sh ${install_dir}/bin/remove.sh
 fi
 
 cd ${install_dir}
@@ -234,6 +239,10 @@ if [ "$verMode" == "cluster" ]; then
   sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install.sh >>install_temp.sh
   mv install_temp.sh ${install_dir}/install.sh
 fi
+if [ "$verMode" == "cloud" ]; then
+  sed 's/verMode=edge/verMode=cloud/g' ${install_dir}/install.sh >>install_temp.sh
+  mv install_temp.sh ${install_dir}/install.sh
+fi
 if [ "$pagMode" == "lite" ]; then
   sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >>install_temp.sh
   mv install_temp.sh ${install_dir}/install.sh
@@ -288,7 +297,7 @@ mkdir -p ${install_dir}/driver && cp ${lib_files} ${install_dir}/driver && echo
 [ -f ${wslib_files} ] && cp ${wslib_files} ${install_dir}/driver || :
 
 # Copy connector
-if [ "$verMode" == "cluster" ]; then
+if [ "$verMode" == "cluster" ] || [ "$verMode" == "cloud" ]; then
     connector_dir="${code_dir}/connector"
     mkdir -p ${install_dir}/connector
     if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then