Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-30 19:41:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11636 from danielpacak/bump_up_trivy_adapter_to_0.9.0

Browse Source 
chore(trivy): Bump up trivy adapter to 0.9.0
This commit is contained in:
Maosheng Ren 2020-04-16 16:16:50 +08:00 committed by GitHub
commit 89e9ea0145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -103,8 +103,8 @@ NOTARYVERSION=v0.6.1
CLAIRVERSION=v2.1.1 CLAIRVERSION=v2.1.1
NOTARYMIGRATEVERSION=v3.5.4 NOTARYMIGRATEVERSION=v3.5.4
CLAIRADAPTERVERSION=v1.0.2 CLAIRADAPTERVERSION=v1.0.2
TRIVYVERSION=v0.5.4 TRIVYVERSION=v0.6.0
TRIVYADAPTERVERSION=v0.8.0 TRIVYADAPTERVERSION=v0.9.0
# version of chartmuseum # version of chartmuseum
CHARTMUSEUMVERSION=v0.9.0 CHARTMUSEUMVERSION=v0.9.0

3
make/harbor.yml.tmpl
View File

@ -78,6 +78,9 @@ trivy:
# If the flag is enabled you have to manually download the `trivy.db` file and mount it in the # If the flag is enabled you have to manually download the `trivy.db` file and mount it in the
# /home/scanner/.cache/trivy/db/trivy.db path. # /home/scanner/.cache/trivy/db/trivy.db path.
skip_update: false skip_update: false
#
# insecure The flag to skip verifying registry certificate
insecure: false
# github_token The GitHub access token to download Trivy DB # github_token The GitHub access token to download Trivy DB
# #
# Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases.

1
make/photon/prepare/templates/trivy-adapter/env.jinja
View File

@ -10,6 +10,7 @@ SCANNER_TRIVY_SEVERITY=UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
SCANNER_TRIVY_IGNORE_UNFIXED={{trivy_ignore_unfixed}} SCANNER_TRIVY_IGNORE_UNFIXED={{trivy_ignore_unfixed}}
SCANNER_TRIVY_SKIP_UPDATE={{trivy_skip_update}} SCANNER_TRIVY_SKIP_UPDATE={{trivy_skip_update}}
SCANNER_TRIVY_GITHUB_TOKEN={{trivy_github_token}} SCANNER_TRIVY_GITHUB_TOKEN={{trivy_github_token}}
SCANNER_TRIVY_INSECURE={{trivy_insecure}}
HTTP_PROXY={{trivy_http_proxy}} HTTP_PROXY={{trivy_http_proxy}}
HTTPS_PROXY={{trivy_https_proxy}} HTTPS_PROXY={{trivy_https_proxy}}
NO_PROXY={{trivy_no_proxy}} NO_PROXY={{trivy_no_proxy}}

1
make/photon/prepare/utils/configs.py
View File

@ -245,6 +245,7 @@ def parse_yaml_config(config_file_path, with_notary, with_clair, with_trivy, wit
config_dict['trivy_github_token'] = trivy_configs.get("github_token") or '' config_dict['trivy_github_token'] = trivy_configs.get("github_token") or ''
config_dict['trivy_skip_update'] = trivy_configs.get("skip_update") or False config_dict['trivy_skip_update'] = trivy_configs.get("skip_update") or False
config_dict['trivy_ignore_unfixed'] = trivy_configs.get("ignore_unfixed") or False config_dict['trivy_ignore_unfixed'] = trivy_configs.get("ignore_unfixed") or False
config_dict['trivy_insecure'] = trivy_configs.get("insecure") or False
# Chart configs # Chart configs
chart_configs = configs.get("chart") or {} chart_configs = configs.get("chart") or {}