github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-07-07 04:19:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip settings proxy config with WithProxy if its empty (#2242)

Browse Source 
close #2208
This commit is contained in:
6543 2023-08-18 13:09:28 +02:00 committed by GitHub
parent a5ef372190
commit 55e98a186a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pipeline/frontend/yaml/compiler/option.go
View File

@ -25,6 +25,10 @@ import (
// Option configures a compiler option. // Option configures a compiler option.
type Option func(*Compiler) type Option func(*Compiler)
func noopOption() Option {
return func(*Compiler) {}
}
// WithOption configures the compiler with the given option if // WithOption configures the compiler with the given option if
// boolean b evaluates to true. // boolean b evaluates to true.
func WithOption(option Option, b bool) Option { func WithOption(option Option, b bool) Option {
@ -226,6 +230,11 @@ type ProxyOptions struct {
// and NO_PROXY environment variables added by default to every // and NO_PROXY environment variables added by default to every
// container in the pipeline. // container in the pipeline.
func WithProxy(opt ProxyOptions) Option { func WithProxy(opt ProxyOptions) Option {
if opt.HTTPProxy == "" &&
opt.HTTPSProxy == "" &&
opt.NoProxy == "" {
return noopOption()
}
return WithEnviron( return WithEnviron(
map[string]string{ map[string]string{
"no_proxy": opt.NoProxy, "no_proxy": opt.NoProxy,