From 9c13116963d868ebe3fd53184bac00eeb9bb2cc9 Mon Sep 17 00:00:00 2001 From: Daniel Pacak Date: Sat, 14 Mar 2020 22:41:43 +0100 Subject: [PATCH] chore(trivy): Allow configuring HTTP(S) proxy Resolves: #11032 Signed-off-by: Daniel Pacak --- make/harbor.yml.tmpl | 1 + make/photon/prepare/g.py | 5 +++-- make/photon/prepare/templates/trivy-adapter/env.jinja | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/make/harbor.yml.tmpl b/make/harbor.yml.tmpl index cf1fc583d..6f9495f05 100644 --- a/make/harbor.yml.tmpl +++ b/make/harbor.yml.tmpl @@ -184,3 +184,4 @@ proxy: - core - jobservice - clair + - trivy diff --git a/make/photon/prepare/g.py b/make/photon/prepare/g.py index 616233392..769f96a80 100644 --- a/make/photon/prepare/g.py +++ b/make/photon/prepare/g.py @@ -53,5 +53,6 @@ INTERNAL_NO_PROXY_DN = { 'chartmuseum', 'notary-server', 'notary-signer', - 'clair-adapter' - } \ No newline at end of file + 'clair-adapter', + 'trivy-adapter', + } diff --git a/make/photon/prepare/templates/trivy-adapter/env.jinja b/make/photon/prepare/templates/trivy-adapter/env.jinja index 2df6758aa..b07db6f04 100644 --- a/make/photon/prepare/templates/trivy-adapter/env.jinja +++ b/make/photon/prepare/templates/trivy-adapter/env.jinja @@ -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}}