Commit Graph

860 Commits

Author SHA1 Message Date
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
Colin Walters b22d3422f4 containerfile: Drop use of bootc-image-builder
This just adds confusion in the end. Switch to bootstrapping
from the app image.
2024-10-03 16:28:49 -04:00
Colin Walters (Red Hat) c758998b0d Merge branch 'remove_gdisk' into 'main'
tier-0: remove gdisk and bootc has Rust create instead

See merge request fedora/bootc/base-images!43
2024-09-30 14:57:17 +00:00
Xiaofeng Wang 128daa662c tier-0: remove gdisk and bootc has Rust create instead
bootc has a Rust create https://github.com/containers/bootc/pull/775
to replace gdisk which has been removed by c10s and RHEL-10

Signed-off-by: Xiaofeng Wang <xiaofwan@redhat.com>
2024-09-30 22:07:51 +08:00
Colin Walters (Red Hat) 1eb031710f Merge branch 'main' into 'main'
passwd: update home dir for 'sssd' service user

See merge request fedora/bootc/base-images!57
2024-09-30 13:57:52 +00:00
Alexey Tikhonov b9593426a8 passwd: update home dir for 'sssd' service user
Starting sssd-2.10 that is shipped in F41+ and C10S,
home dir for 'sssd' service user is set to '/run/sssd'

Take a note that it's not the case yet for sssd-2.9-
that is currently shipped in C9S.
2024-09-27 17:48:07 +02:00
Colin Walters (Red Hat) 8e6ef05eb2 Merge branch 'pr/dnf-tweak' into 'main'
tier-0: pull in dnf using `/usr/bin/dnf` instead

See merge request fedora/bootc/base-images!56
2024-09-23 16:47:26 +00:00
Jonathan Lebon 4511546f08
tier-0: pull in dnf using `/usr/bin/dnf` instead
dnf5 is currently in Fedora only, but this manifest is shared with
CentOS Stream and RHEL. Instead of requesting `dnf5`, request
`/usr/bin/dnf` instead. This will pull in dnf5 on Fedora, but dnf(4)
elsewhere.

We should be able to simplify this back to just `dnf` eventually once
dnf v4 is out of Fedora.
2024-09-23 10:45:38 -04:00
Jonathan Lebon 92172d2d56 Merge branch 'pr/coreutils' into 'main'
tier-0/x: various tweaks

See merge request fedora/bootc/base-images!54
2024-09-20 19:06:53 +00:00
Colin Walters (Red Hat) 8a37080d85 Merge branch 'pr/fix-sed' into 'main'
tier-0: fix sed invocation

See merge request fedora/bootc/base-images!55
2024-09-20 18:31:02 +00:00
Jonathan Lebon cbd531bc53
tier-0: fix sed invocation
Classic sed invocation footgun. Doing `-ie` actually binds the `e` to
`-i` which tells sed to backup the original with a suffix of `e`.

This gets rid of `/usr/lib/tmpfiles.d/provision.confe`.

systemd-tmpfiles ignores files that don't have `.conf` so the stray file
had no effect.
2024-09-20 12:56:50 -04:00
Jonathan Lebon 62be40d8b4
tier-0: drop `mkdir -p /run` workaround
This has long been unnecessary.

See also: 029d320bfe
2024-09-20 11:16:02 -04:00
Jonathan Lebon b9fdc53e87
tier-x: explicitly list podman, skopeo
They're such important tools to the experience, it's weird to leave it
as being it implied by bootc only.
2024-09-20 11:15:19 -04:00
Jonathan Lebon d6f00d618f
tier-0: explicitly list coreutils
This currently is already in tier-0, but it feels odd to not explicitly
list it. Noticed while comparing to FCOS manifests, which does list it.
2024-09-20 11:05:10 -04:00
Colin Walters (Red Hat) 243b2c03bc Merge branch 'more-doc-tiers' into 'main'
README.md: Clarify a few things

See merge request fedora/bootc/base-images!52
2024-09-18 20:59:16 +00:00
Colin Walters (Red Hat) 2d19347f1b Merge branch 'pr/tier-1-inherit' into 'main'
tier-1: inherit from tier-x

See merge request fedora/bootc/base-images!53
2024-09-18 20:43:44 +00:00
Jonathan Lebon 83542ad32e
tier-1: drop a bunch of redundant packages
These are all included in tier-x or tier-0 already.

Though it does drop bsdtar. This isn't really well-known enough to
belong here. It's included in FCOS because we use it in our scripts,
but it's not a requirement for any tier-1 logic AFAIK and I would be
surprised if users expected it there.
2024-09-18 15:32:40 -04:00
Jonathan Lebon 034cf4bf28
tier-1: inherit from tier-x
We want tier-1 to be another consumer of tier-x, kind of like its own
top-level Fedora variant. That way, tier-1 is now a strict superset of
tier-x, just like the other variants.
2024-09-18 15:16:46 -04:00
Jonathan Lebon d65c8fa91e
tier-x: drop dnsmasq and slirp4netns
These packages are in all the variants, but not tier-1. We want tier-1
to inherit from tier-x, so remove them.
2024-09-18 14:46:27 -04:00
Colin Walters e5d5452ace README.md: Clarify a few things
- Make very clear that tier-1 is the default image
- Link to our issue tracker for supportable base image customization
- Note use of `--build-arg=MANIFEST`.

