summaryrefslogtreecommitdiff
path: root/pkg/machine/ignition.go
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 /pkg/machine/ignition.go
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>
Diffstat (limited to 'pkg/machine/ignition.go')
-rw-r--r--pkg/machine/ignition.go4
1 files changed, 2 insertions, 2 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)
}