diff options
author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-05-06 13:20:44 +0200 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-07 14:16:50 -0400 |
commit | 99bdafba999078bb5763c65cf7dfe7df520030f7 (patch) | |
tree | 916c768fca45b5e809f9e941b5425e760dcfe08c /pkg/specgen/specgen.go | |
parent | 1d3cdf9a4642df073becb54d178d6b1959526a47 (diff) | |
download | podman-99bdafba999078bb5763c65cf7dfe7df520030f7.tar.gz podman-99bdafba999078bb5763c65cf7dfe7df520030f7.tar.bz2 podman-99bdafba999078bb5763c65cf7dfe7df520030f7.zip |
podman: split env variables in env and overrides
There are three different priorities for applying env variables:
1) environment/config file environment variables
2) image's config
3) user overrides (--env)
The third kind are known to the client, while the default config and image's
config is handled by the backend.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen/specgen.go')
-rw-r--r-- | pkg/specgen/specgen.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index 4ad6dd6fb..bb01a5d14 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -47,6 +47,7 @@ type ContainerBasicConfig struct { // Optional. Env map[string]string `json:"env,omitempty"` // Terminal is whether the container will create a PTY. + // Optional. Terminal bool `json:"terminal,omitempty"` // Stdin is whether the container will keep its STDIN open. Stdin bool `json:"stdin,omitempty"` |