davidlt/fedora-kiwi-descriptions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce a new "fedora-init" image, which is fedora + systemd.

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

Fixes BZ 2278884.
This commit is contained in:
Romain Geissler 2024-05-03 13:28:58 +00:00 committed by ngompa
parent 0f501932e7
commit d16b188a4d
3 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VARIANTS.md
View File

@ -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` |

38
teams/cloud/container.xml
View File

@ -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"/>

8
tmt/plans/container/base/build-generic-init.fmf Normal file
View File

@ -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