public
/
bootc-base-images
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: public:jamesp-fork
Branches Tags
public:jamesp-fork
public:wip-baseimage-rework
public:renovate/main-all
public:main
public:el9.4-backports
public:renovate/f41-all
public:renovate/f40-all
public:f41
public:f40
public:v2024.1
public:2024.1
public:v2024.0
...
pull from: public:renovate/f41-all
Branches Tags
public:jamesp-fork
public:wip-baseimage-rework
public:renovate/main-all
public:main
public:el9.4-backports
public:renovate/f41-all
public:renovate/f40-all
public:f41
public:f40
public:v2024.1
public:2024.1
public:v2024.0

6 Commits
jamesp-for ... renovate/f

Author SHA1 Message Date
Platform Engineering Bot 5e5402cd20 chore(deps): update pre-commit hook pre-commit/pre-commit-hooks to v5 
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
 2024-10-07 01:13:57 +00:00
Colin Walters (Red Hat) 05a724d656 Merge branch 'f41_tier0_cryptsetup' into 'f41' 
[F41] cherry-picked fixes for dracut modules

See merge request fedora/bootc/base-images!38
 2024-08-29 13:59:30 +00:00
Micah Abbott 92545d027d 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>
(cherry picked from commit 7109132dd6)
 2024-08-29 09:48:36 -04:00
Colin Walters 7d31fac720 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

(cherry picked from commit 0da319f566)
 2024-08-29 09:48:19 -04:00
pbrobinson b92b1b9ddd Merge branch 'f41-branching' into 'f41' 
Branching Fedora 41 from Rawhide

See merge request fedora/bootc/base-images!35
 2024-08-21 15:28:49 +00:00
Paul Whalen e070839bff Branching Fedora 41 from Rawhide 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2024-08-19 09:27:50 -04:00
8 changed files with 13 additions and 76 deletions
Show Stats Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -1,7 +1,7 @@
--- ---
repos: repos:
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0 rev: v5.0.0
hooks: hooks:
- id: end-of-file-fixer - id: end-of-file-fixer
- id: trailing-whitespace - id: trailing-whitespace

2
Containerfile
View File

@ -23,7 +23,7 @@
# Because it's generating a base image and uses containerbuildcontextization features itself. # Because it's generating a base image and uses containerbuildcontextization features itself.
# In the future some of this can be lifted. # In the future some of this can be lifted.
FROM quay.io/fedora/fedora:rawhide as repos FROM quay.io/fedora/fedora:41 as repos
FROM quay.io/centos-bootc/bootc-image-builder:latest as builder FROM quay.io/centos-bootc/bootc-image-builder:latest as builder
ARG MANIFEST=fedora-bootc.yaml ARG MANIFEST=fedora-bootc.yaml

2
fedora-bootc-config.json
View File

@ -3,7 +3,7 @@
"containers.bootc": "1", "containers.bootc": "1",
"bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder", "bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder",
"redhat.id": "fedora", "redhat.id": "fedora",
"redhat.version-id": "rawhide" "redhat.version-id": "41"
}, },
"StopSignal": "SIGRTMIN+3", "StopSignal": "SIGRTMIN+3",
"Env": [ "Env": [

4
fedora-bootc.yaml
View File

@ -1,6 +1,6 @@
releasever: rawhide releasever: 41
repos: repos:
- rawhide - fedora
metadata: metadata:
name: fedora-boot-tier1 name: fedora-boot-tier1

4
fedora-tier-0.yaml
View File

@ -1,6 +1,6 @@
releasever: rawhide releasever: 41
repos: repos:
- rawhide - fedora
metadata: metadata:
name: fedora-boot-tier0 name: fedora-boot-tier0

67
fedora.repo
View File

@ -3,8 +3,8 @@
[fedora] [fedora]
name=Fedora $releasever - $basearch name=Fedora $releasever - $basearch
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ # using the Latest Fedora 41 repository from Koji until GA
https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/ baseurl=https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-41/compose/Everything/$basearch/os/
#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
enabled=1 enabled=1
#metadata_expire=7d #metadata_expire=7d
@ -37,66 +37,3 @@ gpgcheck=1
metadata_expire=6h metadata_expire=6h
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
skip_if_unavailable=False skip_if_unavailable=False
[fedora-modular]
name=Fedora Modular $releasever - $basearch
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Modular/$basearch/os/
#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
enabled=1
#metadata_expire=7d
repo_gpgcheck=0
type=rpm
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
[fedora-updates-modular]
name=Fedora Modular $releasever - $basearch - Updates
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
https://dl.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/
#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
enabled=1
repo_gpgcheck=0
type=rpm
gpgcheck=1
metadata_expire=6h
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
[fedora-updates-testing-modular]
name=Fedora Modular $releasever - $basearch - Test Updates
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
https://dl.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/Modular/$basearch/
#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
enabled=1
gpgcheck=1
metadata_expire=6h
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
skip_if_unavailable=False
[rawhide]
name=Fedora - Rawhide - Developmental packages for the next Fedora release
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
https://dl.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/os/
#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
enabled=1
#metadata_expire=7d
repo_gpgcheck=0
type=rpm
gpgcheck=1
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
skip_if_unavailable=False
[fedora-devel]
name=Fedora $releasever - $basearch
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
https://dl.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/os/
#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
enabled=1
#metadata_expire=7d
repo_gpgcheck=0
type=rpm
gpgcheck=1
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
skip_if_unavailable=False

6
tier-0/initramfs.yaml
View File

@ -6,13 +6,13 @@ postprocess:
cat > /usr/lib/dracut/dracut.conf.d/20-bootc-base.conf << 'EOF' cat > /usr/lib/dracut/dracut.conf.d/20-bootc-base.conf << 'EOF'
# We want a generic image; hostonly makes no sense as part of a server side build # We want a generic image; hostonly makes no sense as part of a server side build
hostonly=no hostonly=no
dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base ostree " add_dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base ostree "
EOF EOF
cat > /usr/lib/dracut/dracut.conf.d/22-bootc-generic.conf << 'EOF' cat > /usr/lib/dracut/dracut.conf.d/22-bootc-generic.conf << 'EOF'
# Extra modules that we want by default that are known to exist in the kernel # Extra modules that we want by default that are known to exist in the kernel
dracutmodules+=" virtiofs " add_dracutmodules+=" virtiofs "
EOF EOF
cat > /usr/lib/dracut/dracut.conf.d/49-bootc-tpm2-tss.conf << 'EOF' cat > /usr/lib/dracut/dracut.conf.d/49-bootc-tpm2-tss.conf << 'EOF'
# We want this for systemd-cryptsetup tpm2 locking # We want this for systemd-cryptsetup tpm2 locking
dracutmodules+=" tpm2-tss " add_dracutmodules+=" systemd-cryptsetup tpm2-tss "
EOF EOF

2
tier-1/initramfs-full.yaml
View File

@ -4,5 +4,5 @@ postprocess:
#!/usr/bin/env bash #!/usr/bin/env bash
mkdir -p /usr/lib/dracut/dracut.conf.d mkdir -p /usr/lib/dracut/dracut.conf.d
cat > /usr/lib/dracut/dracut.conf.d/30-bootc-tier-1.conf << 'EOF' cat > /usr/lib/dracut/dracut.conf.d/30-bootc-tier-1.conf << 'EOF'
dracutmodules+=" lvm crypt fips " add_dracutmodules+=" lvm crypt fips "
EOF EOF