更新 'jenkinsfilenew_web'

2 years ago · d7a51ab656
1 changed files with 22 additions and 21 deletions
--- a/43
+++ b/43
@ -1,21 +1,22 @@
-podTemplate {
-    node('pod-templ-jenkins-slave-common') {
-		
-		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}"
-		env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}"
-        env.GIT_Add = "${GIT_ADDRESS}/free-sun/OperationalService/src/branch/dev/web"
-		
-	    stage('Run shell') { 
-		    git credentialsId: 'gitea-builder', url: 'https://gitea.anxinyun.cn/free-sun/OperationalService.git'
-		    
-		    container('image-builder') {			    
-				sh'''
-				    /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}"			
-		}
-	}
-}
+podTemplate {
+    node('pod-templ-jenkins-slave-common') {
+		
+		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}"
+		env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}"
+        env.GIT_Add = "${GIT_ADDRESS}/free-sun/OperationalService/src/branch/dev/web"
+		
+	    stage('Run shell') { 
+		    git credentialsId: 'gitea-builder', url: 'https://gitea.anxinyun.cn/free-sun/OperationalService.git'
+		    
+		    container('image-builder') {			    
+				sh'''
+					find . -depth -name '.svn' -type d -exec rm -rf {} +
+				    /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}"			
+		}
+	}
+}