Merge pull request #9 from reasonerjt/bump-up-trivy

[Cherrypick to main]:Bump up trivy to 0.57.1 and prepare for 0.32.1 release
goharbor · Dec 10, 2024 · fa6cfbe · fa6cfbe
2 parents c5db009 + 1b2a078
commit fa6cfbe
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 95 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # That's the only place where you're supposed to specify version of Trivy.
-ARG TRIVY_VERSION=0.56.1
+ARG TRIVY_VERSION=0.57.1
 
 FROM aquasec/trivy:${TRIVY_VERSION}
 

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,5 +1,5 @@
 # That's the only place where you're supposed to specify version of Trivy.
-ARG TRIVY_VERSION=0.56.1
+ARG TRIVY_VERSION=0.57.1
 ARG SKAFFOLD_GO_GCFLAGS
 
 FROM golang:1.22 AS builder

diff --git a/README.md b/README.md
diff --git a/helm/harbor-scanner-trivy/Chart.yaml b/helm/harbor-scanner-trivy/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: harbor-scanner-trivy
-version: 0.32.0
-appVersion: 0.32.0
+version: 0.32.1
+appVersion: 0.32.1
 description: Harbor scanner adapter for Trivy
 keywords:
   - scanner

diff --git a/helm/harbor-scanner-trivy/README.md b/helm/harbor-scanner-trivy/README.md
diff --git a/helm/harbor-scanner-trivy/values.yaml b/helm/harbor-scanner-trivy/values.yaml
@@ -4,7 +4,7 @@ fullnameOverride: ""
 image:
   registry: docker.io
   repository: goharbor/harbor-scanner-trivy
-  tag: 0.32.0
+  tag: 0.32.1
   pullPolicy: IfNotPresent
 
 replicaCount: 1

diff --git a/pkg/etc/config.go b/pkg/etc/config.go
@@ -34,8 +34,8 @@ type Trivy struct {
 	IgnorePolicy     string        `env:"SCANNER_TRIVY_IGNORE_POLICY"`
 	SkipDBUpdate     bool          `env:"SCANNER_TRIVY_SKIP_UPDATE" envDefault:"false"`
 	SkipJavaDBUpdate bool          `env:"SCANNER_TRIVY_SKIP_JAVA_DB_UPDATE" envDefault:"false"`
-	DBRepository     string        `env:"SCANNER_TRIVY_DB_REPOSITORY" envDefault:"ghcr.io/aquasecurity/trivy-db"`
-	JavaDBRepository string        `env:"SCANNER_TRIVY_JAVA_DB_REPOSITORY" envDefault:"ghcr.io/aquasecurity/trivy-java-db"`
+	DBRepository     string        `env:"SCANNER_TRIVY_DB_REPOSITORY"`
+	JavaDBRepository string        `env:"SCANNER_TRIVY_JAVA_DB_REPOSITORY"`
 	OfflineScan      bool          `env:"SCANNER_TRIVY_OFFLINE_SCAN" envDefault:"false"`
 	GitHubToken      string        `env:"SCANNER_TRIVY_GITHUB_TOKEN"`
 	Insecure         bool          `env:"SCANNER_TRIVY_INSECURE" envDefault:"false"`

diff --git a/pkg/trivy/wrapper_test.go b/pkg/trivy/wrapper_test.go
@@ -155,12 +155,12 @@ func TestWrapper_Scan(t *testing.T) {
 				"--ignore-unfixed",
 				"--skip-db-update",
 				"--skip-java-db-update",
+				"--ignore-policy",
+				"/home/scanner/opa/policy.rego",
 				"--db-repository",
 				"ghcr.io/aquasecurity/trivy-db",
 				"--java-db-repository",
 				"ghcr.io/aquasecurity/trivy-java-db",
-				"--ignore-policy",
-				"/home/scanner/opa/policy.rego",
 				"--debug",
 				"--insecure",
 				"alpine:3.10.2",

diff --git a/test/component/component_test.go b/test/component/component_test.go
@@ -26,7 +26,7 @@ var (
 	trivyScanner = harbor.Scanner{
 		Name:    "Trivy",
 		Vendor:  "Aqua Security",
-		Version: "0.56.1",
+		Version: "0.57.1",
 	}
 )