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

manifest/commit_server: pull in nginx

Browse source 
nginx is a requirement for this pipeline to work.
This commit is contained in:
Tom Gundersen 2022-07-06 16:55:30 +01:00
parent 452cb2dae9
commit ab4a3c0885
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/distro/fedora/distro.go
View file

@ -94,9 +94,7 @@ var (
packageSets: map[string]packageSetFunc{ packageSets: map[string]packageSetFunc{
osPkgsKey: iotCommitPackageSet, osPkgsKey: iotCommitPackageSet,
containerPkgsKey: func(t *imageType) rpmmd.PackageSet { containerPkgsKey: func(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{ return rpmmd.PackageSet{}
Include: []string{"nginx"},
}
}, },
}, },
defaultImageConfig: &distro.ImageConfig{ defaultImageConfig: &distro.ImageConfig{

2
internal/manifest/commit_server_tree.go
View file

@ -55,7 +55,7 @@ func NewOSTreeCommitServerTreePipeline(m *Manifest,
} }
func (p *OSTreeCommitServerTreePipeline) getPackageSetChain() []rpmmd.PackageSet { func (p *OSTreeCommitServerTreePipeline) getPackageSetChain() []rpmmd.PackageSet {
packages := []string{} packages := []string{"nginx"}
return []rpmmd.PackageSet{ return []rpmmd.PackageSet{
{ {
Include: append(packages, p.ExtraPackages...), Include: append(packages, p.ExtraPackages...),