Skip to content

Fix undefined BOOTC_buildroot_base in build-sealed script#1815

Merged
cgwalters merged 2 commits intobootc-dev:mainfrom
shi2wei3:fix-buildroot-base-undefined
Dec 1, 2025
Merged

Fix undefined BOOTC_buildroot_base in build-sealed script#1815
cgwalters merged 2 commits intobootc-dev:mainfrom
shi2wei3:fix-buildroot-base-undefined

Conversation

@shi2wei3
Copy link
Copy Markdown
Contributor

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.

The build-sealed script introduced in PR bootc-dev#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 <wshi@redhat.com>
@bootc-bot bootc-bot bot requested a review from jmarrero November 28, 2025 09:42
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request fixes an issue where running just build-sealed manually would fail due to an undefined BOOTC_buildroot_base variable. The fix involves defining this variable in the Justfile with a default value and passing it to the build-sealed script. The script is also updated to accept this new argument and use it. The changes are correct and address the issue. I have one suggestion to improve maintainability by removing a duplicated default value.

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Signed-off-by: Wei Shi <wshi@redhat.com>
Copy link
Copy Markdown
Collaborator

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below

# composefs-sealeduki-sdboot: A system with a sealed composefs using systemd-boot
variant := env("BOOTC_variant", "ostree")
base := env("BOOTC_base", "quay.io/centos-bootc/centos-bootc:stream10")
buildroot_base := env("BOOTC_buildroot_base", "quay.io/centos/centos:stream10")
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a correct fix, but it is a bit of an ergonomic problem to have two bases and it'd probably simplify things to just reuse base for this by default.

@cgwalters cgwalters merged commit b017a9b into bootc-dev:main Dec 1, 2025
38 of 41 checks passed
@shi2wei3 shi2wei3 deleted the fix-buildroot-base-undefined branch December 2, 2025 03:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants