Commit graph

913 commits

Author SHA1 Message Date
Colin Walters
8fbe774210 Swap symlink state for fedora-bootc -> fedora-standard
Followup to the naming standardization. Now `fedora-bootc.yaml`
is effectively a deprecated alias only used by the legacy pungi configs.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-25 08:27:20 -05:00
Colin Walters
62b9f3e766 manifests: Drop metadata from fedora manifests
Let's inherit from the generic descriptions.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-25 08:27:20 -05:00
Colin Walters
11a09f4c76 Rename "tier-1" to "standard"
Followup to the rename of "tier-0" to "minimal". The tiers nomenclature
didn't end up working out.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-25 08:27:20 -05:00
Colin Walters
3950d19bdc manifests: Add descriptions
This is generally useful for the same reason dpkg/rpm packages
have descriptions. But it's also specifically preparation
for the base image builder having a list operation to show
available configurations.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-25 08:27:20 -05:00
Colin Walters
e77e3dd0ac minimal: Require kernel.yaml
We have a legacy of trying to support using e.g. kernel-rt. But
it adds complexity in the inheritance because minimal/manifest.yaml
isn't standalone, it also needs a kernel.

As part of custom base images I want to simplify this.

In order to use kernel-rt, we'll just say that you build a
minimal base, and then swap to kernel-rt as a secondary step
for now.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-25 08:27:20 -05:00
Colin Walters
d1a21ed159 tier-0: Rename to minimal
The "tiers" nomenclature ended up being unhelpful since
we introduced "tier-x" which is between tier-0 and tier-1.

We also never exposed the tier naming outside of our source
code. In preparation for doing so, rename to tier-0 to
"minimal" which is a bit more descriptive.

Renaming the other images will follow.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-25 08:27:19 -05:00
Colin Walters
6f52311f70 ci: Bump to latest buildah
The platform-engineering include is using a truly ancient buildah
image. Stop including that and bump to the latest.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-25 08:27:10 -05:00
Colin Walters (Red Hat)
f32c45268e Merge branch 'rpmstate-tmpfiles' into 'main'
tier-0: Add tmpfiles.d entry for /var/lib/rpm-state

See merge request fedora/bootc/base-images!97
2025-02-25 01:22:21 +00:00
Colin Walters
20a796e0fd tier-0: Add tmpfiles.d entry for /var/lib/rpm-state
Needed for https://github.com/containers/bootc/pull/1101
which will cross check /var and tmpfiles.d.
2025-02-25 00:41:20 +00:00
Colin Walters (Red Hat)
84f2ea2c99 Merge branch 'build-prep' into 'main'
build-sys: Rework to use new compose rootfs + FROM scratch pattern

See merge request fedora/bootc/base-images!96
2025-02-24 21:58:38 +00:00
Colin Walters (Red Hat)
682af93899 Merge branch 'drop-sudo' into 'main'
group: Drop sudo

Closes #41

See merge request fedora/bootc/base-images!94
2025-02-24 21:57:27 +00:00
Colin Walters
7676401abe build-sys: Rework to use new compose rootfs + FROM scratch pattern
This takes some of the logic from what's currently in custom base image branch
and applies it here for the main branch.

We need this in order to not depend on the logic that was
removed in https://github.com/containers/buildah/issues/5952

Note that with the latest rpm-ostree v2025.5 `--source-root`
is significantly improved and we don't need to manually copy
dnf variables or gpg keys.
2025-02-20 19:51:09 -05:00
Colin Walters
2c1d31a2a0 group: Drop sudo
This is only used by Fedora CoreOS derivatives, and
we don't include the corresponding sudo rule.

The motivation here is that this group in particular has
no corresponding systemd sysusers.d, and a future bootc
is going to check for that.

Closes: https://gitlab.com/fedora/bootc/base-images/-/issues/41
Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-14 08:08:07 -05:00
Colin Walters (Red Hat)
7b4e013126 Merge branch 'branch-f42' into 'main'
tier-1: add f42 treefile after branching

See merge request fedora/bootc/base-images!87
2025-02-07 19:32:10 +00:00
Colin Walters (Red Hat)
c1a4b38c46 Merge branch 'drop-resolved-centos' into 'main'
tier-x: Drop systemd-resolved

