diff --git a/README.md b/README.md index c2b6f16..0d89821 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,25 @@ See the `Containerfile` for more details. You are of course also free to fork, customize, and build base images yourself. See this page[6] of the documentation for more information. +## Tiers + +There are currently 3 tiers: +- **tier-0**: This image is more of a convenient centralization point for CI + and curation around a package set that we can all agree is the rough minimum + necessary for a usable system. It's not meant to be used as is, but layered + upon. +- **tier-1**: This image is much larger and notably includes networking and + firmwares. It's a good starting point onto which you can do less + customizations to get what you need. +- **tier-x**: This image is not intended for end-users. It's the shared base + used by all image-based Fedora variants (IoT, Atomic Desktops, and CoreOS). + Changes to this tier may be done without accounting for external users. + +Both **tier-1** and **tier-x** inherit from **tier-0**. + +All non-trivial changes to **tier-0** and **tier-x** should be ACKed by at least +one stakeholder of each Fedora variant WGs. + ## More information Documentation: diff --git a/fedora-tier-x.yaml b/fedora-tier-x.yaml new file mode 100644 index 0000000..19e08c8 --- /dev/null +++ b/fedora-tier-x.yaml @@ -0,0 +1,12 @@ +releasever: rawhide +repos: + - rawhide + +metadata: + name: fedora-boot-tier-x + summary: Fedora Bootable Tier X + +include: + - fedora-generic.yaml + - tier-x/manifest.yaml + - tier-x/kernel.yaml diff --git a/tier-x/kernel.yaml b/tier-x/kernel.yaml new file mode 120000 index 0000000..d6f64cc --- /dev/null +++ b/tier-x/kernel.yaml @@ -0,0 +1 @@ +../tier-0/kernel.yaml \ No newline at end of file diff --git a/tier-x/manifest.yaml b/tier-x/manifest.yaml new file mode 100644 index 0000000..384110b --- /dev/null +++ b/tier-x/manifest.yaml @@ -0,0 +1,46 @@ +include: + - ../tier-0/manifest.yaml + +packages: + # Used by admins interactively + - attr + - bash-completion + - hostname + - iproute + - jq + - less + - vim-minimal + # crun recommends but doesn't require criu and criu-libs. We want them for + # checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370 + - criu criu-libs + # storage + - cryptsetup + - lvm2 + - tar + # zram-generator (but not zram-generator-defaults) for F33 change + # https://github.com/coreos/fedora-coreos-tracker/issues/509 + - zram-generator + # Some host applications(i.e. NetworkManager) use dnsmasq + # as the binary for some various utility operations. + # https://github.com/coreos/fedora-coreos-tracker/issues/519 + - dnsmasq + # networking + - iptables-nft + - NetworkManager + - openssh-clients + - openssh-server + - slirp4netns # rootless podman networking + - systemd-resolved + # linux-firmware now a recommends so let's explicitly include it + # https://gitlab.com/cki-project/kernel-ark/-/commit/32271d0cd9bd52d386eb35497c4876a8f041f70b + # https://src.fedoraproject.org/rpms/kernel/c/f55c3e9ed8605ff28cb9a922efbab1055947e213?branch=rawhide + - linux-firmware + # security + - polkit + - sudo + # Allow for configuring different timezones + - tzdata + # rpm-ostree + - rpm-ostree nss-altfiles + # firmware updates + - fwupd