From 99649fe343231f127b9efbab5338d4ff15be4270 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Fri, 4 Mar 2022 19:36:24 +0800 Subject: [PATCH] move dockerbuild.sh to community (#10530) --- packaging/docker/dockerManifest.sh | 82 ---------------------------- packaging/docker/dockerbuild.sh | 88 +++++++++++++++++++++++++----- packaging/docker/dockerbuildi.sh | 56 ------------------- 3 files changed, 75 insertions(+), 151 deletions(-) delete mode 100755 packaging/docker/dockerManifest.sh delete mode 100755 packaging/docker/dockerbuildi.sh diff --git a/packaging/docker/dockerManifest.sh b/packaging/docker/dockerManifest.sh deleted file mode 100755 index 71788423f6..0000000000 --- a/packaging/docker/dockerManifest.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -set -e -#set -x - -# dockerbuild.sh -# -n [version number] -# -p [xxxx] -# -V [stable | beta] - -# set parameters by default value -version="" -passWord="" -verType="" - -while getopts "hn:p:V:" arg -do - case $arg in - n) - #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] " - exit 0 - ;; - ?) #unknow option - echo "unkonw argument" - exit 1 - ;; - esac -done - -echo "version=${version}" - -#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 manifest rm tdengine/tdengine-beta:${version} - docker manifest rm tdengine/tdengine-beta: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 manifest inspect tdengine/tdengine:latest - docker manifest inspect tdengine/tdengine:${version} - docker login -u tdengine -p ${passWord} #replace the docker registry username and password - docker manifest push tdengine/tdengine-beta:${version} - 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 manifest rm tdengine/tdengine:latest - docker manifest rm tdengine/tdengine:${version} - 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 manifest inspect tdengine/tdengine:latest - docker manifest inspect tdengine/tdengine:${version} - docker login -u tdengine -p ${passWord} #replace the docker registry username and password - docker manifest push tdengine/tdengine:${version} - docker manifest push tdengine/tdengine:latest -else - echo "unknow verType, nor stabel or beta" - exit 1 -fi - -# 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 login -u tdengine -p ${passWord} #replace the docker registry username and password - -# docker manifest push tdengine/tdengine:latest - -# # how set latest version ??? diff --git a/packaging/docker/dockerbuild.sh b/packaging/docker/dockerbuild.sh index 2483973111..3a2e10a27f 100755 --- a/packaging/docker/dockerbuild.sh +++ b/packaging/docker/dockerbuild.sh @@ -18,8 +18,9 @@ version="" passWord="" pkgFile="" verType="stable" +dockerLatest="n" -while getopts "hc:n:p:f:V:" arg +while getopts "hc:n:p:f:V:a:b:" arg do case $arg in c) @@ -38,17 +39,25 @@ do #echo "pkgFile=$OPTARG" pkgFile=$(echo $OPTARG) ;; + b) + #echo "branchName=$OPTARG" + branchName=$(echo $OPTARG) + ;; V) #echo "verType=$OPTARG" verType=$(echo $OPTARG) ;; + a) + #echo "dockerLatest=$OPTARG" + dockerLatest=$(echo $OPTARG) + ;; h) 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] " - + echo " -a [y | n ] " exit 0 ;; ?) #unknow option @@ -58,13 +67,11 @@ do esac done -# 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 + +# Check_verison() +# { +# } + if [ "$verType" == "beta" ]; then dockername=${cpuType}-${verType} @@ -84,6 +91,9 @@ echo "====NOTES: ${pkgFile} must be in the same directory as dockerbuild.sh====" scriptDir=$(dirname $(readlink -f $0)) comunityArchiveDir=/nas/TDengine/v$version/community # community version’package directory +communityDir=${scriptDir}/../../../community +DockerfilePath=${communityDir}/packaging/docker/ +Dockerfile=${communityDir}/packaging/docker/Dockerfile cd ${scriptDir} cp -f ${comunityArchiveDir}/${pkgFile} . @@ -100,13 +110,65 @@ else exit 1 fi -docker build --rm -f "Dockerfile" --network=host -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName} --build-arg cpuType=${cpuTypeAlias} +docker build --rm -f "${Dockerfile}" --network=host -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName} --build-arg cpuType=${cpuTypeAlias} docker login -u tdengine -p ${passWord} #replace the docker registry username and password 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 [ -n "$(docker ps -aq)" ] ;then + echo "delte docker process" + docker stop $(docker ps -aq) + docker rm $(docker ps -aq) +fi + +if [ -n "$(pidof taosd)" ] ;then + echo "kill taosd " + kill -9 $(pidof taosd) +fi + +if [ -n "$(pidof power)" ] ;then + echo "kill power " + kill -9 $(pidof power) +fi +echo ">>>>>>>>>>>>> check whether tdengine/tdengine-${dockername}:${version} has been published" +docker run -d --name doctest -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengine-${dockername}:${version} +sleep 2 +curl -u root:taosdata -d 'show variables;' 127.0.0.1:6041/rest/sql > temp1.data +data_version=$( cat temp1.data |jq .data| jq '.[]' |grep "version" -A 2 -B 1 | jq ".[1]") +echo "${data_version}" +if [ "${data_version}" == "\"${version}\"" ] ; then + echo "docker version is right " +else + echo "docker version is wrong " + exit 1 +fi +rm -rf temp1.data + +# set this version to latest version +if [ ${dockerLatest} == 'y' ] ;then + docker tag tdengine/tdengine-${dockername}:${version} tdengine/tdengine-${dockername}:latest + docker push tdengine/tdengine-${dockername}:latest + echo ">>>>>>>>>>>>> check whether tdengine/tdengine-${dockername}:latest has been published correctly" + docker run -d --name doctestla -p 7030-7049:6030-6049 -p 7030-7049:6030-6049/udp tdengine/tdengine-${dockername}:latest + sleep 2 + curl -u root:taosdata -d 'show variables;' 127.0.0.1:7041/rest/sql > temp2.data + version_latest=` cat temp2.data |jq .data| jq '.[]' |grep "version" -A 2 -B 1 | jq ".[1]" ` + echo "${version_latest}" + if [ "${version_latest}" == "\"${version}\"" ] ; then + echo "docker version is right " + else + echo "docker version is wrong " + exit 1 + fi +fi +rm -rf temp2.data + +if [ -n "$(docker ps -aq)" ] ;then + echo "delte docker process" + docker stop $(docker ps -aq) + docker rm $(docker ps -aq) +fi + +cd ${scriptDir} rm -f ${pkgFile} diff --git a/packaging/docker/dockerbuildi.sh b/packaging/docker/dockerbuildi.sh deleted file mode 100755 index a0a954e30f..0000000000 --- a/packaging/docker/dockerbuildi.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -# - -set -e -#set -x - -# dockerbuild.sh -# -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...] -# -n [version number] -# -p [password for docker hub] - -# set parameters by default value -cpuType=aarch64 -verNumber="" -passWord="" - -while getopts "hc:n:p:f:" arg -do - case $arg in - c) - #echo "cpuType=$OPTARG" - cpuType=$(echo $OPTARG) - ;; - n) - #echo "verNumber=$OPTARG" - verNumber=$(echo $OPTARG) - ;; - p) - #echo "passWord=$OPTARG" - passWord=$(echo $OPTARG) - ;; - h) - echo "Usage: `basename $0` -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...] " - echo " -n [version number] " - echo " -p [password for docker hub] " - exit 0 - ;; - ?) #unknow option - echo "unkonw argument" - exit 1 - ;; - esac -done - -pkgFile=TDengine-server-${verNumber}-Linux-${cpuType}.tar.gz - -echo "cpuType=${cpuType} verNumber=${verNumber} pkgFile=${pkgFile} " - -scriptDir=`pwd` -pkgDir=$scriptDir/../../release/ - -cp -f ${pkgDir}/${pkgFile} . - -./dockerbuild.sh -c ${cpuType} -f ${pkgFile} -n ${verNumber} -p ${passWord} - -rm -f ${pkgFile} -- GitLab