From 1ac3584cbe6a3583cff30946923de9b13e008c6d Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Fri, 9 Dec 2022 14:18:09 +0800
Subject: [PATCH] ceshi

---
 code/VideoAccess-VCMP/api/Dockerfile |  4 ++--
 jenkinsfile_vcmp_api                 | 36 +++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/code/VideoAccess-VCMP/api/Dockerfile b/code/VideoAccess-VCMP/api/Dockerfile
index 75ae03d..10fc786 100644
--- a/code/VideoAccess-VCMP/api/Dockerfile
+++ b/code/VideoAccess-VCMP/api/Dockerfile
@@ -1,4 +1,4 @@
-FROM harbor.anxinyun.cn/fs-devops/node-12:34.22-10-26-dev as builder
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder
 
 COPY . /var/app
 
@@ -12,7 +12,7 @@ RUN npm cache clean -f
 RUN rm -rf package-lock.json
 RUN npm install --registry http://10.8.30.22:7000
 
-FROM harbor.anxinyun.cn/fs-devops/node-12:34.22-10-26
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12
 
 COPY --from=builder --chown=node /var/app  /home/node/app
 
diff --git a/jenkinsfile_vcmp_api b/jenkinsfile_vcmp_api
index 39852c8..553e70a 100644
--- a/jenkinsfile_vcmp_api
+++ b/jenkinsfile_vcmp_api
@@ -1,19 +1,39 @@
+// pipeline {
+//     agent {
+//         node{
+//             label 'jnlp-slave'
+//         }
+//     }
+    
+//     stages {
+//         stage('Testing vcmp ......') {
+//             steps {
+//                 sh 'switch-auth.sh  anxinyun' 
+//                 buildName "#${BUILD_NUMBER}  ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}"
+//                 buildDescription "harbor.anxinyun.cn/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}"
+//                 sh 'ctr build -t harbor.anxinyun.cn/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./code/VideoAccess-VCMP/api' 
+//                 sh 'ctr push harbor.anxinyun.cn/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' 
+//             }
+//         }
+//     }
+// }
+
 pipeline {
     agent {
         node{
             label 'jnlp-slave'
-        }
+    }
     }
     
     stages {
-        stage('Testing vcmp ......') {
+        stage('Testing site......') {
             steps {
-                sh 'switch-auth.sh  anxinyun' 
-                buildName "#${BUILD_NUMBER}  ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}"
-                buildDescription "harbor.anxinyun.cn/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}"
-                sh 'ctr build -t harbor.anxinyun.cn/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./code/VideoAccess-VCMP/api' 
-                sh 'ctr push harbor.anxinyun.cn/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' 
+                buildName "#${BUILD_NUMBER} ~/smart-site/${JOB_NAME}:${IMAGE_VERSION}"
+                buildDescription "harbor.anxinyun.cn/smart-site/${JOB_NAME}:${IMAGE_VERSION}"
+                sh 'nerdctl build -t harbor.anxinyun.cn/smart-site/${JOB_NAME}:${IMAGE_VERSION} .'
+				sh 'nerdctl push harbor.anxinyun.cn/smart-site/${JOB_NAME}:${IMAGE_VERSION}'
+                
             }
         }
-    }
+	}
 }
\ No newline at end of file