Skip to content

Commit 5f64268

Browse files
author
Gareth Widlansky
committed
Nits
Signed-off-by: Gareth Widlansky <gareth.widlansky@proton.me>
1 parent 2c3856f commit 5f64268

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Dockerfile.cfsuki

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN --mount=type=secret,id=key \
2424
--mount=type=secret,id=cert \
2525
--mount=type=bind,from=base,target=/target \
2626
<<EOF
27-
set -eux
27+
set -xeuo pipefail
2828

2929
# Should be generated externally
3030
test -n "${COMPOSEFS_FSVERITY}"
@@ -66,7 +66,7 @@ cp /run/kernel/boot/$kver.efi $target
6666
rm -v /usr/lib/modules/${kver}/{vmlinuz,initramfs.img}
6767
# Symlink into the /usr/lib/modules location
6868
ln -sr $target /usr/lib/modules/${kver}/$(basename $kver.efi)
69-
bootc container lint # --fatal-warnings no fatal warning
69+
bootc container lint --fatal-warnings
7070
EOF
7171

7272
FROM base as final-final

Dockerfile.sdboot

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ dnf clean all
1313
EORUN
1414

1515

16-
FROM buildroot-base as kernel
16+
FROM buildroot-base as signer
1717
# Sign sdboot and put it on the target first
1818
RUN --mount=type=secret,id=key \
1919
--mount=type=secret,id=cert \
2020
--mount=type=bind,from=base-unsigned,target=/target \
21-
<<EORUN
22-
set -eux
21+
<<EORUN
22+
set -xeuo pipefail
2323

2424
# pesign uses NSS database so create it from input cert/key
2525
mkdir pesign
@@ -41,9 +41,9 @@ EORUN
4141

4242

4343
FROM base-unsigned as final
44-
RUN --mount=type=bind,from=kernel,target=/run/sdboot \
45-
<<EORUN
46-
set -eux
44+
RUN --mount=type=bind,from=signer,target=/run/sdboot \
45+
<<EORUN
46+
set -xeuo pipefail
4747
sdboot=/usr/lib/systemd/boot/efi/systemd-bootx64.efi
4848
# copy signed sdboot from buildroot
4949
cp "/run/sdboot/sdboot.efi" ${sdboot}

0 commit comments

Comments
 (0)