Introduce a new "fedora-init" image, which is fedora + systemd.
This is similar to "ubi-init" on UBI/RHEL side. Fixes BZ 2278884.
This commit is contained in:
+2
-1
@@ -8,7 +8,8 @@
|
|||||||
| | | `Cloud-Base-GCE` |
|
| | | `Cloud-Base-GCE` |
|
||||||
| Base Cloud Edition for Vagrant | `oem` | `Cloud-Base-Vagrant-libvirt` |
|
| Base Cloud Edition for Vagrant | `oem` | `Cloud-Base-Vagrant-libvirt` |
|
||||||
| | | `Cloud-Base-Vagrant-VirtualBox` |
|
| | | `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` |
|
| | | `Container-Base-Generic` |
|
||||||
| Toolbox Container | `oci` | `Container-Toolbox` |
|
| Toolbox Container | `oci` | `Container-Toolbox` |
|
||||||
| KDE Spin | `iso` | `KDE-Live` |
|
| KDE Spin | `iso` | `KDE-Live` |
|
||||||
|
|||||||
@@ -8,6 +8,9 @@
|
|||||||
<profile name="Container-Base-Generic" description="Generic Base Container Image">
|
<profile name="Container-Base-Generic" description="Generic Base Container Image">
|
||||||
<requires profile="ContainerCore"/>
|
<requires profile="ContainerCore"/>
|
||||||
</profile>
|
</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"/>
|
<profile name="Container-Toolbox" description="Toolbox Container Image"/>
|
||||||
</profiles>
|
</profiles>
|
||||||
<preferences profiles="Container-Base-Generic">
|
<preferences profiles="Container-Base-Generic">
|
||||||
@@ -70,6 +73,34 @@
|
|||||||
<rpm-locale-filtering>true</rpm-locale-filtering>
|
<rpm-locale-filtering>true</rpm-locale-filtering>
|
||||||
<rpm-excludedocs>true</rpm-excludedocs>
|
<rpm-excludedocs>true</rpm-excludedocs>
|
||||||
</preferences>
|
</preferences>
|
||||||
|
<preferences profiles="Container-Base-Generic-Init">
|
||||||
|
<type image="oci">
|
||||||
|
<containerconfig
|
||||||
|
name="fedora-init"
|
||||||
|
tag="rawhide"
|
||||||
|
maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>"
|
||||||
|
>
|
||||||
|
<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">
|
<preferences profiles="Container-Toolbox">
|
||||||
<type image="oci">
|
<type image="oci">
|
||||||
<containerconfig
|
<containerconfig
|
||||||
@@ -133,7 +164,7 @@
|
|||||||
<package name="dnf5"/>
|
<package name="dnf5"/>
|
||||||
<package name="glibc-minimal-langpack"/>
|
<package name="glibc-minimal-langpack"/>
|
||||||
</packages>
|
</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="glibc-langpack-en"/>
|
||||||
<ignore name="langpacks-en"/>
|
<ignore name="langpacks-en"/>
|
||||||
<package name="bzip2"/>
|
<package name="bzip2"/>
|
||||||
@@ -149,6 +180,11 @@
|
|||||||
<package name="xz"/>
|
<package name="xz"/>
|
||||||
<package name="zstd"/>
|
<package name="zstd"/>
|
||||||
</packages>
|
</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">
|
<packages type="bootstrap" patternType="plusRecommended" profiles="Container-Toolbox">
|
||||||
<ignore name="dosfstools"/>
|
<ignore name="dosfstools"/>
|
||||||
<ignore name="e2fsprogs"/>
|
<ignore name="e2fsprogs"/>
|
||||||
|
|||||||
@@ -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
|
||||||
Reference in New Issue
Block a user