Merge branch 'develop' into dev_20241202_xukangle

xukangle
Showing 1 changed file with 5 additions and 5 deletions
Jenkinsfile
--- a/Jenkinsfile
View file @1859a94
+++ b/Jenkinsfile
View file @1859a94
@@ -78,15 +78,15 @@ pipeline {
                                       ##构建镜像到远程仓库
                                       docker login "${ip}" -u admin -p E6w611g864wQ2
                                       #docker tag "${SVN_FOLD}":"${image_tag}" "${ip}"/csbr/"${SVN_FOLD}":"${image_tag}"
-                                       docker build -t "${ip}"/csbr/"${SVN_FOLD}":"${image_tag}" .
+                                       docker build -t "${ip}"/csbr/"${SVN_FOLD}""-${SVN_TYPE}":"${image_tag}" .
-                                       docker push "${ip}"/csbr/"${SVN_FOLD}":"${image_tag}"
+                                        docker push "${ip}"/csbr/"${SVN_FOLD}""-${SVN_TYPE}":"${image_tag}"
                                    else
                                       echo "不存在'${SVN_FOLD}'镜像，开始构建镜像"
                                       ##构建镜像到远程仓库
                                       docker login "${ip}" -u admin -p E6w611g864wQ2
                                       #docker tag "${SVN_FOLD}":"${image_tag}" "${ip}"/csbr/"${SVN_FOLD}":"${image_tag}"
-                                       docker build -t "${ip}"/csbr/"${SVN_FOLD}":"${image_tag}" .
+                                        docker build -t "${ip}"/csbr/"${SVN_FOLD}""-${SVN_TYPE}":"${image_tag}" .
-                                       docker push "${ip}"/csbr/"${SVN_FOLD}":"${image_tag}"
+                                       docker push "${ip}"/csbr/"${SVN_FOLD}""-${SVN_TYPE}":"${image_tag}"
                                    fi
                                    '''
                                echo 'Depoly ${SVN_FOLD} success ...'
@@ -112,7 +112,7 @@ pipeline {
                        //master-asset分支环境
                        echo 'start to deploy ${SVN_FOLD} on develop ...'
                        //调用Publish Over SSH插件，上传docker-compose.yaml文件并且执行deploy脚本
-                        sshPublisher(publishers: [sshPublisherDesc(configName: "csbr5.3", transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: """
+                        sshPublisher(publishers: [sshPublisherDesc(configName: "csbr20", transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: """
                             #使用k8s构建
                             kubectl delete -f /mnt/k8s/develop/daop-jgjf/fe-data-asset-management.yaml
                             kubectl apply -f /mnt/k8s/develop/daop-jgjf/fe-data-asset-management.yaml