bake: read env vars from alternate env-file

Signed-off-by: CrazyMax <[email protected]>

bake/bake.go

@@ -84,8 +84,8 @@ func ReadLocalFiles(names []string) ([]File, error) {
 	return out, nil
 }
 
-func ReadTargets(ctx context.Context, files []File, targets, overrides []string, defaults map[string]string) (map[string]*Target, []*Group, error) {
-	c, err := ParseFiles(files, defaults)
+func ReadTargets(ctx context.Context, files []File, targets []string, envs map[string]string, overrides []string, defaults map[string]string) (map[string]*Target, []*Group, error) {
+	c, err := ParseFiles(files, envs, defaults)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -181,15 +181,30 @@ func dedupMap(ms ...map[string]string) map[string]string {
 	return res
 }
 
-func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error) {
+func sliceToMap(env []string) (res map[string]string) {
+	res = make(map[string]string)
+	for _, s := range env {
+		kv := strings.SplitN(s, "=", 2)
+		key := kv[0]
+		switch {
+		case len(kv) == 1:
+			res[key] = ""
+		default:
+			res[key] = kv[1]
+		}
+	}
+	return
+}
+
+func ParseFiles(files []File, envs map[string]string, defaults map[string]string) (_ *Config, err error) {
 	defer func() {
 		err = formatHCLError(err, files)
 	}()
 
 	var c Config
 	var fs []*hcl.File
 	for _, f := range files {
-		cfg, isCompose, composeErr := ParseComposeFile(f.Data, f.Name)
+		cfg, isCompose, composeErr := ParseComposeFile(f.Data, f.Name, envs)
 		if isCompose {
 			if composeErr != nil {
 				return nil, composeErr
@@ -214,7 +229,15 @@ func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error)
 
 	if len(fs) > 0 {
 		if err := hclparser.Parse(hcl.MergeFiles(fs), hclparser.Opt{
-			LookupVar:     os.LookupEnv,
+			LookupVar: func(key string) (string, bool) {
+				if envs == nil {
+					return "", false
+				}
+				if v, ok := envs[key]; ok {
+					return v, true
+				}
+				return "", false
+			},
 			Vars:          defaults,
 			ValidateLabel: validateTargetName,
 		}, &c); err.HasErrors() {
@@ -239,20 +262,20 @@ func dedupeConfig(c Config) Config {
 	return c2
 }
 
-func ParseFile(dt []byte, fn string) (*Config, error) {
-	return ParseFiles([]File{{Data: dt, Name: fn}}, nil)
+func ParseFile(dt []byte, fn string, envs map[string]string) (*Config, error) {
+	return ParseFiles([]File{{Data: dt, Name: fn}}, envs, nil)
 }
 
-func ParseComposeFile(dt []byte, fn string) (*Config, bool, error) {
+func ParseComposeFile(dt []byte, fn string, envs map[string]string) (*Config, bool, error) {
 	fnl := strings.ToLower(fn)
 	if strings.HasSuffix(fnl, ".yml") || strings.HasSuffix(fnl, ".yaml") {
-		cfg, err := ParseCompose(dt)
+		cfg, err := ParseCompose(dt, envs)
 		return cfg, true, err
 	}
 	if strings.HasSuffix(fnl, ".json") || strings.HasSuffix(fnl, ".hcl") {
 		return nil, false, nil
 	}
-	cfg, err := ParseCompose(dt)
+	cfg, err := ParseCompose(dt, envs)
 	return cfg, err == nil, err
 }