Merge pull request #9713 from taosdata/release/ver-2.2.2.15

Release/ver 2.2.2.15

cmake/version.inc

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

packaging/docker/dockerbuild.sh

@@ -37,6 +37,10 @@ do
       #echo "pkgFile=$OPTARG"
       pkgFile=$(echo $OPTARG)
       ;;
+    b)
+      #echo "branchName=$OPTARG"
+      branchName=$(echo $OPTARG)
+      ;;
     V)
       #echo "verType=$OPTARG"
       verType=$(echo $OPTARG)
@@ -94,8 +98,11 @@ docker login -u tdengine -p ${passWord}  #replace the docker registry username a
 docker push tdengine/tdengine-${dockername}:${version}
 
 # set this version to latest version
-docker tag tdengine/tdengine-${dockername}:${version} tdengine/tdengine-${dockername}:latest
-docker push tdengine/tdengine-${dockername}:latest
+if  [ "$branchName" == "2.4" ] || [ "$branchName" == "develop" ]  ;then
+  docker tag tdengine/tdengine-${dockername}:${version} tdengine/tdengine-${dockername}:latest
+  docker push tdengine/tdengine-${dockername}:latest
+fi
+
 
 
 rm -f ${pkgFile}
\ No newline at end of file

packaging/release.sh

@@ -3,6 +3,7 @@
 
 set -e
 #set -x
+
 scriptDir=$(dirname $(readlink -f $0))
 
 source $scriptDir/sed_power.sh

snap/snapcraft.yaml

 name: tdengine
 base: core18
-version: '2.2.2.14'
+version: '2.2.2.15'
 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.2.2.14
+      - usr/lib/libtaos.so.2.2.2.15
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so