Skip to content

MLE-23379 Add conditional ML10 dependency#383

Merged
vitalykorolev merged 1 commit into
marklogic:developfrom
vitalykorolev:MLE-23379_update-ml10-deps
Aug 20, 2025
Merged

MLE-23379 Add conditional ML10 dependency#383
vitalykorolev merged 1 commit into
marklogic:developfrom
vitalykorolev:MLE-23379_update-ml10-deps

Conversation

@vitalykorolev
Copy link
Copy Markdown
Collaborator

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

Copilot AI review requested due to automatic review settings August 20, 2025 05:08
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

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.

Comment thread dockerFiles/marklogic-deps-ubi:base
@vitalykorolev vitalykorolev merged commit 3b24fee into marklogic:develop Aug 20, 2025
2 checks passed
@vitalykorolev vitalykorolev deleted the MLE-23379_update-ml10-deps branch August 20, 2025 14:31
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.

3 participants