diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-04-24 12:45:00 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-04-24 12:56:24 +0200 |
| commit | 145d74716c9cbc8d6c83be5a8f6a575543d10d06 (patch) | |
| tree | fd406fddf0b282b50f58f3a6ed0384cbfa4f07b3 | |
| parent | a1f73d095400f13999e61578567f338a9f13a008 (diff) | |
| download | podman-145d74716c9cbc8d6c83be5a8f6a575543d10d06.tar.gz podman-145d74716c9cbc8d6c83be5a8f6a575543d10d06.tar.bz2 podman-145d74716c9cbc8d6c83be5a8f6a575543d10d06.zip | |
podman: fix --http-proxy
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | cmd/podman/common/specgen.go | 16 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index e14fd78b4..9e8a271ae 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -288,7 +288,23 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string if c.EnvHost { env = envLib.Join(env, osEnv) + } else if c.HTTPProxy { + for _, envSpec := range []string{ + "http_proxy", + "HTTP_PROXY", + "https_proxy", + "HTTPS_PROXY", + "ftp_proxy", + "FTP_PROXY", + "no_proxy", + "NO_PROXY", + } { + if v, ok := osEnv[envSpec]; ok { + env[envSpec] = v + } + } } + // env-file overrides any previous variables for _, f := range c.EnvFile { fileEnv, err := envLib.ParseFile(f) diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 6386b8a70..7745bcf6a 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -877,7 +877,6 @@ USER mail` }) It("podman run --http-proxy test", func() { - Skip(v2fail) os.Setenv("http_proxy", "1.2.3.4") session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "http_proxy"}) session.WaitWithDefaultTimeout() |