Merge branch 'main' into feature/containers-repo-local-scan-with-images

cx-dmitri-rivin · web-flow · commit 9f0fc6ffb638 · 2025-08-07T11:10:25.000+03:00
diff --git a/cmd/main.go b/cmd/main.go
@@ -166,7 +166,7 @@ func bindKeysToEnvAndDefault() {
 }
 
 func bindProxy() {
-	err := viper.BindEnv(params.ProxyKey, params.CxProxyEnv, params.ProxyEnv)
+	err := viper.BindEnv(params.ProxyKey, params.CxProxyEnv, params.ProxyEnv, params.ProxyLowerCaseEnv)
 	if err != nil {
 		exitIfError(err)
 	}
diff --git a/internal/params/envs.go b/internal/params/envs.go
@@ -7,6 +7,7 @@ const (
 	BaseURIEnv                          = "CX_BASE_URI"
 	ClientTimeoutEnv                    = "CX_TIMEOUT"
 	ProxyEnv                            = "HTTP_PROXY"
+	ProxyLowerCaseEnv                   = "http_proxy"
 	CxProxyEnv                          = "CX_HTTP_PROXY"
 	ProxyTypeEnv                        = "CX_PROXY_AUTH_TYPE"
 	ProxyDomainEnv                      = "CX_PROXY_NTLM_DOMAIN"

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func bindKeysToEnvAndDefault() {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`func bindProxy() {`
`169`		`- err := viper.BindEnv(params.ProxyKey, params.CxProxyEnv, params.ProxyEnv)`
	`169`	`+ err := viper.BindEnv(params.ProxyKey, params.CxProxyEnv, params.ProxyEnv, params.ProxyLowerCaseEnv)`
`170`	`170`	`if err != nil {`
`171`	`171`	`exitIfError(err)`
`172`	`172`	`}`