up

src/org/qg/docker_new/StageBucketTke.groovy

@@ -586,11 +586,17 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
 }
 
 
-def clean_images(imageTag,imageTagCode,contextDir) {
+def clean_images(imageTag,imageTagCode,contextDir,buildType) {
 	sh "rm -rf ${contextDir}"
+	if(buildType=="java"){
 		if (cluster=="pro"){
 			sh "docker rmi -f \$(docker images -q ${imageTagCode})"
 		}else if (cluster=="test") {
 			sh "docker rmi -f \$(docker images -q ${imageTag})"
 		}
+	}else{
+		sh "docker rmi -f \$(docker images -q ${imageTagCode})"
+		sh "docker rmi -f \$(docker images -q ${imageTag})"
+	}
+
 }

vars/qgDockerPiplineWithDockerSlaveTke.groovy

@@ -87,12 +87,12 @@ def call(body) {
 				/*  4 */
 				stage('Clean'){
 					_utils.beautyEcho("Clear Cache Tmp", "stage")
-					_stage.clean_images(imageTagInfos[0]["imageTag"],imageTagInfos[0]["imageTagCode"],contextDir)
+					_stage.clean_images(imageTagInfos[0]["imageTag"],imageTagInfos[0]["imageTagCode"],contextDir,config.buildType)
 				}
 			} catch (err) {
 				_utils.beautyEcho(err, "fail")
 				if(imageTagInfos != null){
-					_stage.clean_images(imageTagInfos[0]["imageTag"],imageTagInfos[0]["imageTagCode"],contextDir)
+					_stage.clean_images(imageTagInfos[0]["imageTag"],imageTagInfos[0]["imageTagCode"],contextDir,config.buildType)
 				}									
 				throw err			
 			}