Commit Graph

909 Commits

Author SHA1 Message Date
Joseph Marrero Corchado 610346fa7e Merge branch 'package-diff' into 'wip-baseimage-rework'
packages: add missing packages from diff

See merge request fedora/bootc/base-images!83
2025-01-29 20:09:18 +00:00
Joseph Marrero Corchado 147a7ff8ee packages: add missing packages from diff 2025-01-29 15:06:47 -05:00
Colin Walters (Red Hat) 1458a98a77 Merge branch 'custom-base' into 'wip-baseimage-rework'
Rework base image build

See merge request fedora/bootc/base-images!81
2025-01-27 20:53:37 +00:00
Colin Walters f2fbdd7dad base: Cleanup rpmdb
First, ensure we remove the `-shm` files etc; this is another
implementation of https://github.com/coreos/rpm-ostree/pull/5244
effectively, but in shell script in the container build pipeline.

Also remove the rpm-ostree-base-db because I think it's the
hardlinking here that's causing problems in gitlab CI where
we can't rely on writethrough of hardlinks.

I am hoping this fixes the gitlab CI.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-24 15:45:03 -05:00
Colin Walters 98f6572750 build-sys: Clean more directories
Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters 8a6332e491 Merge tier-1 to the toplevel
Now we just have a minimal base, and what was tier-1 is now
just the default content.

We still do capture the previous conception of "tier-x" in
`packages-recommended-minimal.txt` so that people starting
from scratch can install using that.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters d6f376b36e Move growfs and autoupdates into `tier-1/usr` overlay, use preset
Instead of having postprocessing scripts for these, add
them to the overlay. Also instead of hand rolling static systemd
enablement, add and use a preset file for them instead.

(This also makes it easier for downstream container images
 to rerun the presets if they wanted to)

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters 176ede2332 Split excluded and arch packages into "package text file"
Aiming to have the main container build not use rpm-ostree.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters 3addf4c691 Move persistent-journal into base
This is something we want people to have by default.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters a14ba65620 Drop unused fedora-tier-1
Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters e2aa69433c Move fedora-repos-archive into base
Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters 1901092f5d Move labels into Containerfile.base
Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters 2a387e2167 ci: Rework
Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters 255780a9d0 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 <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters 08928a103a tier-x -> packages-recommended.txt
That's basically all this is...plus a default
inheritance from the base image.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters 029e4c7038 Split off Containerfile.base
Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -05:00
Colin Walters 19b046d36d Drop support for pungi
The only interface to building this image will be via Containerfile
now.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-01-23 11:37:04 -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
Jonathan Lebon 908c347bb9
Containerfile: add temporary hack for `--from` handling
Using `--from` to set the target releasever doesn't work yet because we
_need_ to set the `releasever` field since the repo files reference it.
There's a pending rpm-ostree PR to fix this but for now hack around it
by manually injecting the necessary variables in the treefile.
2024-10-23 15:35:00 -04:00
Jonathan Lebon 6315275af7
Remove releasever from manifests; add pungi treefile stubs
As agreed in https://gitlab.com/fedora/bootc/tracker/-/issues/39, we're
going to be maintaining the treefile for all Fedora versions in the
`main` branch. Accordingly stop hardcoding releasevers and repos in
the treefiles.

But for now, we're still building the official image in pungi using the
non-container-native path, so add compatibility stubs to not break it.

Coincidentally, this doubles down on the proposed API to build the base
images for different Fedora versions using the `--from` switch. Document
this in the README. But note this doesn't work yet because nothing is
telling rpm-ostree which repos to use or what the releasever should be.
2024-10-23 15:27:50 -04:00
Jonathan Lebon 0980197ad9
Containerfile: split long RUN lines
They're getting quite long and hard to parse. Split for legibility.
2024-10-23 15:22:50 -04:00
Jonathan Lebon 230c105895 Merge branch 'drop-bib' into 'main'
containerfile: Drop use of bootc-image-builder

See merge request fedora/bootc/base-images!58
2024-10-04 12:04:32 +00:00