Skip to content
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.

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

manifest,image: add Files,Directories to bootc customizations #1227

Merged
merged 2 commits into from
Feb 25, 2025

Conversation

mvo5
Copy link
Contributor

@mvo5 mvo5 commented Feb 17, 2025

This commit adds support for Files,Directories to the bp
customizations fo BootcDiskImage and RawBootcImage.

The integration test is in osbuild/bootc-image-builder#841 once that is green this can be considered ready. The unit test has the gap that "getInlineSources()" is not covered, I looked but did not found a good way, I would really like to get back to this at some point though (and also see if the 5 identical implementations could be somehow unified).

mvo5 added a commit to mvo5/bootc-image-builder that referenced this pull request Feb 17, 2025
This commit adds support for files/directories in blueprint
customizations.

This needs osbuild/images#1227

Closes: osbuild#834
Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

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

This PR and commit are specifically for the bootc disk images but the commit message (summary and description) don't mention it at all. Can you make it more specific so it's clearer when reading back? The current description makes it sound like this PR introduces the customizations for the first time.

Otherwise, LGTM! Thanks :)

@ondrejbudai
Copy link
Member

We should probably do this before selinux labelling, right? This is how the os pipeline does it IIRC.

@mvo5 mvo5 force-pushed the bootc-files-dirs branch 2 times, most recently from 8313e74 to 51a9fe1 Compare February 18, 2025 08:51
mvo5 added a commit to mvo5/bootc-image-builder that referenced this pull request Feb 18, 2025
This commit adds support for files/directories in blueprint
customizations.

This needs osbuild/images#1227

Closes: osbuild#834
@achilleas-k
Copy link
Member

We should probably do this before selinux labelling, right? This is how the os pipeline does it IIRC.

of course. good catch!

@mvo5 mvo5 changed the title manifest: add Files,Directories to bp customizations manifest: add bootc Files,Directories to bp customizations Feb 18, 2025
@mvo5 mvo5 changed the title manifest: add bootc Files,Directories to bp customizations manifest,image: add Files,Directories to bootc customizations Feb 18, 2025
This commit adds support for Files,Directories to the bp
customizations fo BootcDiskImage and RawBootcImage.
mvo5 added a commit to mvo5/bootc-image-builder that referenced this pull request Feb 18, 2025
This commit adds support for files/directories in blueprint
customizations.

This needs osbuild/images#1227

Closes: osbuild#834
@mvo5 mvo5 marked this pull request as ready for review February 18, 2025 12:02
@mvo5 mvo5 requested a review from a team as a code owner February 18, 2025 12:02
This commit runs selinux labeling unconfidionally. Traditionally
we wanted to touch the filesystem that bootc created as little
as possible. However as Achilleas rightfully pointed out we
always write the /etc/fstab so we always need to label.

If we go back to not write /etc/fstab and use kargs to find the
rootfs (see issue#756) we probably should to revert this again
and make labeling conditional again.
@mvo5 mvo5 requested a review from achilleas-k February 20, 2025 12:42
@mvo5 mvo5 requested a review from ondrejbudai February 20, 2025 20:24
Copy link
Member

@supakeen supakeen left a comment

Choose a reason for hiding this comment

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

Code is fine; I'm having a harder time understanding the use case for this.

@mvo5 mvo5 added this pull request to the merge queue Feb 25, 2025
@mvo5
Copy link
Contributor Author

mvo5 commented Feb 25, 2025

Code is fine; I'm having a harder time understanding the use case for this.

Uh, my bad - I should have linked the issue that promoted this directly - here it is osbuild/bootc-image-builder#834

Merged via the queue into osbuild:main with commit 83e1f6e Feb 25, 2025
18 checks passed
@mvo5 mvo5 deleted the bootc-files-dirs branch February 25, 2025 10:14
mvo5 added a commit to mvo5/bootc-image-builder that referenced this pull request Feb 26, 2025
This commit adds support for files/directories in blueprint
customizations.

This needs osbuild/images#1227

Closes: osbuild#834
mvo5 added a commit to mvo5/bootc-image-builder that referenced this pull request Feb 26, 2025
This commit adds support for files/directories in blueprint
customizations.

This needs osbuild/images#1227

Closes: osbuild#834
mvo5 added a commit to mvo5/bootc-image-builder that referenced this pull request Feb 26, 2025
This commit adds support for files/directories in blueprint
customizations.

This needs osbuild/images#1227

Closes: osbuild#834
mvo5 added a commit to mvo5/bootc-image-builder that referenced this pull request Feb 27, 2025
This commit adds support for files/directories in blueprint
customizations.

This needs osbuild/images#1227

Closes: osbuild#834
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants