Skip to content
This repository has been archived by the owner on Nov 7, 2024. It is now read-only.

Import generic prep #673

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Conversation

cgwalters
Copy link
Member

tar: Don't filter out toplevel /run, /proc etc

Otherwise we break things when using this code to process
a "non-ostree" image.

Signed-off-by: Colin Walters [email protected]


store: Accept just containers.bootc for as bootable

This allows us to accept images to that don't have any metadata
keys starting with ostree.


Copy link
Collaborator

@djach7 djach7 left a comment

Choose a reason for hiding this comment

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

Tested and built successfully for me, apart from that test_tar_write test failing. Are we ignoring that for now? Otherwise lgtm, I just had a clarifying question about v.

lib/src/container/encapsulate.rs Show resolved Hide resolved
Otherwise we break things when using this code to process
a "non-ostree" image.

Signed-off-by: Colin Walters <[email protected]>
This allows us to accept images to that don't have any metadata
keys starting with `ostree`.

Signed-off-by: Colin Walters <[email protected]>
@cgwalters cgwalters force-pushed the import-generic-prep branch from 2d0c3f6 to 8e19d6e Compare October 24, 2024 16:14
@cgwalters
Copy link
Member Author

Fixed the CI test

@cgwalters cgwalters enabled auto-merge October 24, 2024 18:00
@cgwalters
Copy link
Member Author

@jeckersb at the moment David doesn't have merge rights (i invited him) but can you stamp this?

Copy link
Collaborator

@djach7 djach7 left a comment

Choose a reason for hiding this comment

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

Just accepted the inv, lgtm

@cgwalters cgwalters merged commit 0c118cb into ostreedev:main Oct 24, 2024
11 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants