From ab4a3c088563e2860fdfef5349c0153f4f643b59 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Wed, 6 Jul 2022 16:55:30 +0100
Subject: [PATCH] manifest/commit_server: pull in nginx

nginx is a requirement for this pipeline to work.
---
 internal/distro/fedora/distro.go        | 4 +---
 internal/manifest/commit_server_tree.go | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/internal/distro/fedora/distro.go b/internal/distro/fedora/distro.go
index 83405feb1..e10de0ac0 100644
--- a/internal/distro/fedora/distro.go
+++ b/internal/distro/fedora/distro.go
@@ -94,9 +94,7 @@ var (
 		packageSets: map[string]packageSetFunc{
 			osPkgsKey: iotCommitPackageSet,
 			containerPkgsKey: func(t *imageType) rpmmd.PackageSet {
-				return rpmmd.PackageSet{
-					Include: []string{"nginx"},
-				}
+				return rpmmd.PackageSet{}
 			},
 		},
 		defaultImageConfig: &distro.ImageConfig{
diff --git a/internal/manifest/commit_server_tree.go b/internal/manifest/commit_server_tree.go
index 72d2a2f5d..ccb55f61c 100644
--- a/internal/manifest/commit_server_tree.go
+++ b/internal/manifest/commit_server_tree.go
@@ -55,7 +55,7 @@ func NewOSTreeCommitServerTreePipeline(m *Manifest,
 }
 
 func (p *OSTreeCommitServerTreePipeline) getPackageSetChain() []rpmmd.PackageSet {
-	packages := []string{}
+	packages := []string{"nginx"}
 	return []rpmmd.PackageSet{
 		{
 			Include:      append(packages, p.ExtraPackages...),