docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-08-02 00:28:04 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

bake: allow variables in user functions

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2021-02-04 23:27:09 -08:00
parent 42b7e7bc56
commit 7878f0c514
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bake/hcl.go
View File

@@ -167,15 +167,6 @@ func parseHCL(dt []byte, fn string) (_ *Config, err error) {
}
}
userFunctions, _, diags := userfunc.DecodeUserFunctions(file.Body, "function", func() *hcl.EvalContext {
return &hcl.EvalContext{
Functions: stdlibFunctions,
}
})
if diags.HasErrors() {
return nil, diags
}
var sc staticConfig
// Decode only variable blocks without interpolation.
@@ -189,6 +180,16 @@ func parseHCL(dt []byte, fn string) (_ *Config, err error) {
variables[variable.Name] = cty.StringVal(variable.Default)
}
userFunctions, _, diags := userfunc.DecodeUserFunctions(file.Body, "function", func() *hcl.EvalContext {
return &hcl.EvalContext{
Functions: stdlibFunctions,
Variables: variables,
}
})
if diags.HasErrors() {
return nil, diags
}
// Override default with values from environment.
for _, env := range os.Environ() {
parts := strings.SplitN(env, "=", 2)