@@ -10432,6 +10432,10 @@ _oc_new-app()

     flags+=("--env=")

     two_word_flags+=("-e")

     local_nonpersistent_flags+=("--env=")

+    flags+=("--env-file=")

+    flags_with_completion+=("--env-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--env-file=")

     flags+=("--file=")

     flags_with_completion+=("--file")

     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")

@@ -10466,6 +10470,10 @@ _oc_new-app()

     flags+=("--param=")

     two_word_flags+=("-p")

     local_nonpersistent_flags+=("--param=")

+    flags+=("--param-file=")

+    flags_with_completion+=("--param-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--param-file=")

     flags+=("--search")

     flags+=("-S")

     local_nonpersistent_flags+=("--search")

@@ -10538,6 +10546,10 @@ _oc_new-build()

     flags+=("--env=")

     two_word_flags+=("-e")

     local_nonpersistent_flags+=("--env=")

+    flags+=("--env-file=")

+    flags_with_completion+=("--env-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--env-file=")

     flags+=("--image-stream=")

     two_word_flags+=("-i")

     local_nonpersistent_flags+=("--image-stream=")

@@ -11510,6 +11522,10 @@ _oc_process()

     flags+=("--param=")

     two_word_flags+=("-p")

     local_nonpersistent_flags+=("--param=")

+    flags+=("--param-file=")

+    flags_with_completion+=("--param-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--param-file=")

     flags+=("--parameters")

     local_nonpersistent_flags+=("--parameters")

     flags+=("--raw")

@@ -15080,6 +15080,10 @@ _openshift_cli_new-app()

     flags+=("--env=")

     two_word_flags+=("-e")

     local_nonpersistent_flags+=("--env=")

+    flags+=("--env-file=")

+    flags_with_completion+=("--env-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--env-file=")

     flags+=("--file=")

     flags_with_completion+=("--file")

     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")

@@ -15114,6 +15118,10 @@ _openshift_cli_new-app()

     flags+=("--param=")

     two_word_flags+=("-p")

     local_nonpersistent_flags+=("--param=")

+    flags+=("--param-file=")

+    flags_with_completion+=("--param-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--param-file=")

     flags+=("--search")

     flags+=("-S")

     local_nonpersistent_flags+=("--search")

@@ -15187,6 +15195,10 @@ _openshift_cli_new-build()

     flags+=("--env=")

     two_word_flags+=("-e")

     local_nonpersistent_flags+=("--env=")

+    flags+=("--env-file=")

+    flags_with_completion+=("--env-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--env-file=")

     flags+=("--image-stream=")

     two_word_flags+=("-i")

     local_nonpersistent_flags+=("--image-stream=")

@@ -16174,6 +16186,10 @@ _openshift_cli_process()

     flags+=("--param=")

     two_word_flags+=("-p")

     local_nonpersistent_flags+=("--param=")

+    flags+=("--param-file=")

+    flags_with_completion+=("--param-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--param-file=")

     flags+=("--parameters")

     local_nonpersistent_flags+=("--parameters")

     flags+=("--raw")

@@ -10593,6 +10593,10 @@ _oc_new-app()

     flags+=("--env=")

     two_word_flags+=("-e")

     local_nonpersistent_flags+=("--env=")

+    flags+=("--env-file=")

+    flags_with_completion+=("--env-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--env-file=")

     flags+=("--file=")

     flags_with_completion+=("--file")

     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")

@@ -10627,6 +10631,10 @@ _oc_new-app()

     flags+=("--param=")

     two_word_flags+=("-p")

     local_nonpersistent_flags+=("--param=")

+    flags+=("--param-file=")

+    flags_with_completion+=("--param-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--param-file=")

     flags+=("--search")

     flags+=("-S")

     local_nonpersistent_flags+=("--search")

@@ -10699,6 +10707,10 @@ _oc_new-build()

     flags+=("--env=")

     two_word_flags+=("-e")

     local_nonpersistent_flags+=("--env=")

+    flags+=("--env-file=")

+    flags_with_completion+=("--env-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--env-file=")

     flags+=("--image-stream=")

     two_word_flags+=("-i")

     local_nonpersistent_flags+=("--image-stream=")

@@ -11671,6 +11683,10 @@ _oc_process()

     flags+=("--param=")

     two_word_flags+=("-p")

     local_nonpersistent_flags+=("--param=")

+    flags+=("--param-file=")

+    flags_with_completion+=("--param-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--param-file=")

     flags+=("--parameters")

     local_nonpersistent_flags+=("--parameters")

     flags+=("--raw")

@@ -15241,6 +15241,10 @@ _openshift_cli_new-app()

     flags+=("--env=")

     two_word_flags+=("-e")

     local_nonpersistent_flags+=("--env=")

+    flags+=("--env-file=")

+    flags_with_completion+=("--env-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--env-file=")

     flags+=("--file=")

     flags_with_completion+=("--file")

     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")

@@ -15275,6 +15279,10 @@ _openshift_cli_new-app()

     flags+=("--param=")

     two_word_flags+=("-p")

     local_nonpersistent_flags+=("--param=")

+    flags+=("--param-file=")

+    flags_with_completion+=("--param-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--param-file=")

     flags+=("--search")

     flags+=("-S")

     local_nonpersistent_flags+=("--search")

@@ -15348,6 +15356,10 @@ _openshift_cli_new-build()

     flags+=("--env=")

     two_word_flags+=("-e")

     local_nonpersistent_flags+=("--env=")

+    flags+=("--env-file=")

+    flags_with_completion+=("--env-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--env-file=")

     flags+=("--image-stream=")

     two_word_flags+=("-i")

     local_nonpersistent_flags+=("--image-stream=")

@@ -16335,6 +16347,10 @@ _openshift_cli_process()

     flags+=("--param=")

     two_word_flags+=("-p")

     local_nonpersistent_flags+=("--param=")

+    flags+=("--param-file=")

+    flags_with_completion+=("--param-file")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--param-file=")

     flags+=("--parameters")

     local_nonpersistent_flags+=("--parameters")

     flags+=("--raw")

@@ -59,6 +59,10 @@ If you provide source code, a new build will be automatically triggered. You can

     Specify a key\-value pair for an environment variable to set into each container.

 .PP

+\fB\-\-env\-file\fP=[]

+    File containing key\-value pairs of environment variables to set into each container.

+

+.PP

 \fB\-f\fP, \fB\-\-file\fP=[]

     Path to a template file to use for the app.

@@ -111,6 +115,10 @@ If you provide source code, a new build will be automatically triggered. You can

     Specify a key\-value pair (e.g., \-p FOO=BAR) to set/override a parameter value in the template.

 .PP

+\fB\-\-param\-file\fP=[]

+    File containing parameter values to set/override in the template.

+

+.PP

 \fB\-S\fP, \fB\-\-search\fP=false

     Search all templates, image streams, and Docker images that match the arguments provided.

@@ -67,6 +67,10 @@ Once the build configuration is created a new build will be automatically trigge

     Specify a key\-value pair for an environment variable to set into resulting image.

 .PP

+\fB\-\-env\-file\fP=[]

+    File containing key\-value pairs of environment variables to set into each container.

+

+.PP

 \fB\-\-image\fP=[]

     Name of an image stream to to use as a builder. (deprecated)

@@ -44,6 +44,10 @@ The output of the process command is always a list of one or more resources. You

     Specify a key\-value pair (eg. \-p FOO=BAR) to set/override a parameter value in the template.

 .PP

+\fB\-\-param\-file\fP=[]

+    File containing template parameter values to set/override in the template.

+

+.PP

 \fB\-\-parameters\fP=false

     Do not process but only print available parameters

@@ -59,6 +59,10 @@ If you provide source code, a new build will be automatically triggered. You can

     Specify a key\-value pair for an environment variable to set into each container.

 .PP

+\fB\-\-env\-file\fP=[]

+    File containing key\-value pairs of environment variables to set into each container.

+

+.PP

 \fB\-f\fP, \fB\-\-file\fP=[]

     Path to a template file to use for the app.

@@ -111,6 +115,10 @@ If you provide source code, a new build will be automatically triggered. You can

     Specify a key\-value pair (e.g., \-p FOO=BAR) to set/override a parameter value in the template.

 .PP

+\fB\-\-param\-file\fP=[]

+    File containing parameter values to set/override in the template.

+

+.PP

 \fB\-S\fP, \fB\-\-search\fP=false

     Search all templates, image streams, and Docker images that match the arguments provided.

@@ -67,6 +67,10 @@ Once the build configuration is created a new build will be automatically trigge

     Specify a key\-value pair for an environment variable to set into resulting image.

 .PP

+\fB\-\-env\-file\fP=[]

+    File containing key\-value pairs of environment variables to set into each container.

+

+.PP

 \fB\-\-image\fP=[]

     Name of an image stream to to use as a builder. (deprecated)

@@ -44,6 +44,10 @@ The output of the process command is always a list of one or more resources. You

     Specify a key\-value pair (eg. \-p FOO=BAR) to set/override a parameter value in the template.

 .PP

+\fB\-\-param\-file\fP=[]

+    File containing template parameter values to set/override in the template.

+

+.PP

 \fB\-\-parameters\fP=false

     Do not process but only print available parameters

@@ -95,7 +95,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *

 				cmd.NewCmdTypes(fullName, f, out),

 				loginCmd,

 				cmd.NewCmdRequestProject(cmd.RequestProjectRecommendedCommandName, fullName, f, out, errout),

-				cmd.NewCmdNewApplication(cmd.NewAppRecommendedCommandName, fullName, f, out, errout),

+				cmd.NewCmdNewApplication(cmd.NewAppRecommendedCommandName, fullName, f, in, out, errout),

 				cmd.NewCmdStatus(cmd.StatusRecommendedName, fullName, fullName+" "+cmd.StatusRecommendedName, f, out),

 				cmd.NewCmdProject(fullName+" project", f, out),

 				cmd.NewCmdProjects(fullName, f, out),

@@ -156,7 +156,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *

 				cmd.NewCmdReplace(fullName, f, out),

 				cmd.NewCmdApply(fullName, f, out),

 				cmd.NewCmdPatch(fullName, f, out),

-				cmd.NewCmdProcess(fullName, f, out, errout),

+				cmd.NewCmdProcess(fullName, f, in, out, errout),

 				cmd.NewCmdExport(fullName, f, in, out),

 				cmd.NewCmdExtract(fullName, f, in, out, errout),

 				observe.NewCmdObserve(fullName, f, out, errout),

@@ -20,6 +20,7 @@ import (

 	"github.com/openshift/origin/pkg/cmd/templates"

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

+	"github.com/openshift/origin/pkg/generate/app"

 )

 var (

@@ -55,7 +56,7 @@ type DockerbuildOptions struct {

 	DockerfilePath string

 	AllowPull      bool

 	Keyring        credentialprovider.DockerKeyring

-	Arguments      cmdutil.Environment

+	Arguments      app.Environment

 }

 func NewCmdDockerbuild(fullName string, f *clientcmd.Factory, out, errOut io.Writer) *cobra.Command {

@@ -97,7 +98,7 @@ func (o *DockerbuildOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,

 	if len(paths) != 2 {

 		return kcmdutil.UsageError(cmd, "the directory to build and tag must be specified")

 	}

-	o.Arguments, _, _ = cmdutil.ParseEnvironmentArguments(envArgs)

+	o.Arguments, _, _ = app.ParseEnvironment(envArgs...)

 	o.Directory = paths[0]

 	o.Tag = paths[1]

 	if len(o.DockerfilePath) == 0 {

@@ -45,10 +45,6 @@ import (

 // NewAppRecommendedCommandName is the recommended command name.

 const NewAppRecommendedCommandName = "new-app"

-type usage interface {

-	UsageError(baseName string) string

-}

-

 var (

 	newAppLong = templates.LongDesc(`

 		Create a new application by specifying source code, templates, and/or images

@@ -129,6 +125,7 @@ type NewAppOptions struct {

 	CommandPath string

 	CommandName string

+	In            io.Reader

 	Out, ErrOut   io.Writer

 	Output        string

 	PrintObject   func(obj runtime.Object) error

@@ -136,7 +133,7 @@ type NewAppOptions struct {

 }

 // NewCmdNewApplication implements the OpenShift cli new-app command.

-func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, out, errout io.Writer) *cobra.Command {

+func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, in io.Reader, out, errout io.Writer) *cobra.Command {

 	config := newcmd.NewAppConfig()

 	config.Deploy = true

 	o := &NewAppOptions{Config: config}

@@ -148,7 +145,7 @@ func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, out, erro

 		Example:    fmt.Sprintf(newAppExample, baseName, name),

 		SuggestFor: []string{"app", "application"},

 		Run: func(c *cobra.Command, args []string) {

-			kcmdutil.CheckErr(o.Complete(baseName, name, f, c, args, out, errout))

+			kcmdutil.CheckErr(o.Complete(baseName, name, f, c, args, in, out, errout))

 			err := o.RunNewApp()

 			if err == cmdutil.ErrExit {

 				os.Exit(1)

@@ -168,8 +165,12 @@ func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, out, erro

 	cmd.Flags().StringSliceVarP(&config.TemplateFiles, "file", "f", config.TemplateFiles, "Path to a template file to use for the app.")

 	cmd.MarkFlagFilename("file", "yaml", "yml", "json")

 	cmd.Flags().StringArrayVarP(&config.TemplateParameters, "param", "p", config.TemplateParameters, "Specify a key-value pair (e.g., -p FOO=BAR) to set/override a parameter value in the template.")

+	cmd.Flags().StringArrayVar(&config.TemplateParameterFiles, "param-file", config.TemplateParameterFiles, "File containing parameter values to set/override in the template.")

+	cmd.MarkFlagFilename("param-file")

 	cmd.Flags().StringSliceVar(&config.Groups, "group", config.Groups, "Indicate components that should be grouped together as <comp1>+<comp2>.")

 	cmd.Flags().StringArrayVarP(&config.Environment, "env", "e", config.Environment, "Specify a key-value pair for an environment variable to set into each container.")

+	cmd.Flags().StringArrayVar(&config.EnvironmentFiles, "env-file", config.EnvironmentFiles, "File containing key-value pairs of environment variables to set into each container.")

+	cmd.MarkFlagFilename("env-file")

 	cmd.Flags().StringVar(&config.Name, "name", "", "Set name to use for generated application artifacts")

 	cmd.Flags().Var(&config.Strategy, "strategy", "Specify the build strategy to use if you don't want to detect (docker|pipeline|source).")

 	cmd.Flags().StringP("labels", "l", "", "Label to set in all resources for this application.")

@@ -188,12 +189,14 @@ func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, out, erro

 }

 // Complete sets any default behavior for the command

-func (o *NewAppOptions) Complete(baseName, name string, f *clientcmd.Factory, c *cobra.Command, args []string, out, errout io.Writer) error {

+func (o *NewAppOptions) Complete(baseName, name string, f *clientcmd.Factory, c *cobra.Command, args []string, in io.Reader, out, errout io.Writer) error {

+	o.In = in

 	o.Out = out

 	o.ErrOut = errout

 	o.Output = kcmdutil.GetFlagString(c, "output")

 	// Only output="" should print descriptions of intermediate steps. Everything

 	// else should print only some specific output (json, yaml, go-template, ...)

+	o.Config.In = o.In

 	if len(o.Output) == 0 {

 		o.Config.Out = o.Out

 	} else {

@@ -112,7 +112,7 @@ func TestNewAppDefaultFlags(t *testing.T) {

 		},

 	}

-	cmd := NewCmdNewApplication("oc", NewAppRecommendedCommandName, nil, nil, nil)

+	cmd := NewCmdNewApplication("oc", NewAppRecommendedCommandName, nil, nil, nil, nil)

 	for _, v := range tests {

 		f := cmd.Flag(v.flagName)

@@ -90,6 +90,7 @@ type NewBuildOptions struct {

 	CommandPath string

 	CommandName string

+	In            io.Reader

 	Out, ErrOut   io.Writer

 	Output        string

 	PrintObject   func(obj runtime.Object) error

@@ -129,6 +130,8 @@ func NewCmdNewBuild(name, baseName string, f *clientcmd.Factory, in io.Reader, o

 	cmd.Flags().StringVar(&config.To, "to", "", "Push built images to this image stream tag (or Docker image repository if --to-docker is set).")

 	cmd.Flags().BoolVar(&config.OutputDocker, "to-docker", false, "Have the build output push to a Docker repository.")

 	cmd.Flags().StringArrayVarP(&config.Environment, "env", "e", config.Environment, "Specify a key-value pair for an environment variable to set into resulting image.")

+	cmd.Flags().StringArrayVar(&config.EnvironmentFiles, "env-file", config.EnvironmentFiles, "File containing key-value pairs of environment variables to set into each container.")

+	cmd.MarkFlagFilename("env-file")

 	cmd.Flags().Var(&config.Strategy, "strategy", "Specify the build strategy to use if you don't want to detect (docker|pipeline|source).")

 	cmd.Flags().StringVarP(&config.Dockerfile, "dockerfile", "D", "", "Specify the contents of a Dockerfile to build directly, implies --strategy=docker. Pass '-' to read from STDIN.")

 	cmd.Flags().BoolVar(&config.BinaryBuild, "binary", false, "Instead of expecting a source URL, set the build to expect binary contents. Will disable triggers.")

@@ -148,11 +151,13 @@ func NewCmdNewBuild(name, baseName string, f *clientcmd.Factory, in io.Reader, o

 // Complete sets any default behavior for the command

 func (o *NewBuildOptions) Complete(baseName, commandName string, f *clientcmd.Factory, c *cobra.Command, args []string, out, errout io.Writer, in io.Reader) error {

+	o.In = in

 	o.Out = out

 	o.ErrOut = errout

 	o.Output = kcmdutil.GetFlagString(c, "output")

 	// Only output="" should print descriptions of intermediate steps. Everything

 	// else should print only some specific output (json, yaml, go-template, ...)

+	o.Config.In = in

 	if len(o.Output) == 0 {

 		o.Config.Out = o.Out

 	} else {

@@ -22,6 +22,7 @@ import (

 	"github.com/openshift/origin/pkg/cmd/templates"

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

+	"github.com/openshift/origin/pkg/generate/app"

 	"github.com/openshift/origin/pkg/template"

 	templateapi "github.com/openshift/origin/pkg/template/api"

 )

@@ -58,14 +59,14 @@ var (

 )

 // NewCmdProcess implements the OpenShift cli process command

-func NewCmdProcess(fullName string, f *clientcmd.Factory, out, errout io.Writer) *cobra.Command {

+func NewCmdProcess(fullName string, f *clientcmd.Factory, in io.Reader, out, errout io.Writer) *cobra.Command {

 	cmd := &cobra.Command{

 		Use:     "process (TEMPLATE | -f FILENAME) [-v=KEY=VALUE]",

 		Short:   "Process a template into list of resources",

 		Long:    processLong,

 		Example: fmt.Sprintf(processExample, fullName),

 		Run: func(cmd *cobra.Command, args []string) {

-			err := RunProcess(f, out, errout, cmd, args)

+			err := RunProcess(f, in, out, errout, cmd, args)

 			kcmdutil.CheckErr(err)

 		},

 	}

@@ -75,6 +76,8 @@ func NewCmdProcess(fullName string, f *clientcmd.Factory, out, errout io.Writer)

 	cmd.Flags().MarkDeprecated("value", "Use -p, --param instead.")

 	cmd.Flags().MarkHidden("value")

 	cmd.Flags().StringArrayVarP(params, "param", "p", nil, "Specify a key-value pair (eg. -p FOO=BAR) to set/override a parameter value in the template.")

+	cmd.Flags().StringArray("param-file", []string{}, "File containing template parameter values to set/override in the template.")

+	cmd.MarkFlagFilename("param-file")

 	cmd.Flags().BoolP("parameters", "", false, "Do not process but only print available parameters")

 	cmd.Flags().StringP("labels", "l", "", "Label to set in all resources for this template")

@@ -95,13 +98,13 @@ func NewCmdProcess(fullName string, f *clientcmd.Factory, out, errout io.Writer)

 }

 // RunProcess contains all the necessary functionality for the OpenShift cli process command

-func RunProcess(f *clientcmd.Factory, out, errout io.Writer, cmd *cobra.Command, args []string) error {

-	templateName, valueArgs := "", []string{}

+func RunProcess(f *clientcmd.Factory, in io.Reader, out, errout io.Writer, cmd *cobra.Command, args []string) error {

+	templateName, templateParams := "", []string{}

 	for _, s := range args {

 		isValue := strings.Contains(s, "=")

 		switch {

 		case isValue:

-			valueArgs = append(valueArgs, s)

+			templateParams = append(templateParams, s)

 		case !isValue && len(templateName) == 0:

 			templateName = s

 		case !isValue && len(templateName) > 0:

@@ -109,33 +112,23 @@ func RunProcess(f *clientcmd.Factory, out, errout io.Writer, cmd *cobra.Command,

 		}

 	}

-	keys := sets.NewString()

-	duplicatedKeys := sets.NewString()

-

-	var flagValues []string

 	if cmd.Flag("value").Changed || cmd.Flag("param").Changed {

-		flagValues = getFlagStringArray(cmd, "param")

+		flagValues := getFlagStringArray(cmd, "param")

 		cmdutil.WarnAboutCommaSeparation(errout, flagValues, "--param")

+		templateParams = append(templateParams, flagValues...)

 	}

-	for _, value := range flagValues {

-		key := strings.Split(value, "=")[0]

-		if keys.Has(key) {

-			duplicatedKeys.Insert(key)

-		}

-		keys.Insert(key)

-	}

-

-	for _, value := range valueArgs {

-		key := strings.Split(value, "=")[0]

-		if keys.Has(key) {

+	duplicatedKeys := sets.NewString()

+	params, paramErr := app.ParseAndCombineEnvironment(templateParams, getFlagStringArray(cmd, "param-file"), in, func(key, file string) error {

+		if file == "" {

 			duplicatedKeys.Insert(key)

+		} else {

+			fmt.Fprintf(errout, "warning: Template parameter %q already defined, ignoring value from file %q", key, file)

 		}

-		keys.Insert(key)

-	}

-

+		return nil

+	})

 	if len(duplicatedKeys) != 0 {

-		return kcmdutil.UsageError(cmd, fmt.Sprintf("The following values were provided more than once: %s", strings.Join(duplicatedKeys.List(), ", ")))

+		return kcmdutil.UsageError(cmd, fmt.Sprintf("The following parameters were provided more than once: %s", strings.Join(duplicatedKeys.List(), ", ")))

 	}

 	filename := kcmdutil.GetFlagString(cmd, "filename")

@@ -248,16 +241,11 @@ func RunProcess(f *clientcmd.Factory, out, errout io.Writer, cmd *cobra.Command,

 		}

 	}

-	// Override the parameter values for the current template parameters

-	// when user specifies --param

-	if cmd.Flag("value").Changed || cmd.Flag("param").Changed {

-		values := getFlagStringArray(cmd, "param")

-		if errs := injectUserVars(values, obj); errs != nil {

-			return kerrors.NewAggregate(errs)

-		}

+	// Raise parameter parsing errors here after we had chance to return UsageErrors first

+	if paramErr != nil {

+		return paramErr

 	}

-

-	if errs := injectUserVars(valueArgs, obj); errs != nil {

+	if errs := injectUserVars(params, obj); errs != nil {

 		return kerrors.NewAggregate(errs)

 	}

@@ -307,19 +295,14 @@ func RunProcess(f *clientcmd.Factory, out, errout io.Writer, cmd *cobra.Command,

 }

 // injectUserVars injects user specified variables into the Template

-func injectUserVars(values []string, t *templateapi.Template) []error {

+func injectUserVars(values app.Environment, t *templateapi.Template) []error {

 	var errors []error

-	for _, keypair := range values {

-		p := strings.SplitN(keypair, "=", 2)

-		if len(p) != 2 {

-			errors = append(errors, fmt.Errorf("invalid parameter assignment in %q: %q\n", t.Name, keypair))

+	for param, val := range values {

+		if v := template.GetParameterByName(t, param); v != nil {

+			v.Value = val

+			v.Generate = ""

 		} else {

-			if v := template.GetParameterByName(t, p[0]); v != nil {

-				v.Value = p[1]

-				v.Generate = ""

-			} else {

-				errors = append(errors, fmt.Errorf("unknown parameter name %q\n", p[0]))

-			}

+			errors = append(errors, fmt.Errorf("unknown parameter name %q\n", param))

 		}

 	}

 	return errors

@@ -13,9 +13,11 @@ func TestInjectUserVars(t *testing.T) {

 			{Name: "parameter_foo_bar_2", Value: "value_foo_bar_2"}},

 	}

 	oldParameterNum := len(template.Parameters)

-	testParam := []string{"parameter_foo_bar_exist=value_foo_bar_exist_new",

-		"parameter_foo_bar_no_exist=value_foo_bar_no_exist",

-		"parameter_foo_bar_error=value_foo_bar_error=value_foo_bar_error"}

+	testParam := map[string]string{

+		"parameter_foo_bar_exist":    "value_foo_bar_exist_new",

+		"parameter_foo_bar_no_exist": "value_foo_bar_no_exist",

+		"parameter_foo_bar_error":    "value_foo_bar_error=value_foo_bar_error",

+	}

 	errors := injectUserVars(testParam, template)

 	if len(errors) != 2 {

@@ -39,8 +39,6 @@ func GetEnv(key string) (string, bool) {

 	return val, true

 }

-type Environment map[string]string

-

 var argumentEnvironment = regexp.MustCompile("(?ms)^(.+)\\=(.*)$")

 var validArgumentEnvironment = regexp.MustCompile("(?ms)^(\\w+)\\=(.*)$")

@@ -72,25 +70,6 @@ func SplitEnvironmentFromResources(args []string) (resources, envArgs []string,

 	return resources, envArgs, true

 }

-func ParseEnvironmentArguments(s []string) (Environment, []string, []error) {

-	errs := []error{}

-	duplicates := []string{}

-	env := make(Environment)

-	for _, s := range s {

-		switch matches := validArgumentEnvironment.FindStringSubmatch(s); len(matches) {

-		case 3:

-			k, v := matches[1], matches[2]

-			if exist, ok := env[k]; ok {

-				duplicates = append(duplicates, fmt.Sprintf("%s=%s", k, exist))

-			}

-			env[k] = v

-		default:

-			errs = append(errs, fmt.Errorf("environment variables must be of the form key=value: %s", s))

-		}

-	}

-	return env, duplicates, errs

-}

-

 // ParseEnv parses the list of environment variables into kubernetes EnvVar

 func ParseEnv(spec []string, defaultReader io.Reader) ([]kapi.EnvVar, []string, error) {

 	env := []kapi.EnvVar{}

@@ -54,6 +54,9 @@ type GenerationInputs struct {

 	Environment        []string

 	Labels             map[string]string

+	TemplateParameterFiles []string

+	EnvironmentFiles       []string

+

 	AddEnvironmentToBuild bool

 	InsecureRegistry bool

@@ -100,6 +103,7 @@ type AppConfig struct {

 	AsList   bool

 	DryRun   bool

+	In     io.Reader

 	Out    io.Writer

 	ErrOut io.Writer

@@ -115,16 +119,6 @@ type AppConfig struct {

 	OriginNamespace string

 }

-// UsageError is an interface for printing usage errors

-type UsageError interface {

-	UsageError(commandName string) string

-}

-

-// TODO: replace with upstream converting [1]error to error

-type errlist interface {

-	Errors() []error

-}

-

 type ErrRequiresExplicitAccess struct {

 	Match app.ComponentMatch

 	Input app.GeneratorInput

@@ -579,27 +573,35 @@ func (c *AppConfig) RunQuery() (*QueryResult, error) {

 	}, nil

 }

-func (c *AppConfig) validate() (cmdutil.Environment, cmdutil.Environment, error) {

-	var errs []error

-

-	env, duplicateEnv, envErrs := cmdutil.ParseEnvironmentArguments(c.Environment)

-	for _, s := range duplicateEnv {

-		fmt.Fprintf(c.ErrOut, "warning: The environment variable %q was overwritten", s)

+func (c *AppConfig) validate() (app.Environment, app.Environment, error) {

+	env, err := app.ParseAndCombineEnvironment(c.Environment, c.EnvironmentFiles, c.In, func(key, file string) error {

+		if file == "" {

+			fmt.Fprintf(c.ErrOut, "warning: Environment variable %q was overwritten\n", key)

+		} else {

+			fmt.Fprintf(c.ErrOut, "warning: Environment variable %q already defined, ignoring value from file %q\n", key, file)

+		}

+		return nil

+	})

+	if err != nil {

+		return nil, nil, err

 	}

-	errs = append(errs, envErrs...)

-

-	params, duplicateParams, paramsErrs := cmdutil.ParseEnvironmentArguments(c.TemplateParameters)

-	for _, s := range duplicateParams {

-		fmt.Fprintf(c.ErrOut, "warning: The template parameter %q was overwritten", s)

+	params, err := app.ParseAndCombineEnvironment(c.TemplateParameters, c.TemplateParameterFiles, c.In, func(key, file string) error {

+		if file == "" {

+			fmt.Fprintf(c.ErrOut, "warning: Template parameter %q was overwritten\n", key)

+		} else {

+			fmt.Fprintf(c.ErrOut, "warning: Template parameter %q already defined, ignoring value from file %q\n", key, file)

+		}

+		return nil

+	})

+	if err != nil {

+		return nil, nil, err

 	}

-	errs = append(errs, paramsErrs...)

-

-	return env, params, kutilerrors.NewAggregate(errs)

+	return env, params, nil

 }

 // Run executes the provided config to generate objects.

 func (c *AppConfig) Run() (*AppResult, error) {

-	environment, parameters, err := c.validate()

+	env, parameters, err := c.validate()

 	if err != nil {

 		return nil, err

 	}

@@ -645,8 +647,6 @@ func (c *AppConfig) Run() (*AppResult, error) {

 		return nil, errors.New("only one component with source can be used when specifying an output image reference")

 	}

-	env := app.Environment(environment)

-

 	// identify if there are installable components in the input provided by the user

 	installables, name, err := c.installComponents(components, env)

 	if err != nil {

@@ -680,7 +680,7 @@ func (c *AppConfig) Run() (*AppResult, error) {

 	objects = app.AddServices(objects, false)

-	templateName, templateObjects, err := c.buildTemplates(components.TemplateComponentRefs(), app.Environment(parameters), app.Environment(environment))

+	templateName, templateObjects, err := c.buildTemplates(components.TemplateComponentRefs(), parameters, env)

 	if err != nil {

 		return nil, err

 	}

@@ -1,18 +1,25 @@

 package app

 import (

+	"fmt"

+	"io"

+	"io/ioutil"

+	"os"

 	"sort"

 	"strings"

+	"github.com/joho/godotenv"

+	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 	kapi "k8s.io/kubernetes/pkg/api"

 )

 // Environment holds environment variables for new-app

 type Environment map[string]string

-// ParseEnvironment converts the provided strings in key=value form into environment

-// entries.

-func ParseEnvironment(vals ...string) Environment {

+// ParseEnvironmentAllowEmpty converts the provided strings in key=value form

+// into environment entries. In case there's no equals sign in a string, it's

+// considered as a key with empty value.

+func ParseEnvironmentAllowEmpty(vals ...string) Environment {

 	env := make(Environment)

 	for _, s := range vals {

 		if i := strings.Index(s, "="); i == -1 {

@@ -24,6 +31,30 @@ func ParseEnvironment(vals ...string) Environment {

 	return env

 }

+// ParseEnvironment takes a slice of strings in key=value format and transforms

+// them into a map. List of duplicate keys is returned in the second return

+// value.

+func ParseEnvironment(vals ...string) (Environment, []string, []error) {

+	errs := []error{}

+	duplicates := []string{}

+	env := make(Environment)

+	for _, s := range vals {

+		valid := cmdutil.IsValidEnvironmentArgument(s)

+		p := strings.SplitN(s, "=", 2)

+		if !valid || len(p) != 2 {

+			errs = append(errs, fmt.Errorf("invalid parameter assignment in %q", s))

+			continue

+		}

+		key, val := p[0], p[1]

+		if _, exists := env[key]; exists {

+			duplicates = append(duplicates, key)

+			continue

+		}

+		env[key] = val

+	}

+	return env, duplicates, errs

+}

+

 // NewEnvironment returns a new set of environment variables based on all

 // the provided environment variables

 func NewEnvironment(envs ...map[string]string) Environment {

@@ -44,6 +75,22 @@ func (e Environment) Add(envs ...map[string]string) {

 	}

 }

+// AddIfNotPresent adds the environment variables to the current environment.

+// In case of key conflict the old value is kept. Conflicting keys are returned

+// as a slice.

+func (e Environment) AddIfNotPresent(more Environment) []string {

+	duplicates := []string{}

+	for k, v := range more {

+		if _, exists := e[k]; exists {

+			duplicates = append(duplicates, k)

+		} else {

+			e[k] = v

+		}

+	}

+

+	return duplicates

+}

+

 // List sorts and returns all the environment variables

 func (e Environment) List() []kapi.EnvVar {

 	env := []kapi.EnvVar{}

@@ -82,3 +129,85 @@ func JoinEnvironment(a, b []kapi.EnvVar) (out []kapi.EnvVar) {

 	}

 	return out

 }

+

+// LoadEnvironmentFile accepts filename of a file containing key=value pairs

+// and puts these pairs into a map. If filename is "-" the file contents are

+// read from the stdin argument, provided it is not nil.

+func LoadEnvironmentFile(filename string, stdin io.Reader) (Environment, error) {

+	errorFilename := filename

+

+	if filename == "-" && stdin != nil {

+		//once https://github.com/joho/godotenv/pull/20 is merged we can get rid of using tempfile

+		temp, err := ioutil.TempFile("", "origin-env-stdin")

+		if err != nil {

+			return nil, fmt.Errorf("Cannot create temporary file: %s", err)

+		}

+

+		filename = temp.Name()

+		errorFilename = "stdin"

+		defer os.Remove(filename)

+

+		if _, err = io.Copy(temp, stdin); err != nil {

+			return nil, fmt.Errorf("Cannot write to temporary file %q: %s", filename, err)

+		}

+		temp.Close()

+	}

+

+	// godotenv successfuly returns empty map when given path to a directory,

+	// remove this once https://github.com/joho/godotenv/pull/22 is merged

+	if info, err := os.Stat(filename); err == nil && info.IsDir() {

+		return nil, fmt.Errorf("Cannot read varaiables from %q: is a directory", filename)

+	} else if err != nil {

+		return nil, fmt.Errorf("Cannot stat %q: %s", filename, err)

+	}

+

+	env, err := godotenv.Read(filename)

+	if err != nil {

+		return nil, fmt.Errorf("Cannot read variables from file %q: %s", errorFilename, err)

+	}

+	for k, v := range env {

+		if !cmdutil.IsValidEnvironmentArgument(fmt.Sprintf("%s=%s", k, v)) {

+			return nil, fmt.Errorf("invalid parameter assignment in %s=%s", k, v)

+		}

+	}

+	return env, nil

+}

+

+// ParseAndCombineEnvironment parses key=value records from slice of strings

+// (typically obtained from the command line) and from given files and combines

+// them into single map. Key=value pairs from the envs slice have precedence

+// over those read from file.

+//

+// The dupfn function is called for all duplicate keys that encountered. If the

+// function returns an error this error is returned by

+// ParseAndCombineEnvironment.

+//

+// If a file is "-" the file contents will be read from argument stdin (unless

+// it's nil).

+func ParseAndCombineEnvironment(envs []string, filenames []string, stdin io.Reader, dupfn func(string, string) error) (Environment, error) {

+	vars, duplicates, errs := ParseEnvironment(envs...)

+	if len(errs) > 0 {

+		return nil, errs[0]

+	}

+	for _, s := range duplicates {

+		if err := dupfn(s, ""); err != nil {

+			return nil, err

+		}

+	}

+

+	for _, fname := range filenames {

+		fileVars, err := LoadEnvironmentFile(fname, stdin)

+		if err != nil {

+			return nil, err