Skip to content

Commit 1ea1d3f

Browse files
committed
Fix undefined BOOTC_buildroot_base in build-sealed script
The build-sealed script introduced in PR #1810 referenced BOOTC_buildroot_base which is only defined in GitHub Actions CI, causing failures when running 'just build-sealed' manually. This allows manual execution while maintaining CI compatibility. Signed-off-by: Wei Shi <[email protected]>
1 parent f687add commit 1ea1d3f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Justfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ integration_upgrade_img := integration_img + "-upgrade"
2222
# composefs-sealeduki-sdboot: A system with a sealed composefs using systemd-boot
2323
variant := env("BOOTC_variant", "ostree")
2424
base := env("BOOTC_base", "quay.io/centos-bootc/centos-bootc:stream10")
25+
buildroot_base := env("BOOTC_buildroot_base", "quay.io/centos/centos:stream10")
2526

2627
testimage_label := "bootc.testimage=1"
2728
# We used to have --jobs=4 here but sometimes that'd hit this
@@ -41,7 +42,7 @@ buildargs := "--build-arg=base=" + base + " --build-arg=variant=" + variant
4142
# `just build --build-arg=base=quay.io/fedora/fedora-bootc:42`
4243
build:
4344
podman build {{base_buildargs}} -t {{base_img}}-bin {{buildargs}} .
44-
./tests/build-sealed {{variant}} {{base_img}}-bin {{base_img}}
45+
./tests/build-sealed {{variant}} {{base_img}}-bin {{base_img}} {{buildroot_base}}
4546

4647
# Build a sealed image from current sources.
4748
build-sealed:
@@ -74,7 +75,7 @@ package: _packagecontainer
7475
# This container image has additional testing content and utilities
7576
build-integration-test-image: build
7677
cd hack && podman build {{base_buildargs}} -t {{integration_img}}-bin -f Containerfile .
77-
./tests/build-sealed {{variant}} {{integration_img}}-bin {{integration_img}}
78+
./tests/build-sealed {{variant}} {{integration_img}}-bin {{integration_img}} {{buildroot_base}}
7879
# Keep these in sync with what's used in hack/lbi
7980
podman pull -q --retry 5 --retry-delay 5s quay.io/curl/curl:latest quay.io/curl/curl-base:latest registry.access.redhat.com/ubi9/podman:latest
8081

@@ -118,7 +119,7 @@ test-tmt *ARGS: build-integration-test-image _build-upgrade-image
118119
# Generate a local synthetic upgrade
119120
_build-upgrade-image:
120121
cat tmt/tests/Dockerfile.upgrade | podman build -t {{integration_upgrade_img}}-bin --from={{integration_img}}-bin -
121-
./tests/build-sealed {{variant}} {{integration_upgrade_img}}-bin {{integration_upgrade_img}}
122+
./tests/build-sealed {{variant}} {{integration_upgrade_img}}-bin {{integration_upgrade_img}} {{buildroot_base}}
122123

123124
# Assume the localhost/bootc-integration image is up to date, and just run tests.
124125
# Useful for iterating on tests quickly.

tests/build-sealed

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ shift
1010
# The output container image
1111
output_image=$1
1212
shift
13+
# Buildroot base image for UKI build environment
14+
buildroot_base=${1:-quay.io/centos/centos:stream10}
15+
shift
1316
# Optional directory with secure boot keys; if none are provided, then we'll
1417
# generate some under target/
1518
secureboot=${1:-}
@@ -61,6 +64,6 @@ fi
6164
runv podman build -t $output_image \
6265
--build-arg=COMPOSEFS_FSVERITY=${cfs_digest} \
6366
--build-arg=base=${input_image} \
64-
--build-arg=buildroot=${BOOTC_buildroot_base} \
67+
--build-arg=buildroot=${buildroot_base} \
6568
--secret=id=key,src=${secureboot}/db.key \
6669
--secret=id=cert,src=${secureboot}/db.crt -f Dockerfile.cfsuki .

0 commit comments

Comments
 (0)