diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-30 12:24:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 12:24:32 +0000 |
| commit | 6fd0e9bb73ea91911ae1219cfc324bbc2f9f49fd (patch) | |
| tree | 9a677de85fde959a19b8a87eb803f1f69baf5ef9 | |
| parent | 08d036cbd4225a9802fb8dc7c4da7b53ded3896a (diff) | |
| parent | ac23ff55b8d944ff459e153ab2fbea3f0defcdf1 (diff) | |
| download | podman-6fd0e9bb73ea91911ae1219cfc324bbc2f9f49fd.tar.gz podman-6fd0e9bb73ea91911ae1219cfc324bbc2f9f49fd.tar.bz2 podman-6fd0e9bb73ea91911ae1219cfc324bbc2f9f49fd.zip | |
Merge pull request #7831 from rhatdan/env
We already set container=podman environment variable
| -rw-r--r-- | pkg/specgen/generate/container.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index 147ebd61b..927e6b7fa 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -75,8 +75,8 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat if err != nil { return nil, errors.Wrap(err, "error parsing fields in containers.conf") } - if defaultEnvs["containers"] == "" { - defaultEnvs["containers"] = "podman" + if defaultEnvs["container"] == "" { + defaultEnvs["container"] = "podman" } var envs map[string]string |