测试发版

lihua
Showing 3 changed files with 12 additions and 12 deletions
Dockerfile
Jenkinsfile
default.conf
--- a/Dockerfile
View file @9f11f95
+++ b/Dockerfile
View file @9f11f95
-FROM 192.168.6.22:8081/csbr/nginx:stable-alpine
+FROM 192.168.5.4:82/csbr/nginx:stable-alpine
 VOLUME /tmp
 #将当前文件夹的dist文件复制到容器的/usr/share/nginx/html目录
 COPY ./dist/* /usr/share/nginx/html/
--- a/Jenkinsfile
View file @9f11f95
+++ b/Jenkinsfile
View file @9f11f95
@@ -8,15 +8,15 @@ pipeline {
        //192.168.4.4服务器
        //SSH_PATH = "csbr4.4"
        //192.168.5.4
-        SSH_PATH = "csbr20"
+        SSH_PATH = "csbr5.4"
-        SVN_TYPE = "dev"
+        SVN_TYPE = "test"
        //139.9.190.186
        //SSH_PATH = "csbr190.186"
        //SVN_TYPE = "master"
        //镜像版本号
        image_tag = "1.0.0"
        //docker私服ip
-        ip = "192.168.6.22:8081"
+        ip = "192.168.5.4:82"
        //前端端口号
        port = "29900"
        //映射端口号
@@ -64,9 +64,9 @@ pipeline {
                    steps {
                       //分分支构建
                       script{
-                            if(env.BRANCH_NAME=='develop'){
+                            if(env.BRANCH_NAME=='release-test'){
                                //master-asset分支环境
-                                echo 'start to deploy ${SVN_FOLD} on develop ...'
+                                echo 'start to deploy ${SVN_FOLD} on release-test ...'
                                 sh '''
                                    #docker rmi -f $(docker images | grep "none" | awk '{print $3}')
                                    CID=$(docker ps -a | grep "${SVN_FOLD}" | awk '{print $1}')
@@ -108,14 +108,14 @@ pipeline {
                echo 'Deploying'
                //分分支部署
                script{
-                    if(env.BRANCH_NAME=='develop'){
+                    if(env.BRANCH_NAME=='release-test'){
                        //master-asset分支环境
-                        echo 'start to deploy ${SVN_FOLD} on develop ...'
+                        echo 'start to deploy ${SVN_FOLD} on release-test ...'
                        //调用Publish Over SSH插件，上传docker-compose.yaml文件并且执行deploy脚本
                        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 delete -f /mnt/k8s/release-test/daop-jgjf/fe-data-asset-management.yaml
-                             kubectl apply -f /mnt/k8s/develop/daop-jgjf/fe-data-asset-management.yaml
+                             kubectl apply -f /mnt/k8s/release-test/daop-jgjf/fe-data-asset-management.yaml
                        """, execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/csbr/data', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'output/*.*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
                        echo 'Depoly ${SVN_FOLD} success ...'
--- a/default.conf
View file @9f11f95
+++ b/default.conf
View file @9f11f95
@@ -43,7 +43,7 @@ server {
         # 使用 rewrite 将 /api 替换为 /new-api
        rewrite ^/api/(.*)$ /$1 break;
-        proxy_pass http://192.168.6.20:28052;
+        proxy_pass https://daop-zcgl-test.zgsjzc.com;
    }
    location /circulation {
@@ -61,7 +61,7 @@ server {
         # 使用 rewrite 将 /circulation 替换为 /new-api
        rewrite ^/circulation/(.*)$ /$1 break;
-        proxy_pass http://192.168.6.20:18052;
+        proxy_pass https://daop-lt-test.zgsjzc.com;
    }
    location /delivery {
        # 设置允许跨域的域名，可以使用通配符 '*' 允许所有域访问