deps: update images to v0.18.0
Update the images dependency to v0.18.0 This includes a change in the Fedora IoT remote configuration which is now installed through an RPM instead of being hard-coded in the image definitions.
This commit is contained in:
parent
bb76ddb2b1
commit
5b19bd6809
161 changed files with 17972 additions and 6525 deletions
43
vendor/github.com/osbuild/images/pkg/manifest/ostree_deployment.go
generated
vendored
43
vendor/github.com/osbuild/images/pkg/manifest/ostree_deployment.go
generated
vendored
|
|
@ -53,6 +53,8 @@ type OSTreeDeployment struct {
|
|||
|
||||
EnabledServices []string
|
||||
DisabledServices []string
|
||||
|
||||
FIPS bool
|
||||
}
|
||||
|
||||
// NewOSTreeDeployment creates a pipeline for an ostree deployment from a
|
||||
|
|
@ -160,6 +162,11 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
|
|||
)
|
||||
}
|
||||
|
||||
if p.FIPS {
|
||||
kernelOpts = append(kernelOpts, osbuild.GenFIPSKernelOptions(p.PartitionTable)...)
|
||||
p.Files = append(p.Files, osbuild.GenFIPSFiles()...)
|
||||
}
|
||||
|
||||
pipeline.AddStage(osbuild.NewOSTreeDeployStage(
|
||||
&osbuild.OSTreeDeployStageOptions{
|
||||
OsName: p.osName,
|
||||
|
|
@ -173,24 +180,21 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
|
|||
},
|
||||
))
|
||||
|
||||
remoteURL := p.Remote.URL
|
||||
if remoteURL == "" {
|
||||
// if the remote URL for the image is not specified, use the source commit URL
|
||||
remoteURL = commit.URL
|
||||
}
|
||||
pipeline.AddStage(osbuild.NewOSTreeRemotesStage(
|
||||
&osbuild.OSTreeRemotesStageOptions{
|
||||
Repo: "/ostree/repo",
|
||||
Remotes: []osbuild.OSTreeRemote{
|
||||
{
|
||||
Name: p.Remote.Name,
|
||||
URL: remoteURL,
|
||||
ContentURL: p.Remote.ContentURL,
|
||||
GPGKeyPaths: p.Remote.GPGKeyPaths,
|
||||
if p.Remote.URL != "" {
|
||||
pipeline.AddStage(osbuild.NewOSTreeRemotesStage(
|
||||
&osbuild.OSTreeRemotesStageOptions{
|
||||
Repo: "/ostree/repo",
|
||||
Remotes: []osbuild.OSTreeRemote{
|
||||
{
|
||||
Name: p.Remote.Name,
|
||||
URL: p.Remote.URL,
|
||||
ContentURL: p.Remote.ContentURL,
|
||||
GPGKeyPaths: p.Remote.GPGKeyPaths,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
))
|
||||
))
|
||||
}
|
||||
|
||||
pipeline.AddStage(osbuild.NewOSTreeFillvarStage(
|
||||
&osbuild.OSTreeFillvarStageOptions{
|
||||
|
|
@ -301,6 +305,13 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
|
|||
pipeline.AddStage(localeStage)
|
||||
}
|
||||
|
||||
if p.FIPS {
|
||||
for _, stage := range osbuild.GenFIPSStages() {
|
||||
stage.MountOSTree(p.osName, commit.Ref, 0)
|
||||
pipeline.AddStage(stage)
|
||||
}
|
||||
}
|
||||
|
||||
grubOptions := osbuild.NewGrub2StageOptionsUnified(p.PartitionTable,
|
||||
strings.Join(kernelOpts, " "),
|
||||
"",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue