Diffstat (limited to 'teams/cloud/container.xml')
| -rw-r--r-- | teams/cloud/container.xml | 97 |
1 files changed, 68 insertions, 29 deletions
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index 2700049..8b4b963 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"> @@ -21,15 +24,14 @@ <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"/> + <label name="org.opencontainers.image.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora"/> <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"/> - <label name="version" value="rawhide"/> </labels> + <environment> + <env name="container" value="oci"/> + <env name="PATH" value="/usr/local/bin:/usr/bin"/> + </environment> </containerconfig> </type> <timezone>Etc/UTC</timezone> @@ -48,15 +50,37 @@ <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-minimal"/> + <label name="org.opencontainers.image.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora-minimal"/> <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-minimal"/> - <label name="version" value="rawhide"/> </labels> + <environment> + <env name="container" value="oci"/> + <env name="PATH" value="/usr/local/bin:/usr/bin"/> + </environment> + </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-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.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora-init"/> + <label name="org.opencontainers.image.version" value="rawhide"/> + </labels> + <stopsignal>SIGRTMIN+3</stopsignal> </containerconfig> </type> <timezone>Etc/UTC</timezone> @@ -75,16 +99,15 @@ <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-toolbox"/> + <label name="org.opencontainers.image.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora-toolbox"/> <label name="org.opencontainers.image.version" value="rawhide"/> <label name="com.github.containers.toolbox" value="true"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="name" value="fedora-toolbox"/> - <label name="version" value="rawhide"/> </labels> + <environment> + <env name="container" value="oci"/> + <env name="PATH" value="/usr/local/bin:/usr/bin"/> + </environment> </containerconfig> </type> <timezone>Etc/UTC</timezone> @@ -115,16 +138,22 @@ <package name="bash"/> <package name="coreutils"/> <package name="rpm"/> + <package name="shadow-utils"/> <package name="util-linux-core"/> + <package name="gawk"/> </packages> <packages type="bootstrap" profiles="Container-Base-Generic-Minimal"> <ignore name="glibc-langpack-en"/> <ignore name="langpacks-en"/> <ignore name="tzdata"/> - <package name="microdnf"/> + <package name="dnf5"/> <package name="glibc-minimal-langpack"/> + <package name="systemd-standalone-sysusers"/> </packages> <packages type="bootstrap" profiles="Container-Base-Generic"> + <package name="systemd-standalone-sysusers"/> + </packages> + <packages type="bootstrap" profiles="Container-Base-Generic,Container-Base-Generic-Init"> <ignore name="glibc-langpack-en"/> <ignore name="langpacks-en"/> <package name="bzip2"/> @@ -133,13 +162,18 @@ <package name="rootfiles"/> <package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 --> <package name="vim-minimal"/> - <package name="dnf"/> - <package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 --> + <package name="dnf5"/> + <package name="dnf5-plugins"/> <package name="glibc-minimal-langpack"/> <package name="tzdata"/> <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"/> @@ -169,9 +203,8 @@ <package name="curl"/> <package name="default-editor"/> <package name="diffutils"/> - <package name="dnf"/> - <package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 --> - <package name="dnf-plugins-core"/> + <package name="dnf5"/> + <package name="dnf5-plugins"/> <package name="fedora-release-toolbx"/> <package name="file"/> <package name="findutils"/> @@ -198,15 +231,15 @@ <package name="man-db"/> <package name="man-pages"/> <package name="mesa-dri-drivers"/> - <package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64"/> <!-- doesn't exist in s390x --> <package name="mesa-vulkan-drivers"/> <package name="mtr"/> <package name="nss-mdns"/> <package name="openssh-clients"/> <package name="openssl"/> - <package name="p11-kit"/> + <package name="p11-kit-client"/> <package name="pam"/> <package name="pigz"/> + <package name="policycoreutils"/> <package name="procps-ng"/> <package name="psmisc"/> <package name="python3"/> @@ -241,4 +274,10 @@ <package name="systemd-resolved"/> <package name="xkeyboard-config"/> </packages> + <packages type="bootstrap" profiles="Container-Base-Generic-Minimal,Container-Base-Generic,Container-Toolbox"> + <package name="systemd-standalone-tmpfiles"/> + </packages> + <packages type="uninstall" profiles="Container-Base-Generic-Minimal,Container-Base-Generic,Container-Toolbox"> + <package name="systemd-standalone-tmpfiles"/> + </packages> </image> |