aboutsummaryrefslogtreecommitdiff
path: root/teams/cloud
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'teams/cloud')
-rw-r--r--teams/cloud/cloud.xml118
-rw-r--r--teams/cloud/container.xml48
-rw-r--r--teams/cloud/vagrant.xml10
-rw-r--r--teams/cloud/wsl.xml5
4 files changed, 51 insertions, 130 deletions
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index 3a99ce7..b6874c4 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -28,39 +28,17 @@
<requires profile="Cloud-Base-Generic"/>
</profile>
</profiles>
- <preferences profiles="Cloud-Base-Azure" arch="x86_64">
+ <preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64">
<type image="oem" format="vhd-fixed" formatoptions="force_size"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
- rootfs_label="fedora"
- >
- <bootloader name="grub2" bls="true" console="serial" timeout="0"/>
- <systemdisk>
- <volume name="@root=root"/>
- <volume name="boot" parent="/"/>
- <volume name="home" parent="/"/>
- <volume name="var" parent="/"/>
- </systemdisk>
- <size unit="G">5</size>
- <oemconfig>
- <oem-resize>false</oem-resize>
- </oemconfig>
- </type>
- </preferences>
- <preferences profiles="Cloud-Base-Azure" arch="aarch64">
- <type image="oem" format="vhd-fixed" formatoptions="force_size"
- filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
- kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off"
- devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" console="serial" timeout="0"/>
<systemdisk>
<volume name="@root=root"/>
- <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -70,40 +48,18 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64">
+ <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64">
<type image="oem"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
- rootfs_label="fedora"
- >
- <bootloader name="grub2" bls="true" timeout="0"/>
- <size unit="G">5</size>
- <systemdisk>
- <volume name="@root=root"/>
- <volume name="boot" parent="/"/>
- <volume name="home" parent="/"/>
- <volume name="var" parent="/"/>
- </systemdisk>
- <oemconfig>
- <oem-resize>false</oem-resize>
- </oemconfig>
- </type>
- </preferences>
- <preferences profiles="Cloud-Base-AmazonEC2" arch="aarch64">
- <type image="oem"
- filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
- kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
- devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" bls="true" timeout="0"/>
+ <bootloader name="grub2" timeout="0"/>
<size unit="G">5</size>
<systemdisk>
<volume name="@root=root"/>
- <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -112,20 +68,19 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-GCE" arch="x86_64">
+ <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64">
<type image="oem" format="gce"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" bls="true" timeout="0"/>
+ <bootloader name="grub2" timeout="0"/>
<!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G -->
<size unit="G">10</size>
<systemdisk>
<volume name="@root=root"/>
- <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -134,62 +89,18 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-GCE" arch="aarch64">
- <type image="oem" format="gce"
- filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
- kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off"
- devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
- rootfs_label="fedora"
- >
- <bootloader name="grub2" bls="true" timeout="0"/>
- <!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G -->
- <size unit="G">10</size>
- <systemdisk>
- <volume name="@root=root"/>
- <volume name="boot" parent="/"/>
- <volume name="home" parent="/"/>
- <volume name="var" parent="/"/>
- </systemdisk>
- <oemconfig>
- <oem-resize>false</oem-resize>
- </oemconfig>
- </type>
- </preferences>
- <preferences profiles="Cloud-Base-Generic" arch="x86_64,riscv64">
+ <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64,riscv64">
<type image="oem" format="qcow2"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" bls="true" console="serial" timeout="0"/>
- <size unit="G">5</size>
- <systemdisk>
- <volume name="@root=root"/>
- <volume name="boot" parent="/"/>
- <volume name="home" parent="/"/>
- <volume name="var" parent="/"/>
- </systemdisk>
- <oemconfig>
- <oem-resize>false</oem-resize>
- </oemconfig>
- </type>
- </preferences>
- <preferences profiles="Cloud-Base-Generic" arch="aarch64">
- <type image="oem" format="qcow2"
- filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
- kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
- devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
- rootfs_label="fedora"
- >
- <bootloader name="grub2" bls="true" console="serial" timeout="0"/>
+ <bootloader name="grub2" console="serial" timeout="0"/>
<size unit="G">5</size>
<systemdisk>
<volume name="@root=root"/>
- <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -203,14 +114,13 @@
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="false" firmware="ofw"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
rootfs_label="fedora"
>
- <bootloader name="grub2" bls="true" console="serial" timeout="0"/>
+ <bootloader name="grub2" console="serial" timeout="0"/>
<size unit="G">5</size>
<systemdisk>
<volume name="@root=root"/>
- <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -224,7 +134,7 @@
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="ext4"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="ext4"
rootfs_label="fedora"
>
<bootloader name="zipl" timeout="1"/>
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml
index 8b4b963..2e7f0e8 100644
--- a/teams/cloud/container.xml
+++ b/teams/cloud/container.xml
@@ -24,9 +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.licenses" value="MIT"/>
- <label name="org.opencontainers.image.title" value="fedora"/>
+ <label name="org.opencontainers.image.license" value="MIT"/>
+ <label name="org.opencontainers.image.name" 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"/>
@@ -50,9 +55,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.licenses" value="MIT"/>
- <label name="org.opencontainers.image.title" value="fedora-minimal"/>
+ <label name="org.opencontainers.image.license" value="MIT"/>
+ <label name="org.opencontainers.image.name" 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"/>
@@ -76,9 +86,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.licenses" value="MIT"/>
- <label name="org.opencontainers.image.title" value="fedora-init"/>
+ <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>
@@ -99,10 +114,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.licenses" value="MIT"/>
- <label name="org.opencontainers.image.title" value="fedora-toolbox"/>
+ <label name="org.opencontainers.image.license" value="MIT"/>
+ <label name="org.opencontainers.image.name" 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"/>
@@ -138,9 +158,7 @@
<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"/>
@@ -231,15 +249,15 @@
<package name="man-db"/>
<package name="man-pages"/>
<package name="mesa-dri-drivers"/>
+ <package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64,riscv64"/> <!-- 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-client"/>
+ <package name="p11-kit"/>
<package name="pam"/>
<package name="pigz"/>
- <package name="policycoreutils"/>
<package name="procps-ng"/>
<package name="psmisc"/>
<package name="python3"/>
@@ -274,10 +292,4 @@
<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>
diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml
index 301b08c..624f4ef 100644
--- a/teams/cloud/vagrant.xml
+++ b/teams/cloud/vagrant.xml
@@ -15,15 +15,14 @@
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" bls="true" console="serial" timeout="1"/>
+ <bootloader name="grub2" console="serial" timeout="1"/>
<size unit="G">5</size>
<vagrantconfig provider="libvirt" virtualsize="5"/>
<systemdisk>
<volume name="@root=root"/>
- <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -37,15 +36,14 @@
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
devicepersistency="by-uuid"
- bootpartition="false" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" bls="true" console="serial" timeout="1"/>
+ <bootloader name="grub2" console="serial" timeout="1"/>
<size unit="G">5</size>
<vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="5"/>
<systemdisk>
<volume name="@root=root"/>
- <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
diff --git a/teams/cloud/wsl.xml b/teams/cloud/wsl.xml
index ffafb79..aae883f 100644
--- a/teams/cloud/wsl.xml
+++ b/teams/cloud/wsl.xml
@@ -3,7 +3,7 @@
<profile name="WSL-Base" description="Windows Subsystem for Linux Base"/>
</profiles>
<preferences profiles="WSL-Base">
- <type image="wsl"/>
+ <type image="tbz"/>
<timezone>Etc/UTC</timezone>
<locale>en_US</locale>
<rpm-locale-filtering>false</rpm-locale-filtering>
@@ -15,7 +15,9 @@
<package name="dnf5"/>
<package name="dnf5-plugins"/>
<package name="fedora-release-wsl"/>
+ <package name="policycoreutils"/>
<package name="rpm"/>
+ <package name="selinux-policy-targeted"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="WSL-Base">
<package name="attr"/>
@@ -57,7 +59,6 @@
<package name="usbutils"/>
<package name="util-linux"/>
<package name="vim-minimal"/>
- <package name="wget"/>
<package name="which"/>
<package name="whois"/>
<package name="wsl-setup"/>
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 17:58:55 +0000