See merge request fedora/bootc/base-images!88
2025-02-07 14:35:47 +00:00
Colin Walters
0ac5ee04ba tier-x: Drop systemd-resolved
It's not desired by default in RHEL 10 or below yet, ref
https://issues.redhat.com/browse/RHEL-77077

AFAICS, it's already explicitly specified in the fedora-coreos manifest,
so dropping it here shouldn't affect FCOS.

Of course I think what we *really* want here is distribution
conditionals.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-07 09:23:38 -05:00
Paul Whalen
da3c6ef677 tier-1: add f42 treefile after branching
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2025-02-05 16:44:49 -05:00
Colin Walters (Red Hat)
5276e451f4 Merge branch 'drop-ppc64le-bootloader-cruft' into 'main'
base/bootloader: Drop /usr/lib/ostree-boot/loader

See merge request fedora/bootc/base-images!86
2025-02-05 21:08:36 +00:00
Colin Walters
3ebf803f5f base/bootloader: Drop /usr/lib/ostree-boot/loader
A quick workaround for https://issues.redhat.com/browse/RHEL-78104
2025-02-05 15:16:59 -05:00
Joseph Marrero Corchado
e62452d096 Merge branch 'kernel-install-more-places' into 'main'
kernel-install: Enable everywhere

See merge request fedora/bootc/base-images!84
2025-02-03 19:05:14 +00:00
Colin Walters
d88208bfba kernel-install: Enable everywhere
Since we'll have the updated rpm-ostree and we believe this
works.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-02-03 09:05:06 -05:00
Valentin Rothberg
3374cd8842 Merge branch 'rpmstate' into 'main'
tier-0: Add /var/lib/rpm-state by default

Closes tracker#58

See merge request fedora/bootc/base-images!82
2025-01-22 15:50:56 +00:00
Colin Walters
92e7c1b2e1 tier-0: Add /var/lib/rpm-state by default
This empty directory is required by some RPM scripts. Historically
rpm-ostree's script invocations made this by default, but that
doesn't happen with direct rpm or dnf.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-22 10:24:48 -05:00
Colin Walters (Red Hat)
9bc06392c3 Merge branch 'kernel-install' into 'main'
tier-0: add kernel-install integration config

See merge request fedora/bootc/base-images!62
2025-01-21 22:51:34 +00:00
Joseph Marrero Corchado
7e65f01306 Containerfile: use rawhide as builder to get the latest rpm-ostree 2025-01-21 15:53:14 -05:00
Joseph Marrero Corchado
1003402e6f tier-0: add kernel-install integration config
This MR adds two configurations to enable kernel-install integration,
this will enable using dnf or rpm to install kernels.

- /usr/lib/kernel/install.conf: enables the hook that tells kernel-install
to defer the logic to rpm-ostree, this currently only on f42
- dnf.conf: ensures dnf only keeps one kernel package
2025-01-21 15:19:41 -05:00
Colin Walters (Red Hat)
37900787f1 Merge branch 'refactor-postprocess-conf' into 'main'
Split out postprocess-conf.yaml

See merge request fedora/bootc/base-images!76
2025-01-21 15:26:47 +00:00
Colin Walters (Red Hat)
22527b5f13 Merge branch 'misc' into 'main'
Drop kernel-rt.yaml

See merge request fedora/bootc/base-images!75
2025-01-21 15:26:08 +00:00
Colin Walters (Red Hat)
93c50b4806 Merge branch 'dusty-bin-zipl' into 'main'
tier-0: use s390utils-core instead of /usr/sbin/zipl

See merge request fedora/bootc/base-images!80
2025-01-21 13:36:45 +00:00
Dusty Mabe
c51559b7eb
tier-0: use s390utils-core instead of /usr/sbin/zipl
The sbin/bin merge happened in Fedora so it's now /usr/bin/zipl
in rawhide. While we're in here just name the package now since
the transient issue where it was coming from two different
packages upstream and downstream has settled. We can use s390utils-core
everywhere.
2025-01-21 08:18:54 -05:00
Colin Walters (Red Hat)
578e95fe81 Merge branch 'condition-growpart' into 'main'
growpart: Add `ConditionPathExists=/usr/bin/growpart`

See merge request fedora/bootc/base-images!79
2025-01-14 15:49:13 +00:00
Colin Walters (Red Hat)
9e300fb68f Merge branch 'readd-dnf' into 'main'
Revert "tier-0: Drop dnf"

See merge request fedora/bootc/base-images!78
2025-01-14 15:29:32 +00:00
Colin Walters
06fddc9007 growpart: Add ConditionPathExists=/usr/bin/growpart
Hopefully eventually this gets rewritten in not-shell-script
and put somewhere saner. For now, avoid failing if people have
trimmed their images.

The growpart problem only comes with bootc-image-builder and
cloud environments anyways, it's not something we hit with
Anaconda installs or `bootc install to-filesystem`, so we can
avoid this.

Closes: https://gitlab.com/fedora/bootc/base-images/-/issues/34

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-14 10:26:11 -05:00
Colin Walters
934570054e Revert "tier-0: Drop dnf"
This reverts commit d7142132b7.
2025-01-14 10:16:39 -05:00
Colin Walters (Red Hat)
b44ea1ace5 Merge branch 'baseimage-split-build-prep2' into 'main'
tier-0: Drop dnf

See merge request fedora/bootc/base-images!77
2025-01-14 10:05:52 +00:00
Colin Walters
d7142132b7 tier-0: Drop dnf
We will have a better way to make derived container images
that doesn't require having dnf in the base image.

Prep for more minimal and custom images.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-13 10:01:02 -05:00
Colin Walters
535cea4155 Split out postprocess-conf.yaml
Prep for working on custom base images. We want to support
operating on rootfs that may not have been generated by
rpm-ostree.

Split this out as something that can gets passed separately
to `rpm-ostree compose postprocess/commit`.
2025-01-13 09:21:26 -05:00
Colin Walters
444acb374b Drop kernel-rt.yaml
It's unused right now and we are going to replace it with better
mechanisms.
2025-01-13 08:31:35 -05:00
Micah Abbott
edac3c53ca Merge branch 'more-docs' into 'main'
README.md: Slightly more docs for tiers

See merge request fedora/bootc/base-images!72
2025-01-09 21:03:02 +00:00
Valentin Rothberg
461786bc6a Merge branch 'drop-unused-file' into 'main'
tier-0: Drop unused bootc-config.yaml

See merge request fedora/bootc/base-images!73
2025-01-06 10:37:11 +00:00
Colin Walters
7369824a54 tier-0: Drop unused bootc-config.yaml
This file went empty a while ago when we moved the default
filesystem bits to the centos-stream image.
2025-01-03 16:11:15 -05:00
Colin Walters
b991db43cb README.md: Slightly more docs for tiers
Explain that we aren't shipping anything but tier-1, link
to the custom base image work.
2024-12-20 15:50:40 -05:00
Colin Walters (Red Hat)
cf1cab8b60 Merge branch 'pr/cleanup-treefile-hacks' into 'main'
Containerfile: clean up temporary hack for `--from` handling

See merge request fedora/bootc/base-images!64
2024-12-17 20:15:28 +00:00
Colin Walters (Red Hat)
58ba425a83 Merge branch 'var-tmp' into 'main'
Add /var/run -> /run by default

Closes #28

See merge request fedora/bootc/base-images!71
2024-12-17 20:14:20 +00:00
Colin Walters
279b050acb Create var/run -> ../run by default
Signed-off-by: Colin Walters <walters@verbum.org>
2024-12-13 09:17:41 -05:00
Colin Walters
7d5a0646a5 Update to 2024 edition
Prep for using finalize.d, but this is also just
a minor cleanup.
2024-12-13 09:17:41 -05:00
Colin Walters (Red Hat)
7530b75489 Merge branch 'main' into 'main'
Add crun to tier-x manifest

See merge request fedora/bootc/base-images!65
2024-11-22 20:16:47 +00:00
Aashish Radhakrishnan
2906394fba Add crun to tier-x manifest
The crun package was excluded from s390x and ppc64le rawhide builds due to
differing dependencies across architectures. This caused kola tests to
fail as the crun was missing. We are adding crun explicitly to the tier-x
manifest in the base images to ensure it is included in all architectures
2024-11-22 14:42:25 -05:00
Colin Walters (Red Hat)
7b7c32b015 Merge branch 'pr/fedora-version' into 'main'
Maintain all Fedora versions in main branch; make container-native flow `--from` API work

See merge request fedora/bootc/base-images!63
2024-10-24 19:04:20 +00:00
Jonathan Lebon
44258fdde4
Containerfile: clean up temporary hack for --from handling
We have new enough rpm-ostree in Fedora for this now.
2024-10-23 15:35:28 -04:00