1de55c73e6
A new struct in ostree can be used to define configuration options for the ostree remote of an image. So far remotes were always set up with the remote URL used to pull the commit. Now we support setting a different remote with extra configuration options. This is used by the fedora-iot-raw-image to set up the remote configuration of the final image, separately from the source of the commit. Test manifests updated.
65 lines
1.7 KiB
Go
65 lines
1.7 KiB
Go
package image
|
|
|
|
import (
|
|
"math/rand"
|
|
|
|
"github.com/osbuild/osbuild-composer/internal/artifact"
|
|
"github.com/osbuild/osbuild-composer/internal/disk"
|
|
"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/workload"
|
|
)
|
|
|
|
type OSTreeRawImage struct {
|
|
Base
|
|
|
|
Platform platform.Platform
|
|
Workload workload.Workload
|
|
PartitionTable *disk.PartitionTable
|
|
|
|
OSTreeURL string
|
|
OSTreeRef string
|
|
OSTreeCommit string
|
|
|
|
Remote ostree.Remote
|
|
OSName string
|
|
|
|
KernelOptionsAppend []string
|
|
Keyboard string
|
|
Locale string
|
|
|
|
Filename string
|
|
}
|
|
|
|
func NewOSTreeRawImage() *OSTreeRawImage {
|
|
return &OSTreeRawImage{
|
|
Base: NewBase("ostree-raw-image"),
|
|
}
|
|
}
|
|
|
|
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()
|
|
|
|
osPipeline := manifest.NewOSTreeDeployment(m, buildPipeline, img.OSTreeRef, img.OSTreeCommit, img.OSTreeURL, img.OSName, img.Platform)
|
|
osPipeline.PartitionTable = img.PartitionTable
|
|
osPipeline.Remote = img.Remote
|
|
osPipeline.KernelOptionsAppend = img.KernelOptionsAppend
|
|
osPipeline.Keyboard = img.Keyboard
|
|
osPipeline.Locale = img.Locale
|
|
|
|
imagePipeline := manifest.NewRawOStreeImage(m, buildPipeline, img.Platform, osPipeline)
|
|
|
|
xzPipeline := manifest.NewXZ(m, buildPipeline, imagePipeline)
|
|
xzPipeline.Filename = img.Filename
|
|
|
|
art := xzPipeline.Export()
|
|
|
|
return art, nil
|
|
}
|