particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

image: separate raw image pipeline from InstantiateManifest

Browse source 
Make the pipeline code a reusable function so we can use it in multiple
images (edge-raw-image and edge-simplified-installer).
This commit is contained in:
Achilleas Koutsou 2022-12-01 19:45:02 +01:00 • committed by Tom Gundersen
parent bc4583eb81
commit 8d36e048bc
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
internal/image/ostree_raw.go
View file

@ -45,13 +45,7 @@ func NewOSTreeRawImage(commit ostree.CommitSpec) *OSTreeRawImage {
}
}
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()
func ostreeCompressedImagePipelines(img *OSTreeRawImage, m *manifest.Manifest, buildPipeline *manifest.Build) *manifest.XZ {
osPipeline := manifest.NewOSTreeDeployment(m, buildPipeline, img.Commit, img.OSName, img.Platform)
osPipeline.PartitionTable = img.PartitionTable
osPipeline.Remote = img.Remote
@ -67,7 +61,18 @@ func (img *OSTreeRawImage) InstantiateManifest(m *manifest.Manifest,
xzPipeline := manifest.NewXZ(m, buildPipeline, imagePipeline)
xzPipeline.Filename = img.Filename
art := xzPipeline.Export()
return xzPipeline
}
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()
xzPipeline := ostreeCompressedImagePipelines(img, m, buildPipeline)
art := xzPipeline.Export()
return art, nil
}