diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-11 16:30:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-11 16:30:10 +0100 |
| commit | 4db1affda6267fc664941691fa4c724f953448ba (patch) | |
| tree | 08cbd839edb5899d113a4ced417b41adb6913074 /pkg/specgen | |
| parent | 76212917c4c65a38a483292fb15e532d8d84880f (diff) | |
| parent | a95c01e0e4e5728eb99f5ef6e2245b8d91c7795f (diff) | |
| download | podman-4db1affda6267fc664941691fa4c724f953448ba.tar.gz podman-4db1affda6267fc664941691fa4c724f953448ba.tar.bz2 podman-4db1affda6267fc664941691fa4c724f953448ba.zip | |
Merge pull request #12748 from flouthoc/ign_add_proxy_vars
ignition: set `HTTP` proxy variable and `SSL_CERT_FILE` from `host` -> `machine`.
Diffstat (limited to 'pkg/specgen')
| -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 } |