Update osbuild/images to v0.41.0
Multiple blueprint fixes: - Extend the blueprint service customizations to accept services to be masked. - The `storage-path` and `container-transport` fields were removed in imagees 41.0 in order to simplify the way local storage containers are handled.
This commit is contained in:
parent
4e504f7905
commit
f6b76cce31
50 changed files with 615 additions and 529 deletions
20
vendor/github.com/osbuild/images/pkg/manifest/os.go
generated
vendored
20
vendor/github.com/osbuild/images/pkg/manifest/os.go
generated
vendored
|
|
@ -77,6 +77,7 @@ type OSCustomizations struct {
|
|||
Timezone string
|
||||
EnabledServices []string
|
||||
DisabledServices []string
|
||||
MaskedServices []string
|
||||
DefaultTarget string
|
||||
|
||||
// SELinux policy, when set it enables the labeling of the tree with the
|
||||
|
|
@ -405,21 +406,14 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
}
|
||||
|
||||
if len(p.containerSpecs) > 0 {
|
||||
images := osbuild.NewContainersInputForSources(p.containerSpecs)
|
||||
|
||||
var storagePath string
|
||||
|
||||
if containerStore := p.OSCustomizations.ContainersStorage; containerStore != nil {
|
||||
storagePath = *containerStore
|
||||
storageConf := "/etc/containers/storage.conf"
|
||||
|
||||
containerStoreOpts := osbuild.NewContainerStorageOptions(storageConf, storagePath)
|
||||
pipeline.AddStage(osbuild.NewContainersStorageConfStage(containerStoreOpts))
|
||||
}
|
||||
|
||||
manifests := osbuild.NewFilesInputForManifestLists(p.containerSpecs)
|
||||
skopeo := osbuild.NewSkopeoStageWithContainersStorage(storagePath, images, manifests)
|
||||
pipeline.AddStage(skopeo)
|
||||
for _, stage := range osbuild.GenContainerStorageStages(storagePath, p.containerSpecs) {
|
||||
pipeline.AddStage(stage)
|
||||
}
|
||||
}
|
||||
|
||||
pipeline.AddStage(osbuild.NewLocaleStage(&osbuild.LocaleStageOptions{Language: p.Language}))
|
||||
|
|
@ -706,8 +700,10 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
|
||||
enabledServices := []string{}
|
||||
disabledServices := []string{}
|
||||
maskedServices := []string{}
|
||||
enabledServices = append(enabledServices, p.EnabledServices...)
|
||||
disabledServices = append(disabledServices, p.DisabledServices...)
|
||||
maskedServices = append(maskedServices, p.MaskedServices...)
|
||||
if p.Environment != nil {
|
||||
enabledServices = append(enabledServices, p.Environment.GetServices()...)
|
||||
}
|
||||
|
|
@ -716,10 +712,12 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
disabledServices = append(disabledServices, p.Workload.GetDisabledServices()...)
|
||||
}
|
||||
if len(enabledServices) != 0 ||
|
||||
len(disabledServices) != 0 || p.DefaultTarget != "" {
|
||||
len(disabledServices) != 0 ||
|
||||
len(maskedServices) != 0 || p.DefaultTarget != "" {
|
||||
pipeline.AddStage(osbuild.NewSystemdStage(&osbuild.SystemdStageOptions{
|
||||
EnabledServices: enabledServices,
|
||||
DisabledServices: disabledServices,
|
||||
MaskedServices: maskedServices,
|
||||
DefaultTarget: p.DefaultTarget,
|
||||
}))
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue