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

image: make ostree commit mandatory in the OSTreeRawImage

Browse source 
Make the ostree commit spec mandatory in the OSTreeRawImage by adding it
to the constructor.

Use the ostree.CommitSpec to specify parameters in the OSTreeRawImage
ImageKind and the OSTreeDeployment Pipeline.
This commit is contained in:
Achilleas Koutsou 2022-09-30 16:38:22 +02:00 • committed by Tomáš Hozza
parent 5f98d7082c
commit 4ae8304bd2
3 changed files with 32 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/image/ostree_raw.go
View file

@ -24,9 +24,7 @@ type OSTreeRawImage struct {
Users []users.User
Groups []users.Group
OSTreeURL string
OSTreeRef string
OSTreeCommit string
Commit ostree.CommitSpec
Remote ostree.Remote
OSName string
@ -38,9 +36,10 @@ type OSTreeRawImage struct {
Filename string
}
func NewOSTreeRawImage() *OSTreeRawImage {
func NewOSTreeRawImage(commit ostree.CommitSpec) *OSTreeRawImage {
return &OSTreeRawImage{
Base: NewBase("ostree-raw-image"),
Base: NewBase("ostree-raw-image"),
Commit: commit,
}
}
@ -51,7 +50,7 @@ func (img *OSTreeRawImage) InstantiateManifest(m *manifest.Manifest,
buildPipeline := manifest.NewBuild(m, runner, repos)
buildPipeline.Checkpoint()
osPipeline := manifest.NewOSTreeDeployment(m, buildPipeline, img.OSTreeRef, img.OSTreeCommit, img.OSTreeURL, img.OSName, img.Platform)
osPipeline := manifest.NewOSTreeDeployment(m, buildPipeline, img.Commit, img.OSName, img.Platform)
osPipeline.PartitionTable = img.PartitionTable
osPipeline.Remote = img.Remote
osPipeline.KernelOptionsAppend = img.KernelOptionsAppend