From c4ce6addc0eb9a1cad056b8e3499c3d6989a5c94 Mon Sep 17 00:00:00 2001 From: "Fleming, Michael (NIH/NCI) [C]" Date: Wed, 29 May 2024 10:10:51 -0400 Subject: [PATCH 1/3] updated dockerfile select --- jenkins/ScanBaseImages-trivy.jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/ScanBaseImages-trivy.jenkinsfile b/jenkins/ScanBaseImages-trivy.jenkinsfile index 13a6c29c..72412b41 100644 --- a/jenkins/ScanBaseImages-trivy.jenkinsfile +++ b/jenkins/ScanBaseImages-trivy.jenkinsfile @@ -83,7 +83,7 @@ pipeline { if (! repo_empty) { - dockerfilePath = sh(label: 'get dockerfile url', returnStdout: true, script: "curl -u $GITHUB_USER:$GITHUB_PAT -s $tree/$branch\\?recursive\\=1 | jq -r '.tree[] | select(.path | contains(\"Dockerfile\"))? |.path' || echo 'NOT_FOUND'").trim().split() + dockerfilePath = sh(label: 'get dockerfile url', returnStdout: true, script: "curl -u $GITHUB_USER:$GITHUB_PAT -s $tree/$branch\\?recursive\\=1 | jq -r '.tree[] | tr '[:upper:]' '[:lower:]' | select(.path | contains(\"dockerfile\"))? |.path' || echo 'NOT_FOUND'").trim().split() rawUrl = "https://raw.githubusercontent.com/$ORG/$it/$branch" if (!(dockerfilePath == 'NOT_FOUND')) { From e21f311e926031eaad4d64d5bec6e8314c9b3f0d Mon Sep 17 00:00:00 2001 From: "Fleming, Michael (NIH/NCI) [C]" Date: Wed, 29 May 2024 10:19:00 -0400 Subject: [PATCH 2/3] moved text changes --- jenkins/ScanBaseImages-trivy.jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/ScanBaseImages-trivy.jenkinsfile b/jenkins/ScanBaseImages-trivy.jenkinsfile index 72412b41..302da1e4 100644 --- a/jenkins/ScanBaseImages-trivy.jenkinsfile +++ b/jenkins/ScanBaseImages-trivy.jenkinsfile @@ -83,7 +83,7 @@ pipeline { if (! repo_empty) { - dockerfilePath = sh(label: 'get dockerfile url', returnStdout: true, script: "curl -u $GITHUB_USER:$GITHUB_PAT -s $tree/$branch\\?recursive\\=1 | jq -r '.tree[] | tr '[:upper:]' '[:lower:]' | select(.path | contains(\"dockerfile\"))? |.path' || echo 'NOT_FOUND'").trim().split() + dockerfilePath = sh(label: 'get dockerfile url', returnStdout: true, script: "curl -u $GITHUB_USER:$GITHUB_PAT -s $tree/$branch\\?recursive\\=1 | tr '[:upper:]' '[:lower:]' | jq -r '.tree[] | select(.path | contains(\"dockerfile\"))? |.path' || echo 'NOT_FOUND'").trim().split() rawUrl = "https://raw.githubusercontent.com/$ORG/$it/$branch" if (!(dockerfilePath == 'NOT_FOUND')) { From b7088cca5daeb422c70f0a622c0b23d44e78ed9b Mon Sep 17 00:00:00 2001 From: "Fleming, Michael (NIH/NCI) [C]" Date: Wed, 29 May 2024 11:27:43 -0400 Subject: [PATCH 3/3] updated path test --- jenkins/ScanBaseImages-trivy.jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/ScanBaseImages-trivy.jenkinsfile b/jenkins/ScanBaseImages-trivy.jenkinsfile index 302da1e4..1268845c 100644 --- a/jenkins/ScanBaseImages-trivy.jenkinsfile +++ b/jenkins/ScanBaseImages-trivy.jenkinsfile @@ -83,7 +83,7 @@ pipeline { if (! repo_empty) { - dockerfilePath = sh(label: 'get dockerfile url', returnStdout: true, script: "curl -u $GITHUB_USER:$GITHUB_PAT -s $tree/$branch\\?recursive\\=1 | tr '[:upper:]' '[:lower:]' | jq -r '.tree[] | select(.path | contains(\"dockerfile\"))? |.path' || echo 'NOT_FOUND'").trim().split() + dockerfilePath = sh(label: 'get dockerfile url', returnStdout: true, script: "curl -u $GITHUB_USER:$GITHUB_PAT -s $tree/$branch\\?recursive\\=1 | jq -r '.tree[] | select(.path | ascii_downcase | contains(\"dockerfile\"))? |.path' || echo 'NOT_FOUND'").trim().split() rawUrl = "https://raw.githubusercontent.com/$ORG/$it/$branch" if (!(dockerfilePath == 'NOT_FOUND')) {