Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-25 01:58:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11078 from danielpacak/feature/issue_11032/trivy_http_proxy

Browse Source 
chore(trivy): Allow configuring HTTP(S) proxy
This commit is contained in:
stonezdj(Daojun Zhang) 2020-03-17 15:24:13 +08:00 committed by GitHub
commit ced78d0afc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/harbor.yml.tmpl
View File

@ -184,3 +184,4 @@ proxy:
- core
- jobservice
- clair
- trivy

5
make/photon/prepare/g.py
View File

@ -53,5 +53,6 @@ INTERNAL_NO_PROXY_DN = {
'chartmuseum',
'notary-server',
'notary-signer',
'clair-adapter'
}
'clair-adapter',
'trivy-adapter',
}

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

@ -9,3 +9,6 @@ SCANNER_TRIVY_VULN_TYPE=os,library
SCANNER_TRIVY_SEVERITY=UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
SCANNER_TRIVY_IGNORE_UNFIXED=false
SCANNER_TRIVY_GITHUB_TOKEN={{trivy_github_token}}
HTTP_PROXY={{trivy_http_proxy}}
HTTPS_PROXY={{trivy_https_proxy}}
NO_PROXY={{trivy_no_proxy}}