github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ctr: enable specifying additional environment variables

Browse Source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett
2017-05-24 12:39:34 -04:00
parent ab137bfef8
commit 02fa534d71
4 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/ctr/run_unix.go
View File

@@ -52,10 +52,10 @@ var capabilities = []string{
}
func spec(id string, config *ocispec.ImageConfig, context *cli.Context, rootfs string) (*specs.Spec, error) {
env := []string{
defaultEnv := []string{
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
}
env = append(env, config.Env...)
defaultEnv = append(defaultEnv, config.Env...)
cmd := config.Cmd
if v := context.Args().Tail(); len(v) > 0 {
cmd = v
@@ -90,8 +90,12 @@ func spec(id string, config *ocispec.ImageConfig, context *cli.Context, rootfs s
}
}
if tty {
env = append(env, "TERM=xterm")
defaultEnv = append(defaultEnv, "TERM=xterm")
}
// additional environment vars
env := replaceOrAppendEnvValues(defaultEnv, context.StringSlice("env"))
cwd := config.WorkingDir
if cwd == "" {
cwd = "/"