From e8c13c67142d4d3ae6da2ec18c602365d012628f Mon Sep 17 00:00:00 2001
From: dickylcd <43079975+dickylcd@users.noreply.github.com>
Date: Mon, 21 Mar 2022 09:26:18 +0800
Subject: [PATCH 1/5] Update Jenkinsfile-2

---
 Jenkinsfile-2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-2 b/Jenkinsfile-2
index f09566b1..d59b143c 100644
--- a/Jenkinsfile-2
+++ b/Jenkinsfile-2
@@ -11,8 +11,8 @@ pipeline {
     }
     stage('Scan') {
       steps {
-        sh 'trivy --no-progress --exit-code 1 --severity HIGH,CRITICAL darinpope/java-web-app:latest'
+        sh 'trivy --exit-code 1 --severity HIGH,CRITICAL darinpope/java-web-app:latest'
       }
     }
   }
-}
\ No newline at end of file
+}

From b042e6d5afac5447f222006cb511331504cfbe5f Mon Sep 17 00:00:00 2001
From: dickylcd <43079975+dickylcd@users.noreply.github.com>
Date: Mon, 21 Mar 2022 09:35:03 +0800
Subject: [PATCH 2/5] Update Jenkinsfile-2

---
 Jenkinsfile-2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-2 b/Jenkinsfile-2
index d59b143c..a8031fd2 100644
--- a/Jenkinsfile-2
+++ b/Jenkinsfile-2
@@ -11,7 +11,7 @@ pipeline {
     }
     stage('Scan') {
       steps {
-        sh 'trivy --exit-code 1 --severity HIGH,CRITICAL darinpope/java-web-app:latest'
+        sh 'trivy image --exit-code 1 --severity HIGH,CRITICAL darinpope/java-web-app:latest'
       }
     }
   }

From e8df0ca4a8936bf71af9d3d627c71f027057ab26 Mon Sep 17 00:00:00 2001
From: dickylcd <43079975+dickylcd@users.noreply.github.com>
Date: Mon, 21 Mar 2022 09:36:51 +0800
Subject: [PATCH 3/5] Update Jenkinsfile-2

---
 Jenkinsfile-2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-2 b/Jenkinsfile-2
index a8031fd2..6b169443 100644
--- a/Jenkinsfile-2
+++ b/Jenkinsfile-2
@@ -11,7 +11,7 @@ pipeline {
     }
     stage('Scan') {
       steps {
-        sh 'trivy image --exit-code 1 --severity HIGH,CRITICAL darinpope/java-web-app:latest'
+        sh 'trivy image --no-progress --exit-code 1 --severity HIGH,CRITICAL darinpope/java-web-app:latest'
       }
     }
   }

From d081e8b8ac4cb9065a35acde94f713db51a322eb Mon Sep 17 00:00:00 2001
From: dickylcd <43079975+dickylcd@users.noreply.github.com>
Date: Mon, 21 Mar 2022 09:38:13 +0800
Subject: [PATCH 4/5] Update Jenkinsfile-3

---
 Jenkinsfile-3 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-3 b/Jenkinsfile-3
index 14141a00..c2f91a15 100644
--- a/Jenkinsfile-3
+++ b/Jenkinsfile-3
@@ -11,8 +11,8 @@ pipeline {
     }
     stage('Scan') {
       steps {
-        sh 'trivy --no-progress --exit-code 1 --severity MEDIUM,HIGH,CRITICAL darinpope/java-web-app:latest'
+        sh 'trivy image --no-progress --exit-code 1 --severity MEDIUM,HIGH,CRITICAL darinpope/java-web-app:latest'
       }
     }
   }
-}
\ No newline at end of file
+}

From ed1b1139986c7944d1b481e3cd3393b862250e2c Mon Sep 17 00:00:00 2001
From: dickylcd <43079975+dickylcd@users.noreply.github.com>
Date: Thu, 31 Mar 2022 11:12:41 +0800
Subject: [PATCH 5/5] Update Jenkinsfile-3

---
 Jenkinsfile-3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-3 b/Jenkinsfile-3
index c2f91a15..de0ae46c 100644
--- a/Jenkinsfile-3
+++ b/Jenkinsfile-3
@@ -1,5 +1,5 @@
 pipeline {
-  agent { label 'linux' }
+  agent { label 'master' }
   options {
     buildDiscarder(logRotator(numToKeepStr: '5'))
   }