summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAditya Rajan <arajan@redhat.com>2022-01-05 22:32:46 +0530
committerAditya Rajan <arajan@redhat.com>2022-01-11 00:46:10 +0530
commita95c01e0e4e5728eb99f5ef6e2245b8d91c7795f (patch)
tree10537f384951dedf2863cf4b32bbc65b59cc771b
parenta8b02cf4bff10c252e6c7864c6b2c72c11ce2a18 (diff)
downloadpodman-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>
-rw-r--r--pkg/machine/ignition.go4
-rw-r--r--pkg/specgen/generate/container.go12
2 files changed, 4 insertions, 12 deletions
diff --git a/pkg/machine/ignition.go b/pkg/machine/ignition.go
index de2026a1a..ac2cf71cf 100644
--- a/pkg/machine/ignition.go
+++ b/pkg/machine/ignition.go
@@ -10,6 +10,7 @@ import (
"os"
"path/filepath"
+ "github.com/containers/common/pkg/config"
"github.com/sirupsen/logrus"
)
@@ -479,8 +480,7 @@ func getCerts(certsDir string, isDir bool) []File {
func getProxyVariables() string {
proxyOpts := ""
- proxyVariables := []string{"HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY", "http_proxy", "https_proxy", "no_proxy"}
- for _, variable := range proxyVariables {
+ for _, variable := range config.ProxyEnv {
if value, ok := os.LookupEnv(variable); ok {
proxyOpts += fmt.Sprintf("\n export %s=%s", variable, value)
}
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
}