mirror of
https://github.com/containers/podman.git
synced 2025-07-03 01:08:02 +08:00
pkg: use PROXY_VARS from c/common
Signed-off-by: Aditya Rajan <arajan@redhat.com>
This commit is contained in:
@ -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)
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user