From 62c9f2cf3e86f8aaea7a1583f09adb6b8007cfe6 Mon Sep 17 00:00:00 2001 From: elcore Date: Fri, 15 May 2020 23:49:51 +0200 Subject: cmd: Add --envfile flag to run command (#3278) * run: Add the possibility to load an env file * run: change envfile flag var * run: do not ignore err values * Apply suggestions from code review Co-authored-by: Matt Holt Co-authored-by: Matt Holt --- cmd/commandfuncs.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'cmd/commandfuncs.go') diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go index f9e1033..a824789 100644 --- a/cmd/commandfuncs.go +++ b/cmd/commandfuncs.go @@ -151,11 +151,20 @@ func cmdRun(fl Flags) (int, error) { runCmdConfigFlag := fl.String("config") runCmdConfigAdapterFlag := fl.String("adapter") runCmdResumeFlag := fl.Bool("resume") + runCmdLoadEnvfileFlag := fl.String("envfile") runCmdPrintEnvFlag := fl.Bool("environ") runCmdWatchFlag := fl.Bool("watch") runCmdPidfileFlag := fl.String("pidfile") runCmdPingbackFlag := fl.String("pingback") + // load all additional envs as soon as possible + if runCmdLoadEnvfileFlag != "" { + if err := loadEnvFromFile(runCmdLoadEnvfileFlag); err != nil { + return caddy.ExitCodeFailedStartup, + fmt.Errorf("loading additional environment variables: %v", err) + } + } + // if we are supposed to print the environment, do that first if runCmdPrintEnvFlag { printEnvironment() -- cgit v1.2.3