h21/HoralOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

teams/cloud/container, tmt: Build the container images as OCI images

Browse Source 
This incorporates the labels that are expected for Fedora images.
This commit is contained in:
Neal Gompa
2024-03-06 17:41:28 -05:00
parent 31d0b2a70f
commit 0becdd4d43
4 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
teams/cloud/container.xml
+65 -3
View File
@@ -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 &lt;devel@lists.fedoraproject.org&gt;"
>
<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 &lt;devel@lists.fedoraproject.org&gt;"
>
<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 &lt;devel@lists.fedoraproject.org&gt;"
>
<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>
tmt/plans/container/base/build-generic-minimal.fmf
+1 -1
View File
@@ -2,7 +2,7 @@ summary: Build Minimal Generic base container image
discover:
how: fmf
environment:
image_type: tbz
image_type: oci
image_profile: Container-Base-Generic-Minimal
execute:
how: tmt
tmt/plans/container/base/build-generic.fmf
+1 -1
View File
@@ -2,7 +2,7 @@ summary: Build Generic base container image
discover:
how: fmf
environment:
image_type: tbz
image_type: oci
image_profile: Container-Base-Generic
execute:
how: tmt
tmt/plans/container/toolbox/build-toolbox.fmf
+1 -1
View File
@@ -2,7 +2,7 @@ summary: Build Toolbox container image
discover:
how: fmf
environment:
image_type: tbz
image_type: oci
image_profile: Container-Toolbox
execute:
how: tmt