update jenkins-ci

FudanSELab · Dec 22, 2019 · b16d36d · b16d36d
1 parent 1ffc4df
commit b16d36d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/jenkins-ci/Jenkinsfile b/jenkins-ci/Jenkinsfile
@@ -4,8 +4,9 @@ pipeline {
       jdk 'jdk8'
       maven 'maven-3.6.1'        
     }
-    // At this stage, the jar artifacts are first built using maven, and then the docker images are built.
     stages {
+
+      // At this stage, the jar artifacts are first built using maven, and then the docker images are built.
       stage('Build') {
         steps {
           echo "Build..."
@@ -16,6 +17,7 @@ pipeline {
           echo "Building images Successful!"
         }
       }
+
       // TODO: This stage will perform unit tests, etc.
       stage('Test') {
         steps {
@@ -26,6 +28,7 @@ pipeline {
           sh 'mvn clean'
         }
       }
+
       // This stage will push the images built to the docker hub.
       // After this stage is successful, you can directly pull the image from the docker hub to build the TrainTicket cluster application.
       // Note: The tag of the image you build at this time is latest. Please modify it when deploying the application.
@@ -41,5 +44,6 @@ pipeline {
           sh 'sudo /bin/bash ./jenkins-ci/clean.sh'
         }
       }
+
     }
-}
+}
diff --git a/jenkins-ci/clean.sh b/jenkins-ci/clean.sh
@@ -80,4 +80,7 @@ sudo docker rmi ts/ts-admin-travel-service:latest
 sudo docker rmi ts/ts-admin-user-service:latest
 sudo docker rmi ts/ts-news-service:latest
 sudo docker rmi ts/ts-ticket-office-service:latest
-sudo docker rmi ts/ts-voucher-service:latest
+sudo docker rmi ts/ts-voucher-service:latest
+
+sudo docker rmi $(docker image ls -qf dangling=true)
+sudo docker image prune -f