Merge pull request #3628 from crosbymichael/ctr-env

estesp · web-flow · commit 61b127f3e37b · 2019-09-06T16:55:21.000-04:00
Add --env-file to ctr
diff --git a/cmd/ctr/commands/commands.go b/cmd/ctr/commands/commands.go
@@ -77,6 +77,10 @@ var (
 			Name:  "env",
 			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{
 			Name:  "label",
 			Usage: "specify additional labels (i.e. foo=bar)",
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -64,6 +64,9 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
 			args = context.Args()[2:]
 		)
 		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, withMounts(context))
 
diff --git a/cmd/ctr/commands/run/run_windows.go b/cmd/ctr/commands/run/run_windows.go
@@ -67,6 +67,9 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
 			opts = append(opts, oci.WithWindowNetworksAllowUnqualifiedDNSQuery())
 			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, withMounts(context))
 
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -17,6 +17,7 @@
 package oci
 
 import (
+	"bufio"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -1200,3 +1201,24 @@ func WithLinuxDevice(path, permissions string) SpecOpts {
 		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)
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,9 @@ func NewContainer(ctx gocontext.Context, client containerd.Client, context cli`
`64`	`64`	`args = context.Args()[2:]`
`65`	`65`	`)`
`66`	`66`	`opts = append(opts, oci.WithDefaultSpec(), oci.WithDefaultUnixDevices)`
	`67`	`+ if ef := context.String("env-file"); ef != "" {`
	`68`	`+ opts = append(opts, oci.WithEnvFile(ef))`
	`69`	`+ }`
`67`	`70`	`opts = append(opts, oci.WithEnv(context.StringSlice("env")))`
`68`	`71`	`opts = append(opts, withMounts(context))`
`69`	`72`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,9 @@ func NewContainer(ctx gocontext.Context, client containerd.Client, context cli`
`67`	`67`	`opts = append(opts, oci.WithWindowNetworksAllowUnqualifiedDNSQuery())`
`68`	`68`	`opts = append(opts, oci.WithWindowsIgnoreFlushesDuringBoot())`
`69`	`69`	`}`
	`70`	`+ if ef := context.String("env-file"); ef != "" {`
	`71`	`+ opts = append(opts, oci.WithEnvFile(ef))`
	`72`	`+ }`
`70`	`73`	`opts = append(opts, oci.WithEnv(context.StringSlice("env")))`
`71`	`74`	`opts = append(opts, withMounts(context))`
`72`	`75`