pkg: use PROXY_VARS from c/common

Signed-off-by: Aditya Rajan <[email protected]>
baude · Jan 10, 2022 · a95c01e · a95c01e
1 parent a8b02cf
commit a95c01e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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
 			}