modify release scripts and change version number

2021-07-07 20:25:10 +08:00 · 2021-07-07 20:25:10 +08:00 · 30bfd495e6
parent 175202e036
commit 30bfd495e6
4 changed files with 88 additions and 28 deletions
--- a/cmake/version.inc
+++ b/cmake/version.inc
@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
  SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.0.20.8")
+  SET(TD_VER_NUMBER "2.0.20.9")
 ENDIF ()

 IF (DEFINED VERCOMPATIBLE)
--- a/packaging/docker/dockerManifest.sh
+++ b/packaging/docker/dockerManifest.sh
@ -5,22 +5,28 @@ set -e
 # dockerbuild.sh 
 #             -n [version number]
 #             -p [xxxx]
+#             -V [stable | beta]

 # set parameters by default value
-verNumber=""
+version=""
 passWord=""
+verType=""

-while getopts "hn:p:" arg
+while getopts "hn:p:V:" arg
 do
  case $arg in
    n)
-      #echo "verNumber=$OPTARG"
-      verNumber=$(echo $OPTARG)
+      #echo "version=$OPTARG"
+      version=$(echo $OPTARG)
      ;;
    p)
      #echo "passWord=$OPTARG"
      passWord=$(echo $OPTARG)
      ;;
+    V)
+      #echo "verType=$OPTARG"
+      verType=$(echo $OPTARG)
+      ;;    
    h)
      echo "Usage: `basename $0` -n [version number] "
      echo "                      -p [password for docker hub] "
@ -33,13 +39,30 @@ do
  esac
 done

-echo "verNumber=${verNumber}"
+echo "version=${version}"

-#docker manifest create -a tdengine/tdengine:${verNumber} tdengine/tdengine-amd64:${verNumber} tdengine/tdengine-aarch64:${verNumber} tdengine/tdengine-aarch32:${verNumber}
-docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
+#docker manifest rm tdengine/tdengine
+#docker manifest rm tdengine/tdengine:${version}
+if [ "$verType" == "beta" ]; then
+  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
+  docker manifest push tdengine/tdengine-beta:latest
+elif [ "$verType" == "stable" ]; then
+  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
+else
+  echo "unknow verType, nor stabel or beta"
+  exit 1
+fi

-docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
+# docker manifest create -a tdengine/${dockername}:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
+# docker manifest create -a tdengine/${dockername}:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest

-docker manifest push tdengine/tdengine:latest
+# docker login -u tdengine -p ${passWord}  #replace the docker registry username and password

-# how set latest version ???
+# docker manifest push tdengine/tdengine:latest
+
+# # how set latest version ???
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
@ -1,20 +1,24 @@
 #!/bin/bash
+#
+
 set -e
 #set -x

 # dockerbuild.sh 
 #             -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...]  
-#             -f [pkg file]
 #             -n [version number]
 #             -p [password for docker hub]
+#             -V [stable | beta]
+#             -f [pkg file]

 # set parameters by default value
-cpuType=amd64
-verNumber=""
+cpuType=""
+version=""
 passWord=""
 pkgFile=""
+verType=""

-while getopts "hc:n:p:f:" arg
+while getopts "hc:n:p:f:V:" arg
 do
  case $arg in
    c)
@ -22,8 +26,8 @@ do
      cpuType=$(echo $OPTARG)
      ;;
    n)
-      #echo "verNumber=$OPTARG"
-      verNumber=$(echo $OPTARG)
+      #echo "version=$OPTARG"
+      version=$(echo $OPTARG)
      ;;
    p)
      #echo "passWord=$OPTARG"
@ -33,11 +37,17 @@ do
      #echo "pkgFile=$OPTARG"
      pkgFile=$(echo $OPTARG)
      ;;
+    V)
+      #echo "verType=$OPTARG"
+      verType=$(echo $OPTARG)
+      ;;
    h)
-      echo "Usage: `basename $0` -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...] "      
-      echo "                      -f [pkg file] "      
+      echo "Usage: `basename $0`  -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...] "
      echo "                      -n [version number] "
      echo "                      -p [password for docker hub] "
+      echo "                      -V [stable | beta] "
+      echo "                      -f [pkg file] "
+
      exit 0
      ;;
    ?) #unknow option 
@ -47,17 +57,44 @@ do
  esac
 done

-echo "cpuType=${cpuType} verNumber=${verNumber} pkgFile=${pkgFile} "
+# if [ "$verType" == "beta" ]; then
+#   pkgFile=TDengine-server-${version}-Linux-${cpuType}-${verType}.tar.gz
+# elif [ "$verType" == "stable" ]; then
+#   pkgFile=TDengine-server-${version}-Linux-${cpuType}.tar.gz
+# else
+#   echo "unknow verType, nor stabel or beta"
+#   exit 1
+
+if [ "$verType" == "beta" ]; then
+  dockername=${cpuType}-${verType}
+elif [ "$verType" == "stable" ]; then
+  dockername=${cpuType}
+else
+  echo "unknow verType, nor stabel or beta"
+  exit 1
+fi
+
+
+echo "cpuType=${cpuType} version=${version} pkgFile=${pkgFile} verType=${verType} "
 echo "$(pwd)"
 echo "====NOTES: ${pkgFile} must be in the same directory as dockerbuild.sh===="

-dirName=${pkgFile%-Linux*}
-#echo "dirName=${dirName}"
+scriptDir=$(dirname $(readlink -f $0))
+comunityArchiveDir=/nas/TDengine/v$version/community   # community version’package directory
+cd ${scriptDir}
+cp -f ${comunityArchiveDir}/${pkgFile}  .

-docker build --rm -f "Dockerfile" -t tdengine/tdengine-${cpuType}:${verNumber} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName}
+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 login -u tdengine -p ${passWord}  #replace the docker registry username and password
-docker push tdengine/tdengine-${cpuType}:${verNumber}
+docker push tdengine/tdengine-${dockername}:${version}

 # set this version to latest version
-docker tag tdengine/tdengine-${cpuType}:${verNumber} tdengine/tdengine-${cpuType}:latest
-docker push tdengine/tdengine-${cpuType}:latest
+docker tag tdengine/tdengine-${dockername}:${version} tdengine/tdengine-${dockername}:latest
+docker push tdengine/tdengine-${dockername}:latest
+
+
+rm -f ${pkgFile}
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@ -1,6 +1,6 @@
 name: tdengine
 base: core18
-version: '2.0.20.8'
+version: '2.0.20.9'
 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.0.20.5
+      - usr/lib/libtaos.so.2.0.20.9
      - usr/lib/libtaos.so.1
      - usr/lib/libtaos.so