-
Notifications
You must be signed in to change notification settings - Fork 70
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
Implement Multi-Lower-Layer Overlay Support through Merging #122
Conversation
Should I also add some tests for this? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Let's do a separate version bump once the tests pass on this.
Could you rebase this to not have Eric's and Michael's commits? Maybe you just need to start your branch from future instead of main? |
b1f5873
to
6c6b8e0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great! One small potential bug and a few small fixes (to save on processes).
@mgree I have addressed all your comments. Feel free to merge! |
before we merge, i’d like to take a bit and look into why CI is failing, i’ll try to repro this on my machines. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left some questions :)
Talking with @angelhof about this, we realized there's a tricky interaction with The correct solution is to mergerfs mount the layers of lowerdir and compare against that merged lowerdir (rather than the But until we have a use case where someone would want to use summaries and multiple lowerdirs ( |
4240060
to
b0538b4
Compare
Rebased this off |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice test! I think there's some tiny argparsing fixup to do and we're good to go.
b0538b4
to
d468590
Compare
@mgree, I addressed the comments you left. |
|
c080ca5
to
3b0e768
Compare
3b0e768
to
7b0e233
Compare
Cleaned everything unrelated to this PR |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me! 🎉 🚀 👍
Oh, is this supposed to merge into |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few tiny nitpicks, looking good!
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm! thank you!!
This Pull Request introduces the
-L
flag totry
, enabling the specification and merging of multiple lower directories for overlay. The lower directories are specified as a colon-separated list (dir_1:dir_2:...:dir_n
), operating with a precedence logic where directories on the left have a higher precedence over those on the right. This feature allows users to overlay multiple directories together during the command execution within a single overlay environment.