distro: add containers arg to ImageType.Manifest
This is the first step to support embedding container images. Here we add the `containers []container.Spec` argument to supply images with resolved container specifications. For now all distros will return an error in case a container is actually supplied since none of them currently support embedding containers. NB: also no apis or tools will actually resolve containers.
This commit is contained in:
parent
f8804358a4
commit
7f3f016ed1
21 changed files with 95 additions and 62 deletions
|
|
@ -128,7 +128,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
|
|||
// use default OSTreeRef for image type
|
||||
options.OSTree.Ref = imgType.OSTreeRef()
|
||||
}
|
||||
manifest, err := imgType.Manifest(cr.Blueprint.Customizations, options, repos, packageSpecs, seedArg)
|
||||
manifest, err := imgType.Manifest(cr.Blueprint.Customizations, options, repos, packageSpecs, nil, seedArg)
|
||||
if err != nil {
|
||||
return fmt.Errorf("[%s] failed: %s", filename, err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -186,6 +186,7 @@ func main() {
|
|||
options,
|
||||
repos,
|
||||
depsolvedSets,
|
||||
nil,
|
||||
seedArg)
|
||||
if err != nil {
|
||||
panic(err.Error())
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ func getManifest(bp blueprint.Blueprint, t distro.ImageType, a distro.Arch, d di
|
|||
}
|
||||
pkgSpecSets[name] = res
|
||||
}
|
||||
manifest, err := t.Manifest(bp.Customizations, distro.ImageOptions{}, repos, pkgSpecSets, 0)
|
||||
manifest, err := t.Manifest(bp.Customizations, distro.ImageOptions{}, repos, pkgSpecSets, nil, 0)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue