From d16b188a4d9ea7c2cee05ed203bc6da4f7b21c55 Mon Sep 17 00:00:00 2001
From: Romain Geissler <romain.geissler@amadeus.com>
Date: Fri, 3 May 2024 13:28:58 +0000
Subject: Introduce a new "fedora-init" image, which is fedora + systemd.

This is similar to "ubi-init" on UBI/RHEL side.

Fixes BZ 2278884.
---
 VARIANTS.md                                     |  3 +-
 teams/cloud/container.xml                       | 38 ++++++++++++++++++++++++-
 tmt/plans/container/base/build-generic-init.fmf |  8 ++++++
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 tmt/plans/container/base/build-generic-init.fmf

diff --git a/VARIANTS.md b/VARIANTS.md
index 5d49b30..2cf470b 100644
--- a/VARIANTS.md
+++ b/VARIANTS.md
@@ -8,7 +8,8 @@
 |                                |            | `Cloud-Base-GCE`                 |
 | Base Cloud Edition for Vagrant | `oem`      | `Cloud-Base-Vagrant-libvirt`     |
 |                                |            | `Cloud-Base-Vagrant-VirtualBox`  |
-| Base Container                 | `oci`      | `Container-Base-Generic-Minimal` |
+| Base Container                 | `oci`      | `Container-Base-Generic-Init`    |
+|                                |            | `Container-Base-Generic-Minimal` |
 |                                |            | `Container-Base-Generic`         |
 | Toolbox Container              | `oci`      | `Container-Toolbox`              |
 | KDE Spin                       | `iso`      | `KDE-Live`                       |
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml
index 7118848..22ae0d7 100644
--- a/teams/cloud/container.xml
+++ b/teams/cloud/container.xml
@@ -8,6 +8,9 @@
 		<profile name="Container-Base-Generic" description="Generic Base Container Image">
 			<requires profile="ContainerCore"/>
 		</profile>
+		<profile name="Container-Base-Generic-Init" description="Generic Init Base Container Image">
+			<requires profile="ContainerCore"/>
+		</profile>
 		<profile name="Container-Toolbox" description="Toolbox Container Image"/>
 	</profiles>
 	<preferences profiles="Container-Base-Generic">
@@ -70,6 +73,34 @@
 		<rpm-locale-filtering>true</rpm-locale-filtering>
 		<rpm-excludedocs>true</rpm-excludedocs>
 	</preferences>
+	<preferences profiles="Container-Base-Generic-Init">
+		<type image="oci">
+			<containerconfig
+			  name="fedora-init"
+			  tag="rawhide"
+			  maintainer="Fedora Project Contributors &lt;devel@lists.fedoraproject.org&gt;"
+			>
+				<subcommand execute="/sbin/init"/>
+				<labels>
+					<label name="org.opencontainers.image.vendor" value="Fedora Project"/>
+					<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
+					<label name="org.opencontainers.image.license" value="MIT"/>
+					<label name="org.opencontainers.image.name" value="fedora-init"/>
+					<label name="org.opencontainers.image.version" value="rawhide"/>
+					<!-- Legacy attributes for backward compatibility -->
+					<label name="vendor" value="Fedora Project"/>
+					<label name="license" value="MIT"/>
+					<label name="name" value="fedora-init"/>
+					<label name="version" value="rawhide"/>
+				</labels>
+				<stopsignal>SIGRTMIN+3</stopsignal>
+			</containerconfig>
+		</type>
+		<timezone>Etc/UTC</timezone>
+		<locale>en_US</locale>
+		<rpm-locale-filtering>true</rpm-locale-filtering>
+		<rpm-excludedocs>true</rpm-excludedocs>
+	</preferences>
 	<preferences profiles="Container-Toolbox">
 		<type image="oci">
 			<containerconfig
@@ -133,7 +164,7 @@
 		<package name="dnf5"/>
 		<package name="glibc-minimal-langpack"/>
 	</packages>
-	<packages type="bootstrap" profiles="Container-Base-Generic">
+	<packages type="bootstrap" profiles="Container-Base-Generic,Container-Base-Generic-Init">
 		<ignore name="glibc-langpack-en"/>
 		<ignore name="langpacks-en"/>
 		<package name="bzip2"/>
@@ -149,6 +180,11 @@
 		<package name="xz"/>
 		<package name="zstd"/>
 	</packages>
+	<packages type="image" profiles="Container-Base-Generic-Init">
+		<package name="glibc-langpack-en"/>
+		<package name="kbd"/>
+		<package name="systemd"/>
+	</packages>
 	<packages type="bootstrap" patternType="plusRecommended" profiles="Container-Toolbox">
 		<ignore name="dosfstools"/>
 		<ignore name="e2fsprogs"/>
diff --git a/tmt/plans/container/base/build-generic-init.fmf b/tmt/plans/container/base/build-generic-init.fmf
new file mode 100644
index 0000000..6f17366
--- /dev/null
+++ b/tmt/plans/container/base/build-generic-init.fmf
@@ -0,0 +1,8 @@
+summary: Build Init Generic base container image
+discover:
+    how: fmf
+environment:
+    image_type: oci
+    image_profile: Container-Base-Generic-Init
+execute:
+    how: tmt
-- 
cgit v1.3.1+13