etc.

Signed-off-by: Colin Walters <walters@verbum.org>
2024-09-18 09:11:05 -04:00
Colin Walters (Red Hat) 97e5c775fd Merge branch 'pr/ci-tier-x' into 'main'
CI: also build tier-0 and tier-x

See merge request fedora/bootc/base-images!50
2024-09-18 12:38:55 +00:00
Jonathan Lebon 2c3aea7d8e
CI: also build tier-0 and tier-x
Let's at least verify tier-0 and tier-x can build fine. Ideally in the
future we actually run some tests on the resulting image, though let's
wait until this CI is migrated to Konflux before doing that.
2024-09-17 22:35:11 -04:00
Colin Walters (Red Hat) 9e2e845372 Merge branch 'pr/tier-x' into 'main'
tier-x: new tier for cross-variant collaboration

See merge request fedora/bootc/base-images!48
2024-09-17 20:07:19 +00:00
Colin Walters (Red Hat) 39240d2848 Merge branch 'pr/iptables-nft' into 'main'
Drop iptables-legacy from tier-0, drop iptables-legacy alternatives hack from tier-1

See merge request fedora/bootc/base-images!46
2024-09-17 18:14:41 +00:00
Colin Walters (Red Hat) e6c505b14a Merge branch 'pr/autoupdates-tier-0' into 'main'
Move automatic updates by default from tier-0 to tier-1

See merge request fedora/bootc/base-images!49
2024-09-17 18:11:03 +00:00
Jonathan Lebon e89c5542ea
Move automatic updates by default from tier-0 to tier-1
tier-1 is more opinionated and automatic updates by default is
definitely a very strong opinion.

This makes it easier to inherit from tier-0 without having to undo that
knob if it's not desirable.

Prep for !48.
2024-09-17 13:56:47 -04:00
Jonathan Lebon eecff86d81
README: add "Tiers" section
Describe each tier briefly. Link to the docs for more information.
Mention that changes to tier-0 and tier-x needs acknowledgement from
each variant.
2024-09-16 16:52:41 -04:00
Jonathan Lebon 035de97f61
tier-x: new tier for cross-variant collaboration
One of the main goals of the bootable containers initiative in Fedora
is to have all the image-based Fedora variants share a common base onto
which we can maintain CI, develop features, fix bugs, etc...

While I believe in the long-term, we should try to have literal
derivation from a base image, this is not currently desirable for
various reasons. Instead, for now we can share things at the manifest
level by having this repo be a submodule in the every variant's repo.

Currently, tier-0 is much smaller than it needs to be for sharing
purposes. Crucially, it doesn't include NetworkManager. At the same
time, tier-1 is much too large as a shared target. As a first step, we
should try to match variants where they currently are and not force them
to ship many more packages than they currently do.

For this purpose, I'm proposing a new tier: tier-x. The "x" stands for
"cross-variant". This tier is composed of tier-0 + a set of packages
that is currently in common to all the involved variants. The most
notable additions are NetworkManager, openssh, and rpm-ostree.

The intention then is to have every Fedora variant `include` this tier
and have it become the point of collaboration between variants. E.g. new
packages/bug fixes/temporary workarounds relevant to all variants likely
should land in this tier instead of in the downstreams. CI of course
will also be an important discussion point.
2024-09-16 16:52:36 -04:00
Colin Walters (Red Hat) 9ce9d35a61 Merge branch 'pr/drop-dbus' into 'main'
tier-0: drop dbus-common remove-from-packages

See merge request fedora/bootc/base-images!47
2024-09-16 20:51:41 +00:00
Jonathan Lebon de0ff17f75
tier-0: drop dbus-common remove-from-packages
This is no longer needed. The package has been fixed for a while.

See also: f7aaeb3d6c
2024-09-16 16:20:11 -04:00
Jonathan Lebon f4eba96aef
tier-1: drop iptables alternatives hack
We only ship iptables-nft, so there's no need to explicitly
override the symlinks anymore. To enforce this remains the case, add
`iptables-legacy` to the exclusion list.
2024-09-16 16:06:13 -04:00
Jonathan Lebon 55609b1d19
tier-0: pull in iptables-nft instead of iptables-legacy
As per the comment, currently we're pulling in iptables-legacy because
for some reason the `iptables` Provides is fulfilled by that instead of
iptables-nft. Explicitly name the latter to avoid this.

