particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move RepoRegistry setup into Composer

Browse source 
This is so that both the weldr and cloud api's can use it as the source
of their repositories.
This commit is contained in:
Brian C. Lane 2024-02-02 16:15:09 -08:00 • committed by Brian C. Lane
parent f660ed65b6
commit b8967d53bc
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/osbuild-composer/composer.go
View file

@ -23,6 +23,7 @@ import (
"github.com/osbuild/images/pkg/distrofactory"
"github.com/osbuild/images/pkg/dnfjson"
"github.com/osbuild/images/pkg/reporegistry"
"github.com/osbuild/osbuild-composer/internal/auth"
"github.com/osbuild/osbuild-composer/internal/cloudapi"
v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
@ -37,6 +38,7 @@ type Composer struct {
cacheDir string
logger *log.Logger
distros *distrofactory.Factory
repos *reporegistry.RepoRegistry
solver *dnfjson.BaseSolver
@ -74,9 +76,17 @@ func NewComposer(config *ComposerConfigFile, stateDir, cacheDir string) (*Compos
return nil, fmt.Errorf("failed to configure distro aliases: %v", err)
}
c.repos, err = reporegistry.New(repositoryConfigs)
if err != nil {
return nil, fmt.Errorf("error loading repository definitions: %v", err)
}
c.solver = dnfjson.NewBaseSolver(path.Join(c.cacheDir, "rpmmd"))
c.solver.SetDNFJSONPath(c.config.DNFJson)
// Clean up the cache, removes unknown distros and files
c.solver.CleanupOldCacheDirs(c.repos.ListDistros())
var jobs jobqueue.JobQueue
if config.Worker.PGDatabase != "" {
dbURL := fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=%s",
@ -117,9 +127,8 @@ func NewComposer(config *ComposerConfigFile, stateDir, cacheDir string) (*Compos
return &c, nil
}
func (c *Composer) InitWeldr(repoPaths []string, weldrListener net.Listener,
distrosImageTypeDenylist map[string][]string) (err error) {
c.weldr, err = weldr.New(repoPaths, c.stateDir, c.solver, c.distros, c.logger, c.workers, distrosImageTypeDenylist)
func (c *Composer) InitWeldr(weldrListener net.Listener, distrosImageTypeDenylist map[string][]string) (err error) {
c.weldr, err = weldr.New(c.repos, c.stateDir, c.solver, c.distros, c.logger, c.workers, distrosImageTypeDenylist)
if err != nil {
return err
}

2
cmd/osbuild-composer/main.go
View file

@ -114,7 +114,7 @@ func main() {
logrus.Fatal("The osbuild-composer.socket unit is misconfigured. It should contain two sockets.")
}
err = composer.InitWeldr(repositoryConfigs, l[0], config.weldrDistrosImageTypeDenyList())
err = composer.InitWeldr(l[0], config.weldrDistrosImageTypeDenyList())
if err != nil {
logrus.Fatalf("Error initializing weldr API: %v", err)
}