diff --git a/Dockerfile b/Dockerfile index 0b484ec..3ddb3dd 100644 --- 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 index f9c68d3..712c5ad 100644 --- 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 index 9c83869..4118ea7 100644 --- 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.1 | v0.32.1 | [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] | | - | v0.31.3 | [trivy v0.52.2] | diff --git a/helm/harbor-scanner-trivy/Chart.yaml b/helm/harbor-scanner-trivy/Chart.yaml index fa6d066..fbbe4cb 100644 --- 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/values.yaml b/helm/harbor-scanner-trivy/values.yaml index 7961e64..2810475 100644 --- 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 index 3a51cdc..45f7cc4 100644 --- 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/test/component/component_test.go b/test/component/component_test.go index f3c0896..dc83161 100644 --- 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", } )