Merge pull request #18 from reasonerjt/bump-up-trivy-0.58.2-0.32

Bump up Trivy to v0.58.2 and prepare release v0.32.3
goharbor · Jan 14, 2025 · 4611ec9 · 4611ec9
2 parents 49b572f + 931d248
commit 4611ec9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 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.57.1
+ARG TRIVY_VERSION=0.58.2
 
 FROM aquasec/trivy:${TRIVY_VERSION}
 

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,8 +1,8 @@
 # That's the only place where you're supposed to specify version of Trivy.
-ARG TRIVY_VERSION=0.57.1
+ARG TRIVY_VERSION=0.58.2
 ARG SKAFFOLD_GO_GCFLAGS
 
-FROM golang:1.22 AS builder
+FROM golang:1.23 AS builder
 
 WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy
 

diff --git a/README.md b/README.md
@@ -32,6 +32,7 @@ The following matrix indicates the version of Trivy and Trivy adapter installed
 
 | Harbor                  | Trivy Adapter | Trivy           |
 |-------------------------|---------------|-----------------|
+| harbor v2.12.2          | v0.32.3       | [trivy v0.58.2] |
 | harbor v2.12.1          | v0.32.2       | [trivy v0.57.1] |
 | harbor v2.12.0          | v0.32.0       | [trivy v0.56.1] |
 | harbor v2.11.1          | v0.31.4       | [trivy v0.54.1] |

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.2
-appVersion: 0.32.2
+version: 0.32.3
+appVersion: 0.32.3
 description: Harbor scanner adapter for Trivy
 keywords:
   - scanner

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.2
+  tag: v0.32.3
   pullPolicy: IfNotPresent
 
 replicaCount: 1

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.57.1",
+		Version: "0.58.2",
 	}
 )