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

Add --env-file to ctr

Browse Source 
Closes #3517

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2019-09-06 16:25:02 -04:00
parent 2ddfc6d2ed
commit fa11147e5f
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ctr/commands/commands.go
View File

@ -77,6 +77,10 @@ var (
Name: "env", Name: "env",
Usage: "specify additional container environment variables (i.e. FOO=bar)", Usage: "specify additional container environment variables (i.e. FOO=bar)",
}, },
cli.StringFlag{
Name: "env-file",
Usage: "specify additional container environment variables in a file(i.e. FOO=bar, one per line)",
},
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "label", Name: "label",
Usage: "specify additional labels (i.e. foo=bar)", Usage: "specify additional labels (i.e. foo=bar)",

3
cmd/ctr/commands/run/run_unix.go
View File

@ -64,6 +64,9 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
args = context.Args()[2:] args = context.Args()[2:]
) )
opts = append(opts, oci.WithDefaultSpec(), oci.WithDefaultUnixDevices) opts = append(opts, oci.WithDefaultSpec(), oci.WithDefaultUnixDevices)
if ef := context.String("env-file"); ef != "" {
opts = append(opts, oci.WithEnvFile(ef))
}
opts = append(opts, oci.WithEnv(context.StringSlice("env"))) opts = append(opts, oci.WithEnv(context.StringSlice("env")))
opts = append(opts, withMounts(context)) opts = append(opts, withMounts(context))

3
cmd/ctr/commands/run/run_windows.go
View File

@ -67,6 +67,9 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
opts = append(opts, oci.WithWindowNetworksAllowUnqualifiedDNSQuery()) opts = append(opts, oci.WithWindowNetworksAllowUnqualifiedDNSQuery())
opts = append(opts, oci.WithWindowsIgnoreFlushesDuringBoot()) opts = append(opts, oci.WithWindowsIgnoreFlushesDuringBoot())
} }
if ef := context.String("env-file"); ef != "" {
opts = append(opts, oci.WithEnvFile(ef))
}
opts = append(opts, oci.WithEnv(context.StringSlice("env"))) opts = append(opts, oci.WithEnv(context.StringSlice("env")))
opts = append(opts, withMounts(context)) opts = append(opts, withMounts(context))

22
oci/spec_opts.go
View File

@ -17,6 +17,7 @@
package oci package oci
import ( import (
"bufio"
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
@ -1200,3 +1201,24 @@ func WithLinuxDevice(path, permissions string) SpecOpts {
return nil return nil
} }
} }
// WithEnvFile adds environment variables from a file to the container's spec
func WithEnvFile(path string) SpecOpts {
return func(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
var vars []string
f, err := os.Open(path)
if err != nil {
return err
}
defer f.Close()
sc := bufio.NewScanner(f)
for sc.Scan() {
if sc.Err() != nil {
return sc.Err()
}
vars = append(vars, sc.Text())
}
return WithEnv(vars)(nil, nil, nil, s)
}
}