Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update trivy image scan cleanup commands #593

Merged
merged 1 commit into from
Mar 6, 2025
Merged

Update trivy image scan cleanup commands #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jacocoTestReport {
}
}

String version = '8.2.1'
String version = '8.2.2'

task updateVersion {
doLast {
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/jobs/ScanDockerImage_Jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vars/scanDockerImage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading