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

osbuild: support generating container sources

Browse source 
Modify the existing `GenSources` helper to also support generating
`org.osbuild.skopeo` source for fetching container images.
This commit is contained in:
Christian Kellner 2022-07-06 11:19:47 +02:00 • committed by Ondřej Budai
parent 7f3f016ed1
commit 49b37d672b
5 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel7/distro.go
View file

@ -423,7 +423,7 @@ func (t *imageType) Manifest(customizations *blueprint.Customizations,
osbuild.Manifest{ osbuild.Manifest{
Version: "2", Version: "2",
Pipelines: pipelines, Pipelines: pipelines,
Sources: osbuild.GenSources(allPackageSpecs, nil, nil), Sources: osbuild.GenSources(allPackageSpecs, nil, nil, containers),
}, },
) )
} }

2
internal/distro/rhel8/distro.go
View file

@ -554,7 +554,7 @@ func (t *imageType) Manifest(customizations *blueprint.Customizations,
osbuild.Manifest{ osbuild.Manifest{
Version: "2", Version: "2",
Pipelines: pipelines, Pipelines: pipelines,
Sources: osbuild.GenSources(allPackageSpecs, commits, inlineData), Sources: osbuild.GenSources(allPackageSpecs, commits, inlineData, containers),
}, },
) )
} }

2
internal/distro/rhel90/distro.go
View file

@ -488,7 +488,7 @@ func (t *imageType) Manifest(customizations *blueprint.Customizations,
osbuild.Manifest{ osbuild.Manifest{
Version: "2", Version: "2",
Pipelines: pipelines, Pipelines: pipelines,
Sources: osbuild.GenSources(allPackageSpecs, commits, inlineData), Sources: osbuild.GenSources(allPackageSpecs, commits, inlineData, containers),
}, },
) )
} }

2
internal/manifest/manifest.go
View file

@ -84,7 +84,7 @@ func (m Manifest) Serialize(packageSets map[string][]rpmmd.PackageSpec) (distro.
osbuild.Manifest{ osbuild.Manifest{
Version: "2", Version: "2",
Pipelines: pipelines, Pipelines: pipelines,
Sources: osbuild.GenSources(packages, commits, inline), Sources: osbuild.GenSources(packages, commits, inline, nil),
}, },
) )
} }

12
internal/osbuild/source.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/osbuild/osbuild-composer/internal/container"
"github.com/osbuild/osbuild-composer/internal/ostree" "github.com/osbuild/osbuild-composer/internal/ostree"
"github.com/osbuild/osbuild-composer/internal/rpmmd" "github.com/osbuild/osbuild-composer/internal/rpmmd"
) )
@ -53,7 +54,7 @@ func (sources *Sources) UnmarshalJSON(data []byte) error {
return nil return nil
} }
func GenSources(packages []rpmmd.PackageSpec, ostreeCommits []ostree.CommitSource, inlineData []string) Sources { func GenSources(packages []rpmmd.PackageSpec, ostreeCommits []ostree.CommitSource, inlineData []string, containers []container.Spec) Sources {
sources := Sources{} sources := Sources{}
curl := &CurlSource{ curl := &CurlSource{
Items: make(map[string]CurlSourceItem), Items: make(map[string]CurlSourceItem),
@ -94,5 +95,14 @@ func GenSources(packages []rpmmd.PackageSpec, ostreeCommits []ostree.CommitSourc
sources["org.osbuild.inline"] = ils sources["org.osbuild.inline"] = ils
} }
skopeo := NewSkopeoSource()
for _, c := range containers {
skopeo.AddItem(c.Source, c.Digest, c.ImageID, c.TLSVerify)
}
if len(skopeo.Items) > 0 {
sources["org.osbuild.skopeo"] = skopeo
}
return sources return sources
} }