opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2064 from afbjorklund/exec-env

Browse Source 
Honor image environment variables with exec
This commit is contained in:
OpenShift Merge Robot
2019-01-07 13:35:52 -08:00
committed by GitHub
parent 90b5b935a3 83ac4f8277
commit 628b14ada7
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/podman/exec.go
View File

@ -3,7 +3,6 @@ package main
import ( import (
"fmt" "fmt"
"os" "os"
"strings"
"github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/cmd/podman/libpodruntime"
"github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod"
@ -99,15 +98,7 @@ func execCmd(c *cli.Context) error {
} }
// ENVIRONMENT VARIABLES // ENVIRONMENT VARIABLES
env := defaultEnvVariables env := map[string]string{}
for _, e := range c.StringSlice("env") {
split := strings.SplitN(e, "=", 2)
if len(split) > 1 {
env[split[0]] = split[1]
} else {
env[split[0]] = ""
}
}
if err := readKVStrings(env, []string{}, c.StringSlice("env")); err != nil { if err := readKVStrings(env, []string{}, c.StringSlice("env")); err != nil {
return errors.Wrapf(err, "unable to process environment variables") return errors.Wrapf(err, "unable to process environment variables")