Diffstat (limited to 'teams/cloud/container.xml')
| -rw-r--r-- | teams/cloud/container.xml | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index 59a7b45..c473bcf 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -8,7 +8,9 @@ <profile name="Container-Base-Generic" description="Generic Base Container Image"> <requires profile="ContainerCore"/> </profile> - <profile name="Container-Toolbox" description="Toolbox Container Image"/> + <profile name="Container-Toolbox" description="Toolbox Container Image"> + <requires profile="ContainerCore"/> + </profile> </profiles> <preferences profiles="Container-Base-Generic"> <type image="oci"> @@ -129,30 +131,15 @@ <package name="glibc-minimal-langpack"/> <package name="tzdata"/> </packages> - <packages type="bootstrap" patternType="plusRecommended" profiles="Container-Toolbox"> - <ignore name="dosfstools"/> - <ignore name="e2fsprogs"/> - <ignore name="*-firmware"/> - <ignore name="fuse-libs"/> - <ignore name="geolite2-city"/> - <ignore name="geolite2-country"/> - <ignore name="grubby"/> - <ignore name="kernel"/> - <ignore name="libss"/> <!-- used by e2fsprogs --> - <ignore name="pinentry"/> - <ignore name="shared-mime-info"/> - <ignore name="sssd-client"/> + <packages type="image" patternType="plusRecommended" profiles="Container-Toolbox"> <!-- This is a weak dep of systemd, we do not want this in the container; see: https://github.com/containers/toolbox/issues/1410 --> <ignore name="systemd-resolved"/> - <ignore name="trousers"/> - <ignore name="xkeyboard-config"/> <package name="acl"/> <package name="bash"/> <package name="bash-completion"/> <package name="bc"/> <package name="bzip2"/> - <package name="coreutils"/> <package name="coreutils-common"/> <package name="curl"/> <package name="default-editor"/> @@ -160,7 +147,6 @@ <package name="dnf"/> <package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 --> <package name="dnf-plugins-core"/> - <package name="fedora-release-container"/> <package name="findutils"/> <package name="flatpak-spawn"/> <package name="fpaste"/> @@ -175,7 +161,6 @@ <package name="hostname"/> <package name="iproute"/> <package name="iputils"/> - <package name="kbd-misc"/> <package name="keyutils"/> <package name="krb5-libs"/> <package name="less"/> @@ -198,7 +183,6 @@ <package name="psmisc"/> <package name="python3"/> <package name="rootfiles"/> - <package name="rpm"/> <package name="rsync"/> <package name="sed"/> <package name="shadow-utils"/> @@ -224,10 +208,4 @@ <package name="zip"/> <package name="zstd"/> </packages> - <packages type="uninstall" profiles="Container-Toolbox"> - <package name="kbd-misc"/> - <package name="pinentry"/> - <package name="systemd-resolved"/> - <package name="xkeyboard-config"/> - </packages> </image> |