diff options
| author | Aditya Rajan <arajan@redhat.com> | 2022-01-05 22:32:46 +0530 |
|---|---|---|
| committer | Aditya Rajan <arajan@redhat.com> | 2022-01-11 00:46:10 +0530 |
| commit | a95c01e0e4e5728eb99f5ef6e2245b8d91c7795f (patch) | |
| tree | 10537f384951dedf2863cf4b32bbc65b59cc771b /pkg/specgen/generate | |
| parent | a8b02cf4bff10c252e6c7864c6b2c72c11ce2a18 (diff) | |
| download | podman-a95c01e0e4e5728eb99f5ef6e2245b8d91c7795f.tar.gz podman-a95c01e0e4e5728eb99f5ef6e2245b8d91c7795f.tar.bz2 podman-a95c01e0e4e5728eb99f5ef6e2245b8d91c7795f.zip | |
pkg: use PROXY_VARS from c/common
Signed-off-by: Aditya Rajan <arajan@redhat.com>
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/container.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index 5ec7c7b03..2c7b3c091 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -7,6 +7,7 @@ import ( "time" "github.com/containers/common/libimage" + "github.com/containers/common/pkg/config" "github.com/containers/podman/v3/libpod" "github.com/containers/podman/v3/libpod/define" ann "github.com/containers/podman/v3/pkg/annotations" @@ -126,16 +127,7 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat if s.EnvHost { defaultEnvs = envLib.Join(defaultEnvs, osEnv) } else if s.HTTPProxy { - for _, envSpec := range []string{ - "http_proxy", - "HTTP_PROXY", - "https_proxy", - "HTTPS_PROXY", - "ftp_proxy", - "FTP_PROXY", - "no_proxy", - "NO_PROXY", - } { + for _, envSpec := range config.ProxyEnv { if v, ok := osEnv[envSpec]; ok { defaultEnvs[envSpec] = v } |