Publish/DevOps/build-bash/startup.bash

@@ -23,7 +23,7 @@ echo $version
 
 
 #----------------------------------------------
-echo "(x.3)自动发布 $name-$version"
+echo "(x.3)build $version"
 
 for file in *.sh
 do

Publish/DevOps/build-multiple-bash/startup.bash

@@ -0,0 +1,43 @@
+set -e
+
+# cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/build-bash;bash startup.bash;
+
+#----------------------------------------------
+#(x.1)当前路径 
+curPath=$PWD
+
+cd $curPath/../../..
+export basePath=$PWD
+cd $curPath
+
+
+
+
+
+#----------------------------------------------
+echo "(x.2)get version" 
+export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+echo $version
+
+ 
+
+
+#----------------------------------------------
+echo "(x.3)build $version"
+
+for file in *.sh
+do
+    echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    echo "[$(date "+%H:%M:%S")]" bash $file
+    bash $file
+done
+
+
+
+
+
+
+ 
+#----------------------------------------------
+#(x.9)
+cd $curPath

Publish/DevOps/github-bash/startup.bash

@@ -33,7 +33,7 @@ cd $curPath
 #---------------------------------------------- 
 echo '(x.4)build'
 cd $basePath/Publish/DevOps/build-bash; bash startup.bash;
-
+cd $basePath/Publish/DevOps/build-multiple-bash; bash startup.bash;
 
 
 #---------------------------------------------- 

Publish/DevOps/jenkins-bash/00.svn-checkout.bash

@@ -1,10 +1,11 @@
 
 #(x.1)参数
+args_="
 basePath=/root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers
 export SVN_PATH=svn://svn.ki.lith.cloud/Sers2.1/Sers
 export SVN_USERNAME=jenkins
 export SVN_PASSWORD=xxxxxx
-
+# "
 
 #(x.2)创建文件夹
 mkdir -p $basePath/code

Publish/DevOps/release-bash/73.docker-image-build-push.sh

@@ -9,6 +9,7 @@ export basePath=/root/temp/svn
 
 export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
+export DOCKER_SERVER=
 export DOCKER_USERNAME=serset
 export DOCKER_PASSWORD=xxx
 
@@ -20,6 +21,10 @@ export DOCKER_PASSWORD=xxx
 #---------------------------------------------------------------------
 echo "(x.2)docker - init buildx"
 
+
+export builderName="mybuilder-$version"
+echo "builderName: $builderName"
+
 echo "开启实验特性"
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
@@ -34,10 +39,10 @@ ls -al /proc/sys/fs/binfmt_misc/
 
 
 echo "创建构建器"
-if [ ! "$(docker buildx ls | grep mybuilder)" ]; then docker buildx create --use --name mybuilder; fi
+if [ ! "$(docker buildx ls | grep $builderName)" ]; then docker buildx create --use --name $builderName; fi
 
 echo "启动构建器"
-docker buildx inspect mybuilder --bootstrap
+docker buildx inspect $builderName --bootstrap
 
 echo "查看当前使用的构建器及构建器支持的CPU架构"
 docker buildx ls
@@ -47,8 +52,8 @@ docker buildx ls
 #---------------------------------------------------------------------
 echo "(x.3)docker - build and push"
 
-docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-
+# login if UserName is not empty
+if [ -z "$DOCKER_USERNAME" ]; then docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD; fi
 
 dockerPath=$basePath/Publish/release/release/docker-image
 
@@ -60,11 +65,11 @@ do
     if [ -f "$dockerPath/$dockerName/Dockerfile.platform" ]; then platform=`cat "$dockerPath/$dockerName/Dockerfile.platform"`; fi
 
     echo "docker build $dockerName, platform: $platform"
-    docker buildx build $dockerPath/$dockerName -t $DOCKER_USERNAME/$dockerName:$version -t $DOCKER_USERNAME/$dockerName --platform=$platform --push
+    docker buildx build $dockerPath/$dockerName -t $DOCKER_SERVER$DOCKER_USERNAME/$dockerName:$version -t $DOCKER_SERVER$DOCKER_USERNAME/$dockerName --platform=$platform --push --builder $builderName
   fi
 done
 
 
 #---------------------------------------------------------------------
 echo "(x.4)docker - remove buildx"
-if [ "$(docker buildx ls | grep mybuilder)" ]; then docker buildx rm mybuilder; fi
+if [ "$(docker buildx ls | grep $builderName)" ]; then docker buildx rm $builderName; fi