Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into sbom
Browse files Browse the repository at this point in the history
  • Loading branch information
knqyf263 committed Jan 11, 2024
2 parents 219adbe + 7eb23af commit 876e17f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# That's the only place where you're supposed to specify version of Trivy.
ARG TRIVY_VERSION=0.48.1
ARG TRIVY_VERSION=0.48.3

FROM aquasec/trivy:${TRIVY_VERSION}

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ The following matrix indicates the version of Trivy and Trivy adapter installed

| Harbor | Trivy Adapter | Trivy |
|------------------|---------------|-----------------|
| - | v0.30.21 | [trivy v0.48.3] |
| - | v0.30.20 | [trivy v0.48.1] |
| - | v0.30.19 | [trivy v0.47.0] |
| - | v0.30.18 | [trivy v0.46.1] |
Expand Down
6 changes: 5 additions & 1 deletion test/component/component_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ import (
)

var (
trivyScanner = harbor.Scanner{Name: "Trivy", Vendor: "Aqua Security", Version: "0.48.1"}
trivyScanner = harbor.Scanner{
Name: "Trivy",
Vendor: "Aqua Security",
Version: "0.48.3",
}
)

const (
Expand Down

0 comments on commit 876e17f

Please sign in to comment.