diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-03-23 11:22:48 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-03-23 17:28:09 +0000 |
| commit | 3f5da4d0dd04f755f9a46f93d59f2db58285436b (patch) | |
| tree | a79aafb198dc2a6c2f93362fe8d724ce8cb5919b /cmd/podman | |
| parent | f7c8dd5836002f3bf85a7bbe6c949cdece5194df (diff) | |
| download | podman-3f5da4d0dd04f755f9a46f93d59f2db58285436b.tar.gz podman-3f5da4d0dd04f755f9a46f93d59f2db58285436b.tar.bz2 podman-3f5da4d0dd04f755f9a46f93d59f2db58285436b.zip | |
Make container env variable conditional
Add only when it's not already present.
Add a more specific version in podman spec generation
so we get 'container=podman' not 'container=libpod'
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #540
Approved by: baude
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/spec.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/podman/spec.go b/cmd/podman/spec.go index c4202fcef..014919e17 100644 --- a/cmd/podman/spec.go +++ b/cmd/podman/spec.go @@ -195,6 +195,7 @@ func createConfigToOCISpec(config *createConfig) (*spec.Spec, error) { for sysctlKey, sysctlVal := range config.Sysctl { g.AddLinuxSysctl(sysctlKey, sysctlVal) } + g.AddProcessEnv("container", "podman") // RESOURCES - MEMORY if config.Resources.Memory != 0 { |