MLE-30189 sync from master#465
Merged
Merged
Conversation
…increment-docker-version MLE-25638 Fix notice file and increment Docker version for release
MLE-25350 Release/docker 2.2.3
MLE-26111 Release/docker 2.2.4
…om-master PDP-1182: Remove per-repo pr-workflow.yaml
- Update UBI8 base image: 8.10-1771947229 -> 8.10-1778735208 - Update UBI9 base image: 9.7-1771346502 -> 9.7-1778562320 - Fix UBI8 libnsl: bump to el8_10.34, targeted glibc upgrade, cache cleanup - Fix UBI9 libnsl: use --nodeps to bypass glibc el9_8 version pin, targeted glibc upgrade, cache cleanup; add comment explaining rationale - Bump dockerVersion 2.2.4 -> 2.2.5 in Jenkinsfile and keywords.resource
- Update UBI8 base image: 8.10-1771947229 -> 8.10-1778735208 - Update UBI9 base image: 9.7-1771346502 -> 9.7-1778562320 - Fix UBI8 libnsl: bump to el8_10.34, targeted glibc upgrade, cache cleanup - Fix UBI9 libnsl: use --nodeps to bypass glibc el9_8 version pin, targeted glibc upgrade, cache cleanup; add comment explaining rationale - Bump dockerVersion 2.2.4 -> 2.2.5 in Jenkinsfile and keywords.resource
- Update UBI8 base image: 8.10-1771947229 -> 8.10-1778735208 - Update UBI9 base image: 9.7-1771346502 -> 9.7-1778562320 - Fix UBI8 libnsl: bump to el8_10.34, targeted glibc upgrade, cache cleanup - Fix UBI9 libnsl: use --nodeps to bypass glibc el9_8 version pin, targeted glibc upgrade, cache cleanup; add comment explaining rationale - Bump dockerVersion 2.2.4 -> 2.2.5 in Jenkinsfile and keywords.resource
…elease-2.2.5 MLE-29914: update libnsl repo path to AlmaLinux 9.7
…-release-2.2.5 MLE-29914: fix UBI8 tzdata reinstall failure on release/docker-2.2.5
MLE-00000 Release/docker 2.2.5
MLE-30189 Release/docker 2.2.6
vitalykorolev
requested review from
barkhachoithani,
pengzhouml and
sumanthravipati
Contributor
There was a problem hiding this comment.
Pull request overview
Ports release-branch container version updates back to develop by bumping the MarkLogic server/Docker image versions used in CI and tests, and adjusting build pipeline parameters.
Changes:
- Updated Robot test defaults to use
11.3.6/2.2.6images and variables. - Updated Jenkins pipeline parameters (including Docker version default and MarkLogic version choices).
- Updated the UBI8 dependency base Dockerfile to upgrade
glibcand installlibnsl(but currently duplicated in the diff).
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| test/keywords.resource | Bumps default test image tag and related version variables to 11.3.6 / 2.2.6. |
| Jenkinsfile | Updates pipeline parameters (Docker version default; adds/adjusts parameters). |
| dockerFiles/marklogic-deps-ubi:base | Adjusts dependency image build steps for glibc/libnsl (currently contains duplicated instructions). |
sumanthravipati
previously approved these changes
Jul 7, 2026
sumanthravipati
approved these changes
Jul 7, 2026
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
Release branch container updated Docker version which now needs to be ported to develop.
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