This repository was archived by the owner on Jan 15, 2025. It is now read-only.
container: Hard require ostree.bootable key
#356
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We want in particular things like `ostree.bootable`.
This way panics are properly attributed to the real source.
Since that's our intended use case for now.
cgwalters
force-pushed
the
refuse-non-bootable
branch
from
f84a677 to
c3e68fb
Compare
jlebon
approved these changes
Aug 24, 2022
lib/src/container/store.rs
Outdated
| let bootable_key = *ostree::METADATA_KEY_BOOTABLE; | ||
| let bootable = config_labels.map_or(false, |l| l.contains_key(bootable_key)); | ||
| if !bootable { | ||
| anyhow::bail!("Target container does not have {bootable_key} label"); |
Member
There was a problem hiding this comment.
Minor/optional: s/container/image/
We want to give a clear and useful error when someone tries to pull a non-ostree-based container image.
cgwalters
force-pushed
the
refuse-non-bootable
branch
from
c3e68fb to
9c4a75b
Compare
Member
Author
|
I was worried this would break more things, but I did double check we had this key in FCOS and the Fedora Silverblue builds, etc. And that's the case since rpm-ostree does it by default. But the test suite needed coreos/rpm-ostree#3971 And clearly we should have |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
tests: Propagate metadata from prior commit
We want in particular things like
ostree.bootable.tests: Use
#[track_caller]This way panics are properly attributed to the real source.
tests/fixture: Inject
ostree.bootableby defaultSince that's our intended use case for now.
container: Hard require
ostree.bootablekeyWe want to give a clear and useful error when someone tries
to pull a non-ostree-based container image.