Note in tier-1 we do pull iptables-nft only because it's explicitly
named there.
2024-09-16 16:06:13 -04:00
Colin Walters (Red Hat) a3629ba21a Merge branch 'pr/tier-1-remove' into 'main'
tier-1: drop unused kdump-aarch64-aws-workaround.yaml and redundant tier-0 symlinks

See merge request fedora/bootc/base-images!44
2024-09-16 13:48:22 +00:00
Colin Walters (Red Hat) 864ecc4aa0 Merge branch 'pr/dnf5' into 'main'
tier-0: pull in dnf5, not dnf

See merge request fedora/bootc/base-images!45
2024-09-16 13:37:16 +00:00
Jonathan Lebon 9410195760
tier-1: drop redundant tier-0 symlinks
Instead of re-symlinking every tier-0 manifest, just include the tier-0
manifest directly. That way, rpm-ostree will already know to resolve its
manifests within the tier-0 directory.
2024-09-16 09:18:05 -04:00
Jonathan Lebon 4e736cc6bb
tier-1: drop unused kdump-aarch64-aws-workaround.yaml
At least in this repo's history, this file doesn't appear to have ever
been used.
2024-09-16 09:17:23 -04:00
Jonathan Lebon a85de9b2e0
tier-0: pull in dnf5, not dnf
Currently, there is both dnf and dnf5 in Fedora. dnf5 provides `dnf`,
but matching a package name is stronger and so requesting `dnf` here
still pulls in the legacy one.

This notably drops out Python from tier 0.
2024-09-15 23:05:14 -04:00
Colin Walters (Red Hat) 684ea928c2 Merge branch 'check-for-fedora' into 'main'
tier-0/initramfs.yaml: add conditional for 41 when adding systemd-cryptsetup

See merge request fedora/bootc/base-images!42
2024-09-10 19:08:44 +00:00
Joseph Marrero Corchado 17bb5e4128 Revert "tier-0: add systemd-cryptsetup to initrd dracut modules"
This reverts commit 7109132dd6.
2024-09-10 14:32:13 -04:00
Colin Walters (Red Hat) 166df9118a Merge branch 'kdump-args' into 'main'
tier-0: Add /usr/lib/{passwd,group} to dracut

See merge request fedora/bootc/base-images!32
2024-09-10 16:43:13 +00:00
Joseph Marrero e01020ddc2 tier-0: Add /usr/lib/{passwd,group} to dracut
On image mode systems we use nss-altfiles this,
change makes sure dracut uses them. This fix also
fixes kdump writing over NFS.
2024-09-06 22:56:57 -04:00
Colin Walters (Red Hat) 8b551127e6 Merge branch 'revert-gdisk' into 'main'
Revert "bootc: Drop gdisk"

See merge request fedora/bootc/base-images!41
2024-09-03 13:00:02 +00:00
Colin Walters 0e9bf457eb Revert "bootc: Drop gdisk"
This reverts commit 5d8e7a5f6b.

Because I was confused, bootc does require it right now.
2024-09-03 08:48:51 -04:00
Colin Walters (Red Hat) 3f6db2ef2e Merge branch 'drop-gdisk' into 'main'
bootc: Drop gdisk

See merge request fedora/bootc/base-images!39
2024-08-30 13:36:06 +00:00
Colin Walters 5d8e7a5f6b bootc: Drop gdisk
See https://gitlab.com/redhat/centos-stream/containers/bootc/-/merge_requests/198
and https://issues.redhat.com/browse/RHELMISC-6651 etc.
2024-08-30 09:02:39 -04:00
Colin Walters (Red Hat) 8f5208a42c Merge branch 'tier0-cryptsetup' into 'main'
tier-0: add systemd-cryptsetup to initrd dracut modules

See merge request fedora/bootc/base-images!37
2024-08-29 13:53:20 +00:00
Micah Abbott 7109132dd6 tier-0: add systemd-cryptsetup to initrd dracut modules
Fedora 41 appears to require the inclusion of `systemd-cryptsetup` in
the initrd in order to unlock LUKS devices at boot.

See: #17

Signed-off-by: Micah Abbott <miabbott@redhat.com>
2024-08-29 09:23:25 -04:00
Colin Walters (Red Hat) 4a4e727254 Merge branch 'switch-add-dracutmodules' into 'main'
initramfs: Switch to `add_dracutmodules`

See merge request fedora/bootc/base-images!36
2024-08-22 14:37:25 +00:00
Colin Walters 0da319f566 initramfs: Switch to `add_dracutmodules`
Per discussion in https://github.com/rhkdump/kdump-utils/pull/29#issuecomment-2303932537

This would have avoided kdump breakage, and the original motivation
of avoiding dracut error spam from missing things is gone now
that Fedora is using dracut-ng which has
d73cc24e11
2024-08-22 09:38:07 -04:00
Colin Walters (Red Hat) 1350cb68ca Merge branch 'crypto-scripts' into 'main'
system-config: Add crypto-policies-scripts

See merge request fedora/bootc/base-images!34
2024-08-21 15:04:43 +00:00