Update trivy image scan cleanup commands (#593)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> (cherry picked from commit 3ecc31d) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Mar 6, 2025 · 7179d07 · 7179d07
1 parent 91e04aa
commit 7179d07
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -128,7 +128,7 @@ jacocoTestReport {
     }
 }
 
-String version = '8.2.1'
+String version = '8.2.2'
 
 task updateVersion {
     doLast {

diff --git a/tests/jenkins/jobs/ScanDockerImage_Jenkinsfile.txt b/tests/jenkins/jobs/ScanDockerImage_Jenkinsfile.txt
@@ -6,7 +6,7 @@
                ScanDockerImage_Jenkinsfile.scanDockerImage({imageFullName=opensearchstaging/opensearch:2.0.0, imageResultFile=scan_docker_image})
                   scanDockerImage.sh(
         touch scan_docker_image.txt scan_docker_image.json
-        trivy image --clear-cache
+        trivy clean --all
         docker rmi `docker images -f "dangling=true" -q` || echo
         docker rmi opensearchstaging/opensearch:2.0.0 || echo
         trivy image --format table --output scan_docker_image.txt opensearchstaging/opensearch:2.0.0

diff --git a/vars/scanDockerImage.groovy b/vars/scanDockerImage.groovy
@@ -10,7 +10,7 @@ void call(Map args = [:]) {
 
     sh """
         touch ${args.imageResultFile}.txt ${args.imageResultFile}.json
-        trivy image --clear-cache
+        trivy clean --all
         docker rmi `docker images -f "dangling=true" -q` || echo
         docker rmi ${args.imageFullName} || echo
         trivy image --format table --output ${args.imageResultFile}.txt ${args.imageFullName}