Skip to content

Commit 1bf0286

Browse files
committed
wip
1 parent bb67248 commit 1bf0286

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

examples/bootc-bls/Containerfile.cocl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM quay.io/fedora/fedora-coreos:stable
1+
FROM quay.io/fedora/fedora-coreos:42.20250901.3.0
22

33
FROM quay.io/afrosi_rh/kbs-client-image:latest as kbc
44
FROM quay.io/confidential-clusters/clevis-pin-trustee as clevis
55
FROM quay.io/confidential-clusters/ignition:clevis-pin-trustee as ignition
66

7-
FROM quay.io/fedora/fedora-coreos:stable
7+
FROM quay.io/fedora/fedora-coreos:42.20250901.3.0
88
COPY . /
99

1010
COPY --from=kbc /usr/local/bin/kbs-client /usr/bin/trustee-attester

examples/bootc-bls/build-bootc-uki

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,19 @@ if [[ ! -f "systemd-bootx64.efi" ]]; then
2929
# Sign systemd-boot once and re-use it for all builds to keep it unchanged
3030
sudo podman run --rm \
3131
--security-opt label=disable \
32-
--secret=id=key,src=secureboot/db.key \
33-
--secret=id=cert,src=secureboot/db.crt \
32+
--volume "$PWD/secureboot/db.key:/run/secrets/key" \
33+
--volume "$PWD/secureboot/db.crt:/run/secrets/cert" \
3434
--volume "$PWD:/var/srv" \
35-
--workdir "/var/srv"
35+
--workdir "/var/srv" \
3636
"${FROM}" \
3737
bash -c "rm -f '/etc/yum.repos.d/fedora-cisco-openh264.repo'; dnf install -y sbsigntools systemd-boot-unsigned; sbsign --key '/run/secrets/key' --cert '/run/secrets/cert' '/usr/lib/systemd/boot/efi/systemd-bootx64.efi' --output '/var/srv/systemd-bootx64.efi'"
3838
fi
3939

4040
# Replace GRUB with a signed systemd-boot binary
4141
sudo podman build \
4242
--from "${FROM}" \
43-
-t "${TAG}-systemdboot" \
43+
-t "${FROM}-systemdboot" \
44+
--iidfile=iid \
4445
-f Containerfile.systemdboot
4546

4647
cp ../../target/release/bootc .

examples/bootc-bls/build-fcos-bls-cocl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
export FROM="quay.io/fedora/fedora-coreos:42.20250901.3.0"
44
export TAG="quay.io/fedora/fedora-coreos-bls-cocl:42.20250901.3.0"
55
export CONTAINERFILE="Containerfile.cocl"
6+
export EXTRA="extra-cocl"
67
exec ./build-bootc-bls

examples/libvirt.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ main() {
5353
fi
5454

5555
connect_to_console="true"
56-
if [[ "${connect_to_console}" == "false" ]]; then
56+
if [[ "${connect_to_console}" == "true" ]]; then
57+
args+=('--autoconsole')
58+
args+=('text')
59+
else
5760
args+=('--noautoconsole')
5861
fi
5962

examples/to-filesystem-uki-cocl.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -euxo pipefail
44

5-
export IMAGE="quay.io/fedora/fedora-coreos-uki-cocl:stable"
5+
export IMAGE="quay.io/fedora/fedora-coreos-uki-cocl:42.20250901.3.0"
6+
export TARGET="quay.io/travier/fedora-coreos-uki-cocl:42.20250901.3.0"
67
export DISKIMAGE="${DISKIMAGE:-test-filesystem-fcos-uki-cocl.img}"
78
exec ./to-filesystem-uki.sh

examples/to-filesystem-uki.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -euxo pipefail
44

55
IMAGE="${IMAGE:-quay.io/fedora/fedora-bootc-uki:42}"
6+
TARGET="${TARGET:-quay.io/fedora/fedora-bootc-uki:42}"
67
DISKIMAGE="${DISKIMAGE:-test-filesystem-uki.img}"
78

89
umount -R ./mnt || true
@@ -51,6 +52,7 @@ podman run --rm --net=host --privileged --pid=host \
5152
--composefs-native \
5253
--bootloader=systemd \
5354
--source-imgref "containers-storage:$IMAGE" \
55+
--target-imgref "${TARGET}" \
5456
/var/mnt
5557

5658
# --uki-addon-permanent=btrfs \

0 commit comments

Comments
 (0)