Merge branch 'main' into go-redis

aquasecurity · Oct 30, 2023 · acfc507 · acfc507
2 parents f5e338e + 561a070
commit acfc507
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,14 +9,14 @@ jobs:
     name: Release
     runs-on: ubuntu-20.04
     steps:
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.20.5
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
       - name: Setup make
         run: make setup
       - name: Run linter

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.46.0
+ARG TRIVY_VERSION=0.46.1
 
 FROM aquasec/trivy:${TRIVY_VERSION}
 

diff --git a/README.md b/README.md
@@ -37,6 +37,7 @@ The following matrix indicates the version of Trivy and Trivy adapter installed
 
 | Harbor           | Trivy Adapter | Trivy           |
 |------------------|---------------|-----------------|
+| -                | v0.30.18      | [trivy v0.46.1] |
 | -                | v0.30.17      | [trivy v0.46.0] |
 | -                | v0.30.16      | [trivy v0.45.0] |
 | -                | v0.30.15      | [trivy v0.44.0] |
@@ -83,6 +84,7 @@ The following matrix indicates the version of Trivy and Trivy adapter installed
 [harbor v2.1.6]: https://github.com/goharbor/harbor/releases/tag/v2.1.6
 [harbor v2.1.0]: https://github.com/goharbor/harbor/releases/tag/v2.1.0
 
+[trivy v0.46.1]: https://github.com/aquasecurity/trivy/releases/tag/v0.46.1
 [trivy v0.46.0]: https://github.com/aquasecurity/trivy/releases/tag/v0.46.0
 [trivy v0.45.0]: https://github.com/aquasecurity/trivy/releases/tag/v0.45.0
 [trivy v0.44.0]: https://github.com/aquasecurity/trivy/releases/tag/v0.44.0

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.30.17
-appVersion: 0.30.17
+version: 0.30.18
+appVersion: 0.30.18
 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: aquasec/harbor-scanner-trivy
-  tag: 0.30.17
+  tag: 0.30.18
   pullPolicy: IfNotPresent
 
 replicaCount: 1

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