containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7831 from rhatdan/env 

We already set container=podman environment variable
This commit is contained in:
OpenShift Merge Robot 2020-09-30 12:24:32 +00:00 committed by GitHub
parent 08d036cbd4 ac23ff55b8
commit 6fd0e9bb73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/specgen/generate/container.go
View File

@ -75,8 +75,8 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error parsing fields in containers.conf") return nil, errors.Wrap(err, "error parsing fields in containers.conf")
} }
if defaultEnvs["containers"] == "" { if defaultEnvs["container"] == "" {
defaultEnvs["containers"] = "podman" defaultEnvs["container"] = "podman"
} }
var envs map[string]string var envs map[string]string