From 255780a9d06d3cb4f5ff2c9f3fd0ff6155e5a790 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 21 Jan 2025 14:01:15 -0500 Subject: [PATCH] Rename tier-0 -> base Part of dropping the "tier" nomenclature which never made sense since the introduction of `tier-x` anyways. Signed-off-by: Colin Walters --- Containerfile.base | 6 ++---- README.md | 6 ++---- {tier-0 => base}/basic-fixes.yaml | 0 {tier-0 => base}/bootc.yaml | 0 {tier-0 => base}/bootupd.yaml | 0 {tier-0 => base}/finalize.d/01-var.sh | 0 {tier-0 => base}/group | 0 {tier-0 => base}/grub2-removals.yaml | 0 {tier-0 => base}/initramfs.yaml | 0 {tier-0 => base}/kernel-install.yaml | 0 {tier-0 => base}/kernel.yaml | 0 {tier-0 => base}/manifest.yaml | 5 +++-- {tier-0 => base}/ostree.yaml | 0 {tier-0 => base}/passwd | 0 {tier-0 => base}/postprocess-conf.yaml | 0 fedora-tier-0.yaml | 8 -------- 16 files changed, 7 insertions(+), 18 deletions(-) rename {tier-0 => base}/basic-fixes.yaml (100%) rename {tier-0 => base}/bootc.yaml (100%) rename {tier-0 => base}/bootupd.yaml (100%) rename {tier-0 => base}/finalize.d/01-var.sh (100%) rename {tier-0 => base}/group (100%) rename {tier-0 => base}/grub2-removals.yaml (100%) rename {tier-0 => base}/initramfs.yaml (100%) rename {tier-0 => base}/kernel-install.yaml (100%) rename {tier-0 => base}/kernel.yaml (100%) rename {tier-0 => base}/manifest.yaml (91%) rename {tier-0 => base}/ostree.yaml (100%) rename {tier-0 => base}/passwd (100%) rename {tier-0 => base}/postprocess-conf.yaml (100%) delete mode 100644 fedora-tier-0.yaml diff --git a/Containerfile.base b/Containerfile.base index 28c81b0..55af79f 100644 --- a/Containerfile.base +++ b/Containerfile.base @@ -12,8 +12,6 @@ FROM quay.io/fedora/fedora:rawhide as repos # BOOTSTRAPPING: This can be any image that has rpm-ostree and selinux-policy-targeted. FROM quay.io/fedora/fedora:rawhide as builder RUN dnf -y install rpm-ostree selinux-policy-targeted -# Change the input manifest if desired, but this is discouraged. -ARG MANIFEST=fedora-tier-0.yaml # Copy in our source code. COPY . /src WORKDIR /src @@ -27,9 +25,9 @@ for x in etc/dnf etc/yum.repos.d etc/pki/rpm-gpg; do rm -rf /"$x" && cp -a /repos/${x} /$x done # And copy to the workdir; TODO fix this in rpm-ostree -cp /etc/yum.repos.d/*.repo . +cp /etc/yum.repos.d/*.repo base rpm-ostree compose image --image-config fedora-bootc-config.json \ - --cachedir=/workdir --format=ociarchive --initialize ${MANIFEST} \ + --cachedir=/workdir --format=ociarchive --initialize base/manifest.yaml \ --source-root=/repos /buildcontext/out.ociarchive EORUN diff --git a/README.md b/README.md index 467b6fc..dfda627 100644 --- a/README.md +++ b/README.md @@ -58,12 +58,10 @@ It is planned to rework and improve this in the future, especially to support smaller custom images. For more on this, see [this tracker issue](https://gitlab.com/fedora/bootc/tracker/-/issues/32). +- **base**: A base image with the effective equivalent of installing `bootc kernel systemd dnf` + with "recommends" off. Intended as a derivation starting point for minimal systems. - **tier-1**: This image is the default, what is published as https://quay.io/repository/fedora/fedora-bootc -- **tier-0**: This content set 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. - **packages-recommended.txt**: This content set is 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. diff --git a/tier-0/basic-fixes.yaml b/base/basic-fixes.yaml similarity index 100% rename from tier-0/basic-fixes.yaml rename to base/basic-fixes.yaml diff --git a/tier-0/bootc.yaml b/base/bootc.yaml similarity index 100% rename from tier-0/bootc.yaml rename to base/bootc.yaml diff --git a/tier-0/bootupd.yaml b/base/bootupd.yaml similarity index 100% rename from tier-0/bootupd.yaml rename to base/bootupd.yaml diff --git a/tier-0/finalize.d/01-var.sh b/base/finalize.d/01-var.sh similarity index 100% rename from tier-0/finalize.d/01-var.sh rename to base/finalize.d/01-var.sh diff --git a/tier-0/group b/base/group similarity index 100% rename from tier-0/group rename to base/group diff --git a/tier-0/grub2-removals.yaml b/base/grub2-removals.yaml similarity index 100% rename from tier-0/grub2-removals.yaml rename to base/grub2-removals.yaml diff --git a/tier-0/initramfs.yaml b/base/initramfs.yaml similarity index 100% rename from tier-0/initramfs.yaml rename to base/initramfs.yaml diff --git a/tier-0/kernel-install.yaml b/base/kernel-install.yaml similarity index 100% rename from tier-0/kernel-install.yaml rename to base/kernel-install.yaml diff --git a/tier-0/kernel.yaml b/base/kernel.yaml similarity index 100% rename from tier-0/kernel.yaml rename to base/kernel.yaml diff --git a/tier-0/manifest.yaml b/base/manifest.yaml similarity index 91% rename from tier-0/manifest.yaml rename to base/manifest.yaml index a531a15..b10e3ce 100644 --- a/tier-0/manifest.yaml +++ b/base/manifest.yaml @@ -24,14 +24,15 @@ include: - kernel-install.yaml packages: + # This can be replaced later + - kernel # this is implied by dependencies but let's make it explicit - coreutils # We need dnf for building derived container images. In Fedora, this pulls # in dnf5. In CentOS/RHEL, this pulls in dnf(4). We can simplify this back to # just `dnf` once the `dnf` package is retired from Fedora. - /usr/bin/dnf - # Even in tier-0, we have this. If you don't want SELinux today, you'll need - # to build a custom image. + # If you don't want SELinux today, you'll need to build a custom image. - selinux-policy-targeted # And we want container-selinux because trying to layer it on later currently causes issues. - container-selinux diff --git a/tier-0/ostree.yaml b/base/ostree.yaml similarity index 100% rename from tier-0/ostree.yaml rename to base/ostree.yaml diff --git a/tier-0/passwd b/base/passwd similarity index 100% rename from tier-0/passwd rename to base/passwd diff --git a/tier-0/postprocess-conf.yaml b/base/postprocess-conf.yaml similarity index 100% rename from tier-0/postprocess-conf.yaml rename to base/postprocess-conf.yaml diff --git a/fedora-tier-0.yaml b/fedora-tier-0.yaml deleted file mode 100644 index 6cef2a1..0000000 --- a/fedora-tier-0.yaml +++ /dev/null @@ -1,8 +0,0 @@ -metadata: - name: fedora-boot-tier0 - summary: Fedora Bootable Tier 0 - -include: - - fedora-generic.yaml - - tier-0/manifest.yaml - - tier-0/kernel.yaml