Merge ostree-ext #875
Merged
Merge ostree-ext #875
Conversation
This file contains 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
Add a man page (which we'll figure out how to install later) describing the state of things.
man: Add ostree-container-auth
We need to support e.g. `rpm-ostree compose container-encapsulate --format=oci manifest.yaml oci:foo:42`
This patch allows container image deployment stored in a local directory in addition to the supported remote OCI registry, OCI archive tarball, and local container storage. For example, the following command is now supported: sudo ostree container image deploy --imgref ostree-unverified-image:dir:/var/home/core/fcos --sysroot /var/home/core/sysroot --stateroot fedora-coreos The reason for making this change relates to the effort to create an FCOS qemu image from a container image input using OSBuild. OSBuild stores container image sources in a local directory in order to solve another bug and, thus, should not be changed. Therefore, to allow OSBuild to deploy from a container image, this patch is needed.
…ner-deploy Allows container deployment from local directory
- Cover containers-storage and oci-archive too - Test that we can reserialize back into the same string
container: Add more tests for image reference
This change adds an integration test for deploying from a container image stored in a local directory. It is directly related a recent change to support the `dir:` transport when using `ostree container image deploy`.
container/encapsulate: Fix pushing to OCI directories with a tag
…-deploy-integration-test container: Add dir container deploy test
Just two small changes, plus a new man page.
term_size is archived.
lib: Port to terminal-size
Release 0.12.2
Looking at doing a bootc reinstall, we need the ability to retain existing deployments for this.
deploy: Add a no_clean option
I copy/pasted the mountpoint check into bootc, but it'd be better to centralize.
…check lib: Add mountutil module
This also relates to youki-dev/oci-spec-rs#143 Basically getting the version from the config requires a helper, this is a lot more convenient.
lib/container: Add APIs to retrieve version conveniently
We're really verbose with `env RUST_LOG=debug`...most of these spans shouldn't be emitting any arguments at all . And even then let's lower to debug level for them too.
This ends up recursing into the manifest/config objects which is a wall of spam with `env RUST_LOG=debug`. Just print the merge commit to start here.
Quiet extremely verbose tracing::debug
Mainly want to use new apis in bootc.
Release 0.12.3
If we have a low amount of high-size packages then we will drain with an index higher than the size of the Vec which triggers a panic. Fixes: coreos/rpm-ostree#4646
chunking: Handle low amount of high-size packages
I don't recall now the rationale for the previous code; if we're using this path we always want to be in a container-native mode. Currently the "unpack to pure ostree commit" gets triggered if one uses this on a container image created via raw `ostree container encapsulate`. Anyone who wants the prior behavior should instead unencapsulate and deploy the underlying commit.
deploy: Always use merge commit
This allows us to accept images to that don't have any metadata keys starting with `ostree`. Signed-off-by: Colin Walters <walters@verbum.org>
Import generic prep
Because dnf5 broke it and keeping both working is annoying and we didn't really need it. Signed-off-by: Colin Walters <walters@verbum.org>
installdeps: drop dnf config-manager
This (with cautious optimism) appears to fix containers#657. Signed-off-by: John Eckersberg <jeckersb@redhat.com>
Remove decompress_bridge and move decompression inline
This relies on the new tar API. Closes: ostreedev/ostree-rs-ext#655 Signed-off-by: Colin Walters <walters@verbum.org>
See containers#856 Basically we need to handle absolute paths here too. Signed-off-by: Colin Walters <walters@verbum.org>
tar: Propagate PAX extensions (including xattrs)
…ot-absolute tar: Handle absolute hardlinked paths to sysroot
Release 0.15.3
|
Ah, messed this one up, will redo later |
cgwalters
force-pushed
the
merge-ostree-rs-ext
branch
from
52dd6c6 to
2358336
Compare
|
OK I redid this one, now with proper git history |
|
EDIT: Well it helps to signoff the merge commit but, I think in practice I guess we can't use subtree merges if we want to require signoffs on each commit, we need to use |
…s-ext Signed-off-by: Colin Walters <walters@verbum.org>
cgwalters
force-pushed
the
merge-ostree-rs-ext
branch
from
2358336 to
23a54d9
Compare
p5
reviewed
Nov 7, 2024
There was a problem hiding this comment.
Unfortunately, GitHub doesn't support GHA workflows in subdirectories (something I've wanted for years!), so these tests will not run.
If you wish to keep these tests, it's probably best moving the contents of ./ostree-ext/.github/workflows/ to ./.github/workflows/.
Any paths inside these workflows will also need updating, since they aren't expecting the old directory structure.
There was a problem hiding this comment.
Thanks, yep there's more followup to do here, though in practice we have decent coverage from the unit tests and our integration tests here cover a lot.
|
I have clicked "Set DCO to pass" to override the signoff on individual commits. Most of these commits are mine anyways, and with this statement I add my |
There's a lot shared between bootc and ostree-rs-ext. Signed-off-by: Colin Walters <walters@verbum.org>
jeckersb
approved these changes
Nov 7, 2024
|
Yay for one less repo to watch 🥳 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
xref ostreedev/ostree-rs-ext#675
Basically I see bootc as the successor/inheritor of the original ostree-container work.
It will help us close the loop faster on things to merge it into this project.
TODO followups:
bootc internals ostree-containeror so we can take over theostree containerverb