mirror of
https://github.com/goharbor/harbor.git
synced 2024-12-24 01:27:49 +01:00
Merge pull request #13001 from ninjadq/fix_upgrade_trivy
Fix trivy setting in upgrading script
This commit is contained in:
commit
1369089603
@ -254,6 +254,8 @@ external_database:
|
|||||||
# username: harbor_db_username
|
# username: harbor_db_username
|
||||||
# password: harbor_db_password
|
# password: harbor_db_password
|
||||||
# ssl_mode: disable
|
# ssl_mode: disable
|
||||||
|
# max_idle_conns: 2
|
||||||
|
# max_open_conns: 0
|
||||||
# clair:
|
# clair:
|
||||||
# host: clair_db_host
|
# host: clair_db_host
|
||||||
# port: clair_db_port
|
# port: clair_db_port
|
||||||
|
@ -193,6 +193,8 @@ external_database:
|
|||||||
# username: harbor_db_username
|
# username: harbor_db_username
|
||||||
# password: harbor_db_password
|
# password: harbor_db_password
|
||||||
# ssl_mode: disable
|
# ssl_mode: disable
|
||||||
|
# max_idle_conns: 2
|
||||||
|
# max_open_conns: 0
|
||||||
# clair:
|
# clair:
|
||||||
# host: clair_db_host
|
# host: clair_db_host
|
||||||
# port: clair_db_port
|
# port: clair_db_port
|
||||||
|
@ -134,21 +134,32 @@ clair:
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
# Trivy configuration
|
# Trivy configuration
|
||||||
trivy:
|
|
||||||
# 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.
|
||||||
# It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached
|
# It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached
|
||||||
# in the local file system (/home/scanner/.cache/trivy/db/trivy.db). In addition, the database contains the update
|
# in the local file system. In addition, the database contains the update timestamp so Trivy can detect whether it
|
||||||
# timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one.
|
# should download a newer version from the Internet or use the cached one. Currently, the database is updated every
|
||||||
# Currently, the database is updated every 12 hours and published as a new release to GitHub.
|
# 12 hours and published as a new release to GitHub.
|
||||||
|
trivy:
|
||||||
|
# ignoreUnfixed The flag to display only fixed vulnerabilities
|
||||||
|
ignore_unfixed: false
|
||||||
|
# skipUpdate The flag to enable or disable Trivy DB downloads from GitHub
|
||||||
|
#
|
||||||
|
# You might want to enable this flag in test or CI/CD environments to avoid GitHub rate limiting issues.
|
||||||
|
# If the flag is enabled you have to download the `trivy-offline.tar.gz` archive manually, extract `trivy.db` and
|
||||||
|
# `metadata.json` files and mount them in the `/home/scanner/.cache/trivy/db` path.
|
||||||
|
skip_update: false
|
||||||
|
#
|
||||||
|
# insecure The flag to skip verifying registry certificate
|
||||||
|
insecure: false
|
||||||
|
# github_token The GitHub access token to download Trivy DB
|
||||||
#
|
#
|
||||||
# Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough
|
# Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough
|
||||||
# for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000
|
# for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000
|
||||||
# requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult
|
# requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult
|
||||||
# https://developer.github.com/v3/#rate-limiting
|
# https://developer.github.com/v3/#rate-limiting
|
||||||
#
|
#
|
||||||
# You can create a GitHub token by following the instuctions in
|
# You can create a GitHub token by following the instructions in
|
||||||
# https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line
|
# https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line
|
||||||
#
|
#
|
||||||
# github_token: xxx
|
# github_token: xxx
|
||||||
@ -281,6 +292,8 @@ external_database:
|
|||||||
# username: harbor_db_username
|
# username: harbor_db_username
|
||||||
# password: harbor_db_password
|
# password: harbor_db_password
|
||||||
# ssl_mode: disable
|
# ssl_mode: disable
|
||||||
|
# max_idle_conns: 2
|
||||||
|
# max_open_conns: 0
|
||||||
# clair:
|
# clair:
|
||||||
# host: clair_db_host
|
# host: clair_db_host
|
||||||
# port: clair_db_port
|
# port: clair_db_port
|
||||||
|
@ -134,24 +134,77 @@ clair:
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
# Trivy configuration
|
# Trivy configuration
|
||||||
trivy:
|
|
||||||
# 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.
|
||||||
# It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached
|
# It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached
|
||||||
# in the local file system (/home/scanner/.cache/trivy/db/trivy.db). In addition, the database contains the update
|
# in the local file system. In addition, the database contains the update timestamp so Trivy can detect whether it
|
||||||
# timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one.
|
# should download a newer version from the Internet or use the cached one. Currently, the database is updated every
|
||||||
# Currently, the database is updated every 12 hours and published as a new release to GitHub.
|
# 12 hours and published as a new release to GitHub.
|
||||||
|
{% if trivy is defined %}
|
||||||
|
trivy:
|
||||||
|
# ignoreUnfixed The flag to display only fixed vulnerabilities
|
||||||
|
{% if trivy.ignore_unfixed is defined %}
|
||||||
|
ignore_unfixed: {{ trivy.ignore_unfixed }}
|
||||||
|
{% else %}
|
||||||
|
ignore_unfixed: false
|
||||||
|
{% endif %}
|
||||||
|
# skipUpdate The flag to enable or disable Trivy DB downloads from GitHub
|
||||||
|
#
|
||||||
|
# You might want to enable this flag in test or CI/CD environments to avoid GitHub rate limiting issues.
|
||||||
|
# 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.
|
||||||
|
{% if trivy.skip_update is defined %}
|
||||||
|
skip_update: {{ trivy.skip_update }}
|
||||||
|
{% else %}
|
||||||
|
skip_update: false
|
||||||
|
{% endif %}
|
||||||
|
#
|
||||||
|
# insecure The flag to skip verifying registry certificate
|
||||||
|
{% if trivy.insecure is defined %}
|
||||||
|
insecure: {{ trivy.insecure }}
|
||||||
|
{% else %}
|
||||||
|
insecure: false
|
||||||
|
{% endif %}
|
||||||
|
# github_token The GitHub access token to download Trivy DB
|
||||||
#
|
#
|
||||||
# Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough
|
# Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough
|
||||||
# for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000
|
# for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000
|
||||||
# requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult
|
# requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult
|
||||||
# https://developer.github.com/v3/#rate-limiting
|
# https://developer.github.com/v3/#rate-limiting
|
||||||
#
|
#
|
||||||
# You can create a GitHub token by following the instuctions in
|
# You can create a GitHub token by following the instructions in
|
||||||
# https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line
|
# https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line
|
||||||
#
|
#
|
||||||
|
{% if trivy.github_token is defined %}
|
||||||
|
github_token: {{ trivy.github_token }}
|
||||||
|
{% else %}
|
||||||
# github_token: xxx
|
# github_token: xxx
|
||||||
|
{% endif %}
|
||||||
|
{% else %}
|
||||||
|
# trivy:
|
||||||
|
# # ignoreUnfixed The flag to display only fixed vulnerabilities
|
||||||
|
# ignore_unfixed: false
|
||||||
|
# # skipUpdate The flag to enable or disable Trivy DB downloads from GitHub
|
||||||
|
# #
|
||||||
|
# # You might want to enable this flag in test or CI/CD environments to avoid GitHub rate limiting issues.
|
||||||
|
# # If the flag is enabled you have to download the `trivy-offline.tar.gz` archive manually, extract `trivy.db` and
|
||||||
|
# # `metadata.json` files and mount them in the `/home/scanner/.cache/trivy/db` path.
|
||||||
|
# skip_update: false
|
||||||
|
# #
|
||||||
|
# # insecure The flag to skip verifying registry certificate
|
||||||
|
# insecure: false
|
||||||
|
# # github_token The GitHub access token to download Trivy DB
|
||||||
|
# #
|
||||||
|
# # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough
|
||||||
|
# # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000
|
||||||
|
# # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult
|
||||||
|
# # https://developer.github.com/v3/#rate-limiting
|
||||||
|
# #
|
||||||
|
# # You can create a GitHub token by following the instructions in
|
||||||
|
# # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line
|
||||||
|
# #
|
||||||
|
# # github_token: xxx
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
jobservice:
|
jobservice:
|
||||||
# Maximum number of job workers in job service
|
# Maximum number of job workers in job service
|
||||||
@ -281,6 +334,8 @@ external_database:
|
|||||||
# username: harbor_db_username
|
# username: harbor_db_username
|
||||||
# password: harbor_db_password
|
# password: harbor_db_password
|
||||||
# ssl_mode: disable
|
# ssl_mode: disable
|
||||||
|
# max_idle_conns: 2
|
||||||
|
# max_open_conns: 0
|
||||||
# clair:
|
# clair:
|
||||||
# host: clair_db_host
|
# host: clair_db_host
|
||||||
# port: clair_db_port
|
# port: clair_db_port
|
||||||
|
Loading…
Reference in New Issue
Block a user