cmd/gen-manifests: fix compilation with the latest images
The latest images introduced a new blueprint option: minimal. Since we use direct type-conversion, we need to add it also in gen-manifests. A warning is also added, since this feature is considered experimental. Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
parent
19edaca01a
commit
b228886fe1
1 changed files with 7 additions and 0 deletions
|
|
@ -25,6 +25,7 @@ import (
|
|||
"github.com/osbuild/images/pkg/ostree"
|
||||
"github.com/osbuild/images/pkg/rhsm/facts"
|
||||
"github.com/osbuild/images/pkg/rpmmd"
|
||||
|
||||
"github.com/osbuild/osbuild-composer/internal/dnfjson"
|
||||
)
|
||||
|
||||
|
|
@ -73,6 +74,9 @@ type crBlueprint struct {
|
|||
Containers []blueprint.Container `json:"containers,omitempty"`
|
||||
Customizations *blueprint.Customizations `json:"customizations,omitempty"`
|
||||
Distro string `json:"distro,omitempty"`
|
||||
|
||||
// EXPERIMENTAL
|
||||
Minimal bool `json:"minimal,omitempty"`
|
||||
}
|
||||
|
||||
type composeRequest struct {
|
||||
|
|
@ -150,6 +154,9 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
|
|||
var bp blueprint.Blueprint
|
||||
if cr.Blueprint != nil {
|
||||
bp = blueprint.Blueprint(*cr.Blueprint)
|
||||
if bp.Minimal {
|
||||
msgq <- fmt.Sprintf("[%s] blueprint contains minimal=true, this is considered EXPERIMENTAL", filename)
|
||||
}
|
||||
}
|
||||
|
||||
manifest, _, err := imgType.Manifest(&bp, options, repos, seedArg)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue