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

gen-manifests: save resolved containers

Browse source 
Store resolved container info in the test manifests so that they can be
read in the manifest unit test.
This commit is contained in:
Achilleas Koutsou 2022-11-08 19:49:28 +01:00 • committed by Christian Kellner
parent bb75cc0947
commit 1fc1178dea
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -169,7 +169,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
Blueprint: cr.Blueprint,
OSTree: cr.OSTree,
}
err = save(manifest, packageSpecs, request, path, filename)
err = save(manifest, packageSpecs, containerSpecs, request, path, filename)
return
}
return job
@ -241,14 +241,15 @@ func depsolve(cacheDir string, imageType distro.ImageType, bp blueprint.Blueprin
return depsolvedSets, nil
}
func save(manifest distro.Manifest, pkgs map[string][]rpmmd.PackageSpec, cr composeRequest, path, filename string) error {
func save(manifest distro.Manifest, pkgs map[string][]rpmmd.PackageSpec, containers []container.Spec, cr composeRequest, path, filename string) error {
data := struct {
ComposeRequest composeRequest `json:"compose-request"`
Manifest distro.Manifest `json:"manifest"`
RPMMD map[string][]rpmmd.PackageSpec `json:"rpmmd"`
Containers []container.Spec `json:"containers,omitempty"`
NoImageInfo bool `json:"no-image-info"`
}{
cr, manifest, pkgs, true,
cr, manifest, pkgs, containers, true,
}
b, err := json.MarshalIndent(data, "", " ")
if err != nil {