966aec464a
When initialising a manifest, use the ostree commit source spec only. Then, when serialising, use the resolved ostree commit. This is the same process we use for the other content types, packages and containers. Two new functions are defined in the distros to handle resolving the ostree options: one for creating the parent commit source spec and image ref for image types that have an optional parent commit (ostree commits and containers) and one for creating the payload commit source spec for image types that require an ostree payload (ostree raw images and installers).
107 lines
3.1 KiB
Go
107 lines
3.1 KiB
Go
package image
|
|
|
|
import (
|
|
"fmt"
|
|
"math/rand"
|
|
|
|
"github.com/osbuild/osbuild-composer/internal/artifact"
|
|
"github.com/osbuild/osbuild-composer/internal/disk"
|
|
"github.com/osbuild/osbuild-composer/internal/fsnode"
|
|
"github.com/osbuild/osbuild-composer/internal/manifest"
|
|
"github.com/osbuild/osbuild-composer/internal/ostree"
|
|
"github.com/osbuild/osbuild-composer/internal/platform"
|
|
"github.com/osbuild/osbuild-composer/internal/rpmmd"
|
|
"github.com/osbuild/osbuild-composer/internal/runner"
|
|
"github.com/osbuild/osbuild-composer/internal/users"
|
|
"github.com/osbuild/osbuild-composer/internal/workload"
|
|
)
|
|
|
|
type OSTreeRawImage struct {
|
|
Base
|
|
|
|
Platform platform.Platform
|
|
Workload workload.Workload
|
|
PartitionTable *disk.PartitionTable
|
|
|
|
Users []users.User
|
|
Groups []users.Group
|
|
|
|
CommitSource ostree.SourceSpec
|
|
|
|
SysrootReadOnly bool
|
|
|
|
Remote ostree.Remote
|
|
OSName string
|
|
|
|
KernelOptionsAppend []string
|
|
Keyboard string
|
|
Locale string
|
|
|
|
Filename string
|
|
|
|
Compression string
|
|
|
|
Ignition bool
|
|
|
|
Directories []*fsnode.Directory
|
|
Files []*fsnode.File
|
|
}
|
|
|
|
func NewOSTreeRawImage(commit ostree.SourceSpec) *OSTreeRawImage {
|
|
return &OSTreeRawImage{
|
|
Base: NewBase("ostree-raw-image"),
|
|
CommitSource: commit,
|
|
}
|
|
}
|
|
|
|
func ostreeCompressedImagePipelines(img *OSTreeRawImage, m *manifest.Manifest, buildPipeline *manifest.Build) *manifest.XZ {
|
|
imagePipeline := baseRawOstreeImage(img, m, buildPipeline)
|
|
|
|
xzPipeline := manifest.NewXZ(m, buildPipeline, imagePipeline)
|
|
xzPipeline.Filename = img.Filename
|
|
|
|
return xzPipeline
|
|
}
|
|
|
|
func baseRawOstreeImage(img *OSTreeRawImage, m *manifest.Manifest, buildPipeline *manifest.Build) *manifest.RawOSTreeImage {
|
|
osPipeline := manifest.NewOSTreeDeployment(m, buildPipeline, img.CommitSource, img.OSName, img.Ignition, img.Platform)
|
|
osPipeline.PartitionTable = img.PartitionTable
|
|
osPipeline.Remote = img.Remote
|
|
osPipeline.KernelOptionsAppend = img.KernelOptionsAppend
|
|
osPipeline.Keyboard = img.Keyboard
|
|
osPipeline.Locale = img.Locale
|
|
osPipeline.Users = img.Users
|
|
osPipeline.Groups = img.Groups
|
|
osPipeline.SysrootReadOnly = img.SysrootReadOnly
|
|
osPipeline.Directories = img.Directories
|
|
osPipeline.Files = img.Files
|
|
|
|
// other image types (e.g. live) pass the workload to the pipeline.
|
|
osPipeline.EnabledServices = img.Workload.GetServices()
|
|
osPipeline.DisabledServices = img.Workload.GetDisabledServices()
|
|
|
|
return manifest.NewRawOStreeImage(m, buildPipeline, img.Platform, osPipeline)
|
|
}
|
|
|
|
func (img *OSTreeRawImage) InstantiateManifest(m *manifest.Manifest,
|
|
repos []rpmmd.RepoConfig,
|
|
runner runner.Runner,
|
|
rng *rand.Rand) (*artifact.Artifact, error) {
|
|
buildPipeline := manifest.NewBuild(m, runner, repos)
|
|
buildPipeline.Checkpoint()
|
|
|
|
var art *artifact.Artifact
|
|
switch img.Compression {
|
|
case "xz":
|
|
ostreeCompressed := ostreeCompressedImagePipelines(img, m, buildPipeline)
|
|
art = ostreeCompressed.Export()
|
|
case "":
|
|
ostreeBase := baseRawOstreeImage(img, m, buildPipeline)
|
|
ostreeBase.Filename = img.Filename
|
|
art = ostreeBase.Export()
|
|
default:
|
|
panic(fmt.Sprintf("unsupported compression type %q on %q", img.Compression, img.name))
|
|
}
|
|
|
|
return art, nil
|
|
}
|