diff options
| author | elcore <eldinhadzic@protonmail.com> | 2020-05-15 23:49:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 15:49:51 -0600 |
| commit | 62c9f2cf3e86f8aaea7a1583f09adb6b8007cfe6 (patch) | |
| tree | 8407f9f2919a4ef66254fc6b20b361c56fd38901 /cmd/commandfuncs.go | |
| parent | bde3823b76b457a933e684cd096ca84fc6378997 (diff) | |
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 <mholt@users.noreply.github.com>
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
Diffstat (limited to 'cmd/commandfuncs.go')
| -rw-r--r-- | cmd/commandfuncs.go | 9 |
1 files changed, 9 insertions, 0 deletions
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() |