aboutsummaryrefslogtreecommitdiffci
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.xml120
-rw-r--r--teams/cloud/container.xml71
-rw-r--r--teams/cloud/vagrant.xml10
-rw-r--r--teams/cloud/wsl.xml67
4 files changed, 211 insertions, 57 deletions
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index b38b508..3a99ce7 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -28,17 +28,39 @@
<requires profile="Cloud-Base-Generic"/>
</profile>
</profiles>
- <preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-Azure" arch="x86_64">
<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="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ 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"
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>
@@ -48,18 +70,40 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64">
<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="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ 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"
rootfs_label="fedora"
>
- <bootloader name="grub2" timeout="0"/>
+ <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>
@@ -68,19 +112,20 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-GCE" arch="x86_64">
<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="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" timeout="0"/>
+ <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>
@@ -89,18 +134,62 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64">
+ <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">
<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="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" console="serial" timeout="0"/>
+ <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"/>
+ <size unit="G">5</size>
+ <systemdisk>
+ <volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -114,13 +203,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 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
+ bootpartition="false" firmware="ofw"
rootfs_label="fedora"
>
- <bootloader name="grub2" console="serial" timeout="0"/>
+ <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>
@@ -134,7 +224,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="1000" bootfilesystem="ext4"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="ext4"
rootfs_label="fedora"
>
<bootloader name="zipl" timeout="1"/>
@@ -149,7 +239,7 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64,riscv64">
<type image="oem" format="qcow2"
firmware="uefi" efipartsize="1000"
bootpartition="false"
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml
index 22ae0d7..25dcd49 100644
--- a/teams/cloud/container.xml
+++ b/teams/cloud/container.xml
@@ -17,24 +17,20 @@
<type image="oci">
<containerconfig
name="fedora"
- tag="rawhide"
+ tag="45"
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.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"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora"/>
+ <label name="org.opencontainers.image.version" value="45"/>
</labels>
<environment>
<env name="container" value="oci"/>
+ <env name="PATH" value="/usr/local/bin:/usr/bin"/>
</environment>
</containerconfig>
</type>
@@ -47,24 +43,20 @@
<type image="oci">
<containerconfig
name="fedora-minimal"
- tag="rawhide"
+ tag="45"
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.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"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora-minimal"/>
+ <label name="org.opencontainers.image.version" value="45"/>
</labels>
<environment>
<env name="container" value="oci"/>
+ <env name="PATH" value="/usr/local/bin:/usr/bin"/>
</environment>
</containerconfig>
</type>
@@ -77,21 +69,16 @@
<type image="oci">
<containerconfig
name="fedora-init"
- tag="rawhide"
+ tag="45"
maintainer="Fedora Project Contributors &lt;devel@lists.fedoraproject.org&gt;"
>
<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.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"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora-init"/>
+ <label name="org.opencontainers.image.version" value="45"/>
</labels>
<stopsignal>SIGRTMIN+3</stopsignal>
</containerconfig>
@@ -105,25 +92,21 @@
<type image="oci">
<containerconfig
name="fedora-toolbox"
- tag="rawhide"
+ tag="45"
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.name" value="fedora-toolbox"/>
- <label name="org.opencontainers.image.version" value="rawhide"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora-toolbox"/>
+ <label name="org.opencontainers.image.version" value="45"/>
<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>
@@ -155,7 +138,9 @@
<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"/>
@@ -163,6 +148,10 @@
<ignore name="tzdata"/>
<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"/>
@@ -242,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"/>
@@ -285,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>
diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml
index 624f4ef..301b08c 100644
--- a/teams/cloud/vagrant.xml
+++ b/teams/cloud/vagrant.xml
@@ -15,14 +15,15 @@
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="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" console="serial" timeout="1"/>
+ <bootloader name="grub2" bls="true" 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>
@@ -36,14 +37,15 @@
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="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
- <bootloader name="grub2" console="serial" timeout="1"/>
+ <bootloader name="grub2" bls="true" 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
new file mode 100644
index 0000000..ffafb79
--- /dev/null
+++ b/teams/cloud/wsl.xml
@@ -0,0 +1,67 @@
+<image>
+ <profiles>
+ <profile name="WSL-Base" description="Windows Subsystem for Linux Base"/>
+ </profiles>
+ <preferences profiles="WSL-Base">
+ <type image="wsl"/>
+ <timezone>Etc/UTC</timezone>
+ <locale>en_US</locale>
+ <rpm-locale-filtering>false</rpm-locale-filtering>
+ <rpm-excludedocs>false</rpm-excludedocs>
+ </preferences>
+ <packages type="bootstrap" profiles="WSL-Base">
+ <package name="bash"/>
+ <package name="coreutils"/>
+ <package name="dnf5"/>
+ <package name="dnf5-plugins"/>
+ <package name="fedora-release-wsl"/>
+ <package name="rpm"/>
+ </packages>
+ <packages type="image" patternType="plusRecommended" profiles="WSL-Base">
+ <package name="attr"/>
+ <package name="acl"/>
+ <package name="bash-color-prompt"/>
+ <package name="bash-completion"/>
+ <package name="bind-utils"/>
+ <package name="bzip2"/>
+ <package name="curl"/>
+ <package name="dbus"/>
+ <package name="default-editor"/>
+ <package name="file"/>
+ <package name="glibc-langpack-en"/>
+ <package name="gnupg2"/>
+ <package name="iproute"/>
+ <package name="iputils"/>
+ <package name="less"/>
+ <package name="lsof"/>
+ <package name="man-db"/>
+ <package name="man-pages"/>
+ <package name="NetworkManager"/>
+ <package name="nmap-ncat"/>
+ <package name="openssh-clients"/>
+ <package name="passwd"/>
+ <package name="pciutils"/>
+ <package name="procps-ng"/>
+ <package name="rsync"/>
+ <package name="shadow-utils"/>
+ <package name="sudo"/>
+ <package name="symlinks"/>
+ <package name="systemd-udev"/>
+ <package name="systemd-resolved"/>
+ <package name="tar"/>
+ <package name="tcpdump"/>
+ <package name="time"/>
+ <package name="traceroute"/>
+ <package name="tree"/>
+ <package name="unzip"/>
+ <package name="usbutils"/>
+ <package name="util-linux"/>
+ <package name="vim-minimal"/>
+ <package name="wget"/>
+ <package name="which"/>
+ <package name="whois"/>
+ <package name="wsl-setup"/>
+ <package name="zip"/>
+ <package name="zram-generator-defaults"/>
+ </packages>
+</image>
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 20:22:22 +0000