Skip to content

deploy: Pull bound images before staging via composefs mount #2290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cgwalters wants to merge 3 commits into
base: main
Choose a base branch
from
Open

deploy: Pull bound images before staging via composefs mount #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acf0ed6
composefs,centos-9: Enable rhel9 cargo feature for kernel 5.14 loopba…
cgwalters May 15, 2026
74f6c22
deploy: Pull bound images before staging via composefs mount
cgwalters Jul 7, 2026
74c96e9
Update composefs-rs
cgwalters Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,6 @@ jobs:
seal_state: ["sealed", "unsealed"]

exclude:
# https://github.com/bootc-dev/bootc/issues/1812
- test_os: centos-9
variant: composefs
- seal_state: "sealed"
boot_type: bls
- seal_state: "sealed"
Expand Down
112 changes: 59 additions & 53 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ clap_mangen = { version = "0.3.0" }
# pulls), which drags in rustls-webpki/untrusted/webpki-root-certs whose
# licenses aren't in our cargo-deny allow list. Re-enable once that's sorted.
# See: https://github.com/bootc-dev/bootc/pull/2295
composefs-ctl = { git = "https://github.com/composefs/composefs-rs", rev = "0a819c351951864071aa9ec23d6594710bf3173f", default-features = false, features = [
composefs-ctl = { git = "https://github.com/composefs/composefs-rs", rev = "5a227a01ed389d29884181ec8aabc75f484e966d", default-features = false, features = [
"pre-6.15",
"pre-6.16",
"oci",
Expand Down
10 changes: 9 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,15 @@ prefix ?= /usr
# We may in the future also want to include Fedora+derivatives as
# the code is really tiny.
# (Note we should also make installation of the units conditional on the rhsm feature)
CARGO_FEATURES_DEFAULT ?= $(shell . /usr/lib/os-release; if echo "$$ID_LIKE" |grep -qF rhel; then echo rhsm; fi)
#
# Enable the rhel9 feature on RHEL/CentOS Stream 9, which runs kernel 5.14.
# That kernel cannot mount an erofs image directly from a file descriptor;
# composefs-ctl's rhel9 feature activates a loopback-device fallback instead.
CARGO_FEATURES_DEFAULT ?= $(shell . /usr/lib/os-release; \
features=""; \
if echo "$$ID_LIKE" | grep -qF rhel; then features="$$features rhsm"; fi; \
if echo "$$ID_LIKE" | grep -qF rhel && [ "$$VERSION_ID" = "9" ]; then features="$$features rhel9"; fi; \
echo $$features)
# You can set this to override all cargo features, including the defaults
CARGO_FEATURES ?= $(CARGO_FEATURES_DEFAULT)

Expand Down
Loading