Merge pull request #6943 from taosdata/release/ver-2.1.5.0

Release/ver 2.1.5.0

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.1.4.1")
+  SET(TD_VER_NUMBER "2.1.5.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

packaging/docker/dockerManifest.sh

@@ -44,6 +44,7 @@ echo "version=${version}"
 #docker manifest rm tdengine/tdengine
 #docker manifest rm tdengine/tdengine:${version}
 if [ "$verType" == "beta" ]; then
+  docker manifest rm tdengine/tdengine:latest
   docker manifest create -a tdengine/tdengine-beta:${version} tdengine/tdengine-amd64-beta:${version} tdengine/tdengine-aarch64-beta:${version} tdengine/tdengine-aarch32-beta:${version}
   docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
   docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
@@ -51,11 +52,12 @@ if [ "$verType" == "beta" ]; then
   docker manifest push tdengine/tdengine-beta:${version}
 
 elif [ "$verType" == "stable" ]; then
+  docker manifest rm tdengine/tdengine:latest
   docker manifest create -a tdengine/tdengine:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
   docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
   docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
   docker manifest push tdengine/tdengine:latest
-    docker manifest push tdengine/tdengine:${version}
+  docker manifest push tdengine/tdengine:${version}
 
 else
   echo "unknow verType, nor stabel or beta"

packaging/docker/dockerbuild.sh

@@ -67,8 +67,10 @@ done
 
 if [ "$verType" == "beta" ]; then
   dockername=${cpuType}-${verType}
+  dirName=${pkgFile%-beta*}
 elif [ "$verType" == "stable" ]; then
   dockername=${cpuType}
+  dirName=${pkgFile%-Linux*}
 else
   echo "unknow verType, nor stabel or beta"
   exit 1
@@ -84,11 +86,10 @@ comunityArchiveDir=/nas/TDengine/v$version/community   # community version’pac
 cd ${scriptDir}
 cp -f ${comunityArchiveDir}/${pkgFile}  .
 
-dirName=${pkgFile%-Linux*}
 echo "dirName=${dirName}"
 
 
-docker build --rm -f "Dockerfile" -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName}
+docker build --rm -f "Dockerfile"  --network=host -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName}
 docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
 docker push tdengine/tdengine-${dockername}:${version}
 

packaging/tools/makeclient.sh

@@ -195,15 +195,6 @@ if [ "$pagMode" == "lite" ]; then
   pkg_name=${pkg_name}-Lite
 fi
 
-if [ "$verType" == "beta" ]; then
-  pkg_name=${pkg_name}-${verType}
-elif [ "$verType" == "stable" ]; then
-  pkg_name=${pkg_name}
-else
-  echo "unknow verType, nor stable or beta"
-  exit 1
-fi
-
 if [ "$osType" != "Darwin" ]; then
     tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
 else

snap/snapcraft.yaml

 name: tdengine
 base: core18
-version: '2.1.4.1'
+version: '2.1.5.0'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
@@ -72,7 +72,7 @@ parts:
       - usr/bin/taosd
       - usr/bin/taos
       - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.1.4.1
+      - usr/lib/libtaos.so.2.1.5.0
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so