From d39ff9193bd7a1057581a8394cb17b080484ce20 Mon Sep 17 00:00:00 2001
From: tomchon <haoran920c@163.com>
Date: Tue, 20 Jul 2021 23:21:01 +0800
Subject: [PATCH] @tomchon modify release scripts and change version number

---
 cmake/version.inc               | 2 +-
 packaging/docker/dockerbuild.sh | 6 ++++--
 snap/snapcraft.yaml             | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cmake/version.inc b/cmake/version.inc
index 6e71ac55ef..3bb06bfcf2 100755
--- 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.9")
+  SET(TD_VER_NUMBER "2.0.20.10")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)
diff --git a/packaging/docker/dockerbuild.sh b/packaging/docker/dockerbuild.sh
index 861f00f854..1c440f8315 100755
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
@@ -67,8 +67,11 @@ 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 +87,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}
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 16fd9145fa..b06864fe5d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: tdengine
 base: core18
-version: '2.0.20.9'
+version: '2.0.20.10'
 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.9
+      - usr/lib/libtaos.so.2.0.20.10
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so
 
-- 
GitLab