更新 'jenkinsfile_web'

1 year ago · c0efc60a37
1 changed files with 24 additions and 17 deletions
--- a/39
+++ b/39
@ -1,18 +1,25 @@
-pipeline {
-    agent {
-        node{
-            label 'jnlp-slave'
-    }
-    }
+podTemplate {
+    node('pod-templ-jenkins-slave-common') {
 		
-    stages {
-        stage('巡检 web ......') {
-            steps {
-               buildName "#${BUILD_NUMBER} ~/smartcity/${JOB_NAME}:${IMAGE_VERSION}"
-                buildDescription "harbor.anxinyun.cn/smartcity/${JOB_NAME}:${IMAGE_VERSION}"
-                sh 'nerdctl build -t harbor.anxinyun.cn/smartcity/${JOB_NAME}:${IMAGE_VERSION} ./web'
-				    sh 'nerdctl push harbor.anxinyun.cn/smartcity/${JOB_NAME}:${IMAGE_VERSION}'
-            }
-        }
-    }
+		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}"
+		env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}"
+        env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/Inspection.git"
+		
+	    stage('Run shell') { 
+		    git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
+		    
+		    container('image-builder') {			    
+				sh'''
+					pwd
+					ls -al
+					
+				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./web/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+
+			    '''			    
+		    }
+			
+		    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+		    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"			
+		}
+	}
 }