-
-
Notifications
You must be signed in to change notification settings - Fork 6
feat: move patch apply logic to patchable #1032
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
Open
dervoeti
wants to merge
26
commits into
main
Choose a base branch
from
feat/move-patch-apply-logic-to-patchable
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
…into feat/move-patch-apply-logic-to-patchable
nightkr
reviewed
Mar 18, 2025
Co-authored-by: Natalie Klestrup Röijezon <[email protected]>
2d20b52
to
1efa478
Compare
1efa478
to
bdc6dfd
Compare
@nightkr It's ready for another round of feedback 🙂 Once it's in a good shape I'll start adapting the patch processes of the other products. |
nightkr
reviewed
Mar 21, 2025
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.
Largely LGTM
…into feat/move-patch-apply-logic-to-patchable
…into feat/move-patch-apply-logic-to-patchable
@nightkr I migrated all Dockerfiles now and tested all builds using the latest versions of the product, worked fine. |
…into feat/move-patch-apply-logic-to-patchable
…into feat/move-patch-apply-logic-to-patchable
…into feat/move-patch-apply-logic-to-patchable
nightkr
reviewed
Apr 14, 2025
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.
Description
This is a draft PR to solve #677. I replaced the
apply_patches.sh
script with Patchable for Zookeeper and Druid.We decided in https://github.com/stackabletech/decisions/issues/44 that all sources should be mirrored on Github (to be implemented by #1011).
My idea was that we can just reuse the existing
checkout
logic, since it does exactly what we want: checkout a repo at a specific commit and apply a bunch of .patch files on top of it. In this PR, the original Apache repositories are used, those would need to be replaced by our mirror repos.I added an optional flag
--images_repo_root
to manually specify a custom root for theimages
repo instead of relying on the auto-detection that Patchable currently does. We could also just use the auto-detection, but then we'd probably need to rungit init && touch .patchable
before running thepatchable checkout
command inside the container, which is a bit awkward. The extra flag isn't super pretty either though and I couldn't get around usingPathBuf
in the implementation, hence I made this a draft PR to serve as a PoC. This is just one way we could replace the patch scripts with Patchable. Maybe this can be solved in a more elegant way, I didn't find one yet though.Definition of Done Checklist
Tasks
TIP: Running integration tests with a new product image
The image can be built and uploaded to the kind cluster with the following commands:
See the output of
bake
to retrieve the image tag for<image-tagged-with-the-major-version>
.