mirror of
https://github.com/mudler/luet.git
synced 2025-09-13 05:42:52 +00:00
Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
6674abb256 | ||
|
cca1a6dbc4 |
@@ -150,6 +150,11 @@ Build packages specifying multiple definition trees:
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
util.DefaultContext.Warning("errors while loading trees from repositories", err.Error())
|
util.DefaultContext.Warning("errors while loading trees from repositories", err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for _, r := range bt.RepoDir {
|
||||||
|
helpers.CheckErr(installerRecipe.Load(r))
|
||||||
|
}
|
||||||
|
|
||||||
templateFolders = util.TemplateFolders(util.DefaultContext, bt, treePaths)
|
templateFolders = util.TemplateFolders(util.DefaultContext, bt, treePaths)
|
||||||
} else {
|
} else {
|
||||||
templateFolders = util.TemplateFolders(util.DefaultContext, installer.BuildTreeResult{}, treePaths)
|
templateFolders = util.TemplateFolders(util.DefaultContext, installer.BuildTreeResult{}, treePaths)
|
||||||
|
@@ -30,7 +30,7 @@ var cfgFile string
|
|||||||
var Verbose bool
|
var Verbose bool
|
||||||
|
|
||||||
const (
|
const (
|
||||||
LuetCLIVersion = "0.31.1"
|
LuetCLIVersion = "0.31.2"
|
||||||
LuetEnvPrefix = "LUET"
|
LuetEnvPrefix = "LUET"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@@ -214,6 +214,7 @@ type LuetConfig struct {
|
|||||||
FinalizerEnvs Finalizers `json:"finalizer_envs,omitempty" yaml:"finalizer_envs,omitempty" mapstructure:"finalizer_envs,omitempty"`
|
FinalizerEnvs Finalizers `json:"finalizer_envs,omitempty" yaml:"finalizer_envs,omitempty" mapstructure:"finalizer_envs,omitempty"`
|
||||||
|
|
||||||
ConfigProtectConfFiles []config.ConfigProtectConfFile `yaml:"-" mapstructure:"-"`
|
ConfigProtectConfFiles []config.ConfigProtectConfFile `yaml:"-" mapstructure:"-"`
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddSystemRepository is just syntax sugar to add a repository in the system set
|
// AddSystemRepository is just syntax sugar to add a repository in the system set
|
||||||
@@ -296,6 +297,7 @@ func (c *LuetConfig) loadRepositories() error {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
c.AddSystemRepository(*r)
|
c.AddSystemRepository(*r)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -118,6 +118,7 @@ func SystemRepositories(t types.LuetRepositories) Repositories {
|
|||||||
type BuildTreeResult struct {
|
type BuildTreeResult struct {
|
||||||
Repositories Repositories
|
Repositories Repositories
|
||||||
TemplatesDir map[*LuetSystemRepository][]string
|
TemplatesDir map[*LuetSystemRepository][]string
|
||||||
|
RepoDir map[*LuetSystemRepository]string
|
||||||
}
|
}
|
||||||
|
|
||||||
// LoadBuildTree loads to the tree the compilation specs from the system repositories
|
// LoadBuildTree loads to the tree the compilation specs from the system repositories
|
||||||
@@ -125,6 +126,7 @@ func LoadBuildTree(t tree.Builder, db types.PackageDatabase, ctx types.Context)
|
|||||||
var reserr error
|
var reserr error
|
||||||
res := &BuildTreeResult{
|
res := &BuildTreeResult{
|
||||||
TemplatesDir: make(map[*LuetSystemRepository][]string),
|
TemplatesDir: make(map[*LuetSystemRepository][]string),
|
||||||
|
RepoDir: make(map[*LuetSystemRepository]string),
|
||||||
}
|
}
|
||||||
|
|
||||||
repos := SystemRepositories(ctx.GetConfig().SystemRepositories)
|
repos := SystemRepositories(ctx.GetConfig().SystemRepositories)
|
||||||
@@ -147,6 +149,8 @@ func LoadBuildTree(t tree.Builder, db types.PackageDatabase, ctx types.Context)
|
|||||||
|
|
||||||
r.SetTree(generalRecipe)
|
r.SetTree(generalRecipe)
|
||||||
res.TemplatesDir[r] = template.FindPossibleTemplatesDir(repodir)
|
res.TemplatesDir[r] = template.FindPossibleTemplatesDir(repodir)
|
||||||
|
res.RepoDir[r] = ctx.GetConfig().System.GetRepoDatabaseDirPath(r.GetName())
|
||||||
|
ctx.Debugf("Loaded repository '%s' with template dir '%s' and repository dir '%s'", r.Name, res.TemplatesDir[r], res.RepoDir[r])
|
||||||
}
|
}
|
||||||
|
|
||||||
res.Repositories = repos
|
res.Repositories = repos
|
||||||
|
Reference in New Issue
Block a user