From f24be8751f1b632c43299b455ad6faf834c004bd Mon Sep 17 00:00:00 2001
From: tomchon <haoran920c@163.com>
Date: Wed, 21 Jul 2021 15:19:14 +0800
Subject: [PATCH] modify dockerManifest.sh

---
 packaging/docker/dockerManifest.sh | 4 +++-
 packaging/docker/dockerbuild.sh    | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packaging/docker/dockerManifest.sh b/packaging/docker/dockerManifest.sh
index 0b30dd702c..9c5a618f34 100755
--- a/packaging/docker/dockerManifest.sh
+++ b/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"
diff --git a/packaging/docker/dockerbuild.sh b/packaging/docker/dockerbuild.sh
index 1c440f8315..c0e52f6dce 100755
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
@@ -71,7 +71,6 @@ if [ "$verType" == "beta" ]; then
 elif [ "$verType" == "stable" ]; then
   dockername=${cpuType}
   dirName=${pkgFile%-Linux*}
-
 else
   echo "unknow verType, nor stabel or beta"
   exit 1
@@ -90,7 +89,7 @@ cp -f ${comunityArchiveDir}/${pkgFile}  .
 echo "dirName=${dirName}"
 
 
-docker build --rm -f "Dockerfile" --network=host -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}
 
-- 
GitLab