diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-16 16:27:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 16:27:34 +0100 |
| commit | f031bd23c6f5f790dde383d542c940bfe2dfaadd (patch) | |
| tree | 34d460f57b3ecf7491ec92a296ebd68e233e8bf6 /libpod | |
| parent | 8430ffc72e74f1271174984674a1c2ee6118779e (diff) | |
| parent | 44d1618dd7eeb2560571b14ba5cece69a93dcaff (diff) | |
| download | podman-f031bd23c6f5f790dde383d542c940bfe2dfaadd.tar.gz podman-f031bd23c6f5f790dde383d542c940bfe2dfaadd.tar.bz2 podman-f031bd23c6f5f790dde383d542c940bfe2dfaadd.zip | |
Merge pull request #12100 from rhatdan/env
Add option --unsetenv to remove default environment variables
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_inspect.go | 3 | ||||
| -rw-r--r-- | libpod/container_internal_linux.go | 12 |
2 files changed, 1 insertions, 14 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 277c3b960..0dae810de 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -300,8 +300,7 @@ func (c *Container) generateInspectContainerConfig(spec *spec.Spec) *define.Insp ctrConfig.User = c.config.User if spec.Process != nil { ctrConfig.Tty = spec.Process.Terminal - ctrConfig.Env = []string{} - ctrConfig.Env = append(ctrConfig.Env, spec.Process.Env...) + ctrConfig.Env = append([]string{}, spec.Process.Env...) ctrConfig.WorkingDir = spec.Process.Cwd } diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 1a4508448..85b1e9139 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -709,18 +709,6 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { g.AddAnnotation(annotations.ContainerManager, annotations.ContainerManagerLibpod) } - // Only add container environment variable if not already present - foundContainerEnv := false - for _, env := range g.Config.Process.Env { - if strings.HasPrefix(env, "container=") { - foundContainerEnv = true - break - } - } - if !foundContainerEnv { - g.AddProcessEnv("container", "libpod") - } - cgroupPath, err := c.getOCICgroupPath() if err != nil { return nil, err |