Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Cherrypick to main]:Bump up trivy to 0.57.1 and prepare for 0.32.1 release #9

Merged
merged 1 commit into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.56.1
ARG TRIVY_VERSION=0.57.1

FROM aquasec/trivy:${TRIVY_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
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.56.1
ARG TRIVY_VERSION=0.57.1
ARG SKAFFOLD_GO_GCFLAGS

FROM golang:1.22 AS builder
Expand Down
83 changes: 42 additions & 41 deletions README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions helm/harbor-scanner-trivy/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
88 changes: 44 additions & 44 deletions helm/harbor-scanner-trivy/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion helm/harbor-scanner-trivy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/etc/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
4 changes: 2 additions & 2 deletions pkg/trivy/wrapper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/component/component_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var (
trivyScanner = harbor.Scanner{
Name: "Trivy",
Vendor: "Aqua Security",
Version: "0.56.1",
Version: "0.57.1",
}
)

Expand Down
Loading