Merge branch 'master' into file-logging-ocis-1666

2021-03-17 15:28:16 +01:00
parent 8a3e280d83 05f60af349
commit abd18e3101
5 changed files with 13 additions and 14 deletions
@@ -8,6 +8,12 @@ import (
 // RootWithConfig applies cfg to the root flagset
 func RootWithConfig(cfg *config.Config) []cli.Flag {
 	return []cli.Flag{
+		&cli.StringFlag{
+			Name:        "config-file",
+			Usage:       "Load config file from a non standard location.",
+			EnvVars:     []string{"OCIS_CONFIG_FILE"},
+			Destination: &cfg.File,
+		},
 		&cli.StringFlag{
 			Name:        "ocis-log-level",
 			Value:       "info",