From dcb0c6a8ae60b5d496f88f2b5dbee772cc1b8259 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 3 Nov 2022 15:56:01 +0000
Subject: [PATCH] update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index ba7cc51..5531576 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,6 +94,8 @@ pipeline {
                 script {
                    try {
                          echo "Starting security scan..."
+                         maintainer = maintain()
+                         imagename = imagename()
                          // Install trivy and HTML template
                          sh 'curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.31.1'
                          sh 'curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/html.tpl > html.tpl'
@@ -101,7 +103,7 @@ pipeline {
                          // Scan container for all vulnerability levels
                          echo "Scanning for all vulnerabilities..."
                          sh 'mkdir -p reports'
-                         sh 'docker pull ${maintainer}/${imagename}:${tag}'
+                         //sh 'docker pull ${maintainer}/${imagename}:${tag}'
                          sh 'trivy image --ignore-unfixed --vuln-type os,library --severity CRITICAL,HIGH --no-progress --security-checks vuln --format template --template \'@html.tpl\' -o reports/container-scan.html ${maintainer}/${imagename}:${tag}'
                          publishHTML target : [
                              allowMissing: true,