summaryrefslogtreecommitdiff
path: root/pkg/specgen/specgen.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-08-28 11:24:37 -0400
committerGitHub <noreply@github.com>2020-08-28 11:24:37 -0400
commit522a32f827aacdb4ad44fcb06516d1d659dbacda (patch)
tree571ea02dca94299e59d1f1857cbc08e50cf47605 /pkg/specgen/specgen.go
parentbd43f81c0fd9395a7e0e2c7a9204c213763a72e8 (diff)
parent60fe96118fcbf5beef4f58abd3dbe9dcb6cc49d0 (diff)
downloadpodman-522a32f827aacdb4ad44fcb06516d1d659dbacda.tar.gz
podman-522a32f827aacdb4ad44fcb06516d1d659dbacda.tar.bz2
podman-522a32f827aacdb4ad44fcb06516d1d659dbacda.zip
Merge pull request #7355 from rhatdan/env
Use environment from containers.conf
Diffstat (limited to 'pkg/specgen/specgen.go')
-rw-r--r--pkg/specgen/specgen.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go
index a52225f87..cca05eddb 100644
--- a/pkg/specgen/specgen.go
+++ b/pkg/specgen/specgen.go
@@ -43,6 +43,13 @@ type ContainerBasicConfig struct {
// image's configuration.
// Optional.
Command []string `json:"command,omitempty"`
+ // EnvHost indicates that the host environment should be added to container
+ // Optional.
+ EnvHost bool `json:"env_host,omitempty"`
+ // EnvHTTPProxy indicates that the http host proxy environment variables
+ // should be added to container
+ // Optional.
+ HTTPProxy bool `json:"httpproxy,omitempty"`
// Env is a set of environment variables that will be set in the
// container.
// Optional.