summaryrefslogtreecommitdiff
path: root/cmd/podman/shared
diff options
context:
space:
mode:
authorJames Cassell <code@james.cassell.me>2019-04-17 14:16:37 +0000
committerJames Cassell <code@james.cassell.me>2019-04-30 17:29:29 -0400
commit354d80626ac4790f261a29a6d53d6cd3fa837bb9 (patch)
tree37f8f7740e9e615a561422410ff91a0ce13bead0 /cmd/podman/shared
parent39c937ee450a4de7ab97c013d65157a3b39718b1 (diff)
downloadpodman-354d80626ac4790f261a29a6d53d6cd3fa837bb9.tar.gz
podman-354d80626ac4790f261a29a6d53d6cd3fa837bb9.tar.bz2
podman-354d80626ac4790f261a29a6d53d6cd3fa837bb9.zip
auto pass http_proxy into container
Signed-off-by: James Cassell <code@james.cassell.me>
Diffstat (limited to 'cmd/podman/shared')
-rw-r--r--cmd/podman/shared/create.go1
-rw-r--r--cmd/podman/shared/intermediate.go1
2 files changed, 2 insertions, 0 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index c521f9cb6..48476e177 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -624,6 +624,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
GroupAdd: c.StringSlice("group-add"),
Hostname: c.String("hostname"),
HostAdd: c.StringSlice("add-host"),
+ HTTPProxy: c.Bool("http-proxy"),
NoHosts: c.Bool("no-hosts"),
IDMappings: idmappings,
Image: imageName,
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go
index 9c494dec5..a38e4d47a 100644
--- a/cmd/podman/shared/intermediate.go
+++ b/cmd/podman/shared/intermediate.go
@@ -404,6 +404,7 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes
m["healthcheck-start-period"] = newCRString(c, "healthcheck-start-period")
m["healthcheck-timeout"] = newCRString(c, "healthcheck-timeout")
m["hostname"] = newCRString(c, "hostname")
+ m["http-proxy"] = newCRBool(c, "http-proxy")
m["image-volume"] = newCRString(c, "image-volume")
m["init"] = newCRBool(c, "init")
m["init-path"] = newCRString(c, "init-path")