From db84b52159c4b814b2b212df0765d35739a686ea Mon Sep 17 00:00:00 2001 From: David Farrell Date: Thu, 7 Nov 2019 11:27:29 -0800 Subject: [PATCH] Invoke envOverrides before checkFilePerms (#1441) * Invoke envOverrides before checkFilePerms * Reverts changes to cmd/proxy/Dockerfile --- pkg/config/config.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/config/config.go b/pkg/config/config.go index 15aeacd1..7bfa4e9d 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -190,6 +190,11 @@ func ParseConfigFile(configFile string) (*Config, error) { return nil, err } + // override values with environment variables if specified + if err := envOverride(&config); err != nil { + return nil, err + } + // Check file perms from config if config.GoEnv == "production" { if err := checkFilePerms(configFile, config.FilterFile); err != nil { @@ -197,11 +202,6 @@ func ParseConfigFile(configFile string) (*Config, error) { } } - // override values with environment variables if specified - if err := envOverride(&config); err != nil { - return nil, err - } - // validate all required fields have been populated if err := validateConfig(config); err != nil { return nil, err