| -rw-r--r-- | VARIANTS.md | 3 | ||||
| -rw-r--r-- | teams/cloud/container.xml | 38 | ||||
| -rw-r--r-- | tmt/plans/container/base/build-generic-init.fmf | 8 |
3 files changed, 2 insertions, 47 deletions
diff --git a/VARIANTS.md b/VARIANTS.md index 2cf470b..5d49b30 100644 --- a/VARIANTS.md +++ b/VARIANTS.md @@ -8,8 +8,7 @@ | | | `Cloud-Base-GCE` | | Base Cloud Edition for Vagrant | `oem` | `Cloud-Base-Vagrant-libvirt` | | | | `Cloud-Base-Vagrant-VirtualBox` | -| Base Container | `oci` | `Container-Base-Generic-Init` | -| | | `Container-Base-Generic-Minimal` | +| Base Container | `oci` | `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 22ae0d7..7118848 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -8,9 +8,6 @@ <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"> @@ -73,34 +70,6 @@ <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 <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"> <type image="oci"> <containerconfig @@ -164,7 +133,7 @@ <package name="dnf5"/> <package name="glibc-minimal-langpack"/> </packages> - <packages type="bootstrap" profiles="Container-Base-Generic,Container-Base-Generic-Init"> + <packages type="bootstrap" profiles="Container-Base-Generic"> <ignore name="glibc-langpack-en"/> <ignore name="langpacks-en"/> <package name="bzip2"/> @@ -180,11 +149,6 @@ <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 deleted file mode 100644 index 6f17366..0000000 --- a/tmt/plans/container/base/build-generic-init.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build Init Generic base container image -discover: - how: fmf -environment: - image_type: oci - image_profile: Container-Base-Generic-Init -execute: - how: tmt |