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

gen-manifests: resolve containers after Manifest()

Browse source 
Demonstrate the new workflow for resolving containers.

1. First call Manifest().
2. Get container SourceSpecs from manifest struct.
3. Resolve them.
4. Serialize() with resolved container specs.

The changes in the test manifests are just the information about the
container sources (was a slice but is now a map) and the actual manifest
object isn't affected.

The TestDistro_Manifest test in distro_test_common is adapted
accordingly as well.
This commit is contained in:
Achilleas Koutsou 2023-05-16 00:28:12 +02:00 • committed by Simon de Vlieger
parent 267a27a1a8
commit 620813123a
42 changed files with 799 additions and 703 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cmd/gen-manifests/main.go
View file

@ -156,12 +156,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
bp = blueprint.Blueprint(*cr.Blueprint)
}
containerSpecs, err := resolveContainers(bp.Containers, archName)
if err != nil {
return fmt.Errorf("[%s] container resolution failed: %s", filename, err.Error())
}
manifest, _, err := imgType.Manifest(&bp, options, repos, nil, containerSpecs, seedArg)
manifest, _, err := imgType.Manifest(&bp, options, repos, nil, nil, seedArg)
if err != nil {
err = fmt.Errorf("[%s] failed: %s", filename, err)
return
@ -180,7 +175,16 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
if cr.Blueprint != nil {
bp = blueprint.Blueprint(*cr.Blueprint)
}
mf, err := manifest.Serialize(packageSpecs, nil)
containerSpecs, err := resolvePipelineContainers(manifest.Content.Containers, archName)
if err != nil {
return fmt.Errorf("[%s] container resolution failed: %s", filename, err.Error())
}
mf, err := manifest.Serialize(packageSpecs, containerSpecs)
if err != nil {
return fmt.Errorf("[%s] manifest serialization failed: %s", filename, err.Error())
}
request := composeRequest{
Distro: distribution.Name(),
@ -253,16 +257,28 @@ func readRepos() DistroArchRepoMap {
return darm
}
func resolveContainers(containers []blueprint.Container, archName string) ([]container.Spec, error) {
func resolveContainers(containers []container.SourceSpec, archName string) ([]container.Spec, error) {
resolver := container.NewResolver(archName)
for _, c := range containers {
resolver.Add(container.SourceSpec(c))
resolver.Add(c)
}
return resolver.Finish()
}
func resolvePipelineContainers(containerSources map[string][]container.SourceSpec, archName string) (map[string][]container.Spec, error) {
containerSpecs := make(map[string][]container.Spec, len(containerSources))
for plName, sourceSpecs := range containerSources {
specs, err := resolveContainers(sourceSpecs, archName)
if err != nil {
return nil, err
}
containerSpecs[plName] = specs
}
return containerSpecs, nil
}
func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d distro.Distro, arch string) (map[string][]rpmmd.PackageSpec, error) {
solver := dnfjson.NewSolver(d.ModulePlatformID(), d.Releasever(), arch, d.Name(), cacheDir)
solver.SetDNFJSONPath("./dnf-json")
@ -277,12 +293,12 @@ func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d dist
return depsolvedSets, nil
}
func save(ms manifest.OSBuildManifest, pkgs map[string][]rpmmd.PackageSpec, containers []container.Spec, cr composeRequest, path, filename string) error {
func save(ms manifest.OSBuildManifest, pkgs map[string][]rpmmd.PackageSpec, containers map[string][]container.Spec, cr composeRequest, path, filename string) error {
data := struct {
ComposeRequest composeRequest `json:"compose-request"`
Manifest manifest.OSBuildManifest `json:"manifest"`
RPMMD map[string][]rpmmd.PackageSpec `json:"rpmmd"`
Containers []container.Spec `json:"containers,omitempty"`
Containers map[string][]container.Spec `json:"containers,omitempty"`
NoImageInfo bool `json:"no-image-info"`
}{
cr, ms, pkgs, containers, true,