diff options
| author |  Neal Gompa <ngompa@fedoraproject.org>
| 2024-03-06 17:41:28 -0500 |
|---|---|---|
| committer | Neal Gompa <ngompa@fedoraproject.org>
| 2024-03-06 17:41:28 -0500 |
| commit | 0becdd4d43205b8eb136b4b1f9177c046d30a7a4 (patch) | |
| tree | e9cd513ab0a09cd46b75da12959fec17fbbeabb0 /teams/cloud | |
| parent | 31d0b2a70f4ba97b88451f877b7bbb7b4d964cc6 (diff) | |
| download | kiwi-descriptions-0becdd4d43205b8eb136b4b1f9177c046d30a7a4.tar.gz kiwi-descriptions-0becdd4d43205b8eb136b4b1f9177c046d30a7a4.zip | |
teams/cloud/container, tmt: Build the container images as OCI images
This incorporates the labels that are expected for Fedora images.
Diffstat (limited to 'teams/cloud')
| -rw-r--r-- | teams/cloud/container.xml | 68 |
1 files changed, 65 insertions, 3 deletions
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index 2291a51..c473bcf 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -12,15 +12,77 @@ <requires profile="ContainerCore"/> </profile> </profiles> - <preferences profiles="Container-Base-Generic-Minimal,Container-Base-Generic"> - <type image="tbz"/> + <preferences profiles="Container-Base-Generic"> + <type image="oci"> + <containerconfig + name="fedora" + tag="rawhide" + maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" + > + <subcommand execute="/bin/bash"/> + <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.version" value="rawhide"/> + <!-- Legacy attributes for backward compatibility --> + <label name="vendor" value="Fedora Project"/> + <label name="license" value="MIT"/> + <label name="version" value="rawhide"/> + </labels> + </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-Minimal"> + <type image="oci"> + <containerconfig + name="fedora-minimal" + tag="rawhide" + maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" + > + <subcommand execute="/bin/bash"/> + <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.version" value="rawhide"/> + <!-- Legacy attributes for backward compatibility --> + <label name="vendor" value="Fedora Project"/> + <label name="license" value="MIT"/> + <label name="version" value="rawhide"/> + </labels> + </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="tbz"/> + <type image="oci"> + <containerconfig + name="fedora-toolbox" + tag="rawhide" + maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" + > + <subcommand execute="/bin/bash"/> + <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.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="version" value="rawhide"/> + </labels> + </containerconfig> + </type> <timezone>Etc/UTC</timezone> <locale>en_US</locale> <rpm-locale-filtering>false</rpm-locale-filtering> |