MLE-23379 Add conditional ML10 dependency#383
Merged
vitalykorolev merged 1 commit intoAug 20, 2025
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR adds conditional dependency handling for MarkLogic 10, specifically restoring the 32-bit libstdc++ dependency that was previously removed but is still required for MarkLogic 10.
- Adds ML_VERSION build argument to the marklogic-deps Docker image
- Introduces conditional installation of libstdc++.i686 for MarkLogic 10
- Updates the Makefile to pass the ML_VERSION during build
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| dockerFiles/marklogic-deps-ubi:base | Adds conditional logic to install 32-bit libstdc++ for ML 10 |
| Makefile | Passes ML_VERSION build argument to docker build command |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
rwinieski
approved these changes
Aug 20, 2025
This file contains hidden or 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
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
We removed 32 bit version of libstdc++ in one of the previous commits, but it's required for MarkLogic 10.
Checklist:
Owner:
JIRA_ID as part of branch/PR name
Rebase the branch with upstream
Squashed all commits into a single commit
Added Tests
Reviewer:
Reviewed Tests
Added to Release Wiki/Jira