Skip to content

MLE-25350 update develop from 2.2.3 release #405

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.

Sign up for GitHub

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

Closed
vitalykorolev wants to merge 5 commits into from
Closed

MLE-25350 update develop from 2.2.3 release #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6a054b
Update UBI base versions
vitalykorolev Nov 17, 2025
6ebfd13
Remove UBI9 update to resolve libnsl conflict
vitalykorolev Nov 17, 2025
1ccdb77
Fix notice file and increment Docker version for release
vitalykorolev Nov 26, 2025
529bb84
Merge pull request #402 from vitalykorolev/MLE-25638_fix-notices-and-…
vitalykorolev Nov 26, 2025
b70e6ca
Merge pull request #404 from marklogic/release/docker-2.2.3
vitalykorolev Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ pipeline {

parameters {
string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
string(name: 'dockerVersion', defaultValue: '2.2.2', description: 'ML Docker version. This version along with ML rpm package version will be the image tag as {ML_Version}_{dockerVersion}', trim: true)
string(name: 'dockerVersion', defaultValue: '2.2.3', description: 'ML Docker version. This version along with ML rpm package version will be the image tag as {ML_Version}_{dockerVersion}', trim: true)
choice(name: 'dockerImageType', choices: 'ubi-rootless\nubi\nubi9-rootless\nubi9', description: 'Platform type for Docker image. Will be made part of the docker image tag')
string(name: 'upgradeDockerImage', defaultValue: '', description: 'Docker image for testing upgrades. Defaults to ubi image if left blank.\n Currently upgrading to ubi-rotless is not supported hence the test is skipped when ubi-rootless image is provided.', trim: true)
choice(name: 'marklogicVersion', choices: '12\n11\n10', description: 'MarkLogic Server Branch. used to pick appropriate rpm')
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Apache License, Version 2.0, January 2004 (Apache-2.0)

Third-Party Components

The following is a list of third-party components used by MarkLogic Docker Container Image v2.1.0 (last updated October 18, 2024):
The following is a list of third-party components used by MarkLogic Docker Container Image v2 (last updated October 18, 2024):
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

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

The 'last updated' date remains October 18, 2024, but the third-party components list should be reviewed and the date updated if any dependencies have changed with the 2.2.3 release (especially given the UBI base image updates).

Suggested change
The following is a list of third-party components used by MarkLogic Docker Container Image v2 (last updated October 18, 2024):
The following is a list of third-party components used by MarkLogic Docker Container Image v2 (last updated June 10, 2024):

Copilot uses AI. Check for mistakes.

RedHat UBI Docker Base Image 8
https://catalog.redhat.com/software/containers/ubi8/5c647760bed8bd28d0e38f9f?architecture=amd64&image=6643ab9ff6bc4ca6c09fb093&container-tabs=gti
Expand Down
5 changes: 2 additions & 3 deletions dockerFiles/marklogic-deps-ubi9:base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
#
###############################################################

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6-1758184547
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6-1760515502
LABEL "com.marklogic.maintainer"="docker@marklogic.com"

###############################################################
# install libnsl rpm package
###############################################################

Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

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

The removal of 'microdnf -y update' before installing libnsl.rpm means the base image packages are no longer being updated. This change should be intentional and documented, as it may impact security patches. Consider adding a comment explaining why the update step was removed.

Suggested change
# Intentionally omitting 'microdnf -y update' before installing libnsl.rpm to maintain build reproducibility and avoid unexpected changes from updated packages.
# Be aware that this may leave the image without the latest security patches from the base image. Update the base image regularly to mitigate this risk.

Copilot uses AI. Check for mistakes.
RUN microdnf -y update \
&& curl -Lso libnsl.rpm https://bed-artifactory.bedford.progress.com:443/artifactory/ml-rpm-release-tierpoint/devdependencies/libnsl-2.34-168.el9_6.23.x86_64.rpm \
RUN curl -Lso libnsl.rpm https://bed-artifactory.bedford.progress.com:443/artifactory/ml-rpm-release-tierpoint/devdependencies/libnsl-2.34-168.el9_6.23.x86_64.rpm \
&& rpm -i libnsl.rpm \
&& rm -f libnsl.rpm

Expand Down
2 changes: 1 addition & 1 deletion dockerFiles/marklogic-deps-ubi:base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
###############################################################

FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1756195339
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1761032271
LABEL "com.marklogic.maintainer"="docker@marklogic.com"

# MarkLogic version passed from build to enable conditional deps
Expand Down
6 changes: 3 additions & 3 deletions test/keywords.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Library DateTime
${DEFAULT ADMIN USER} test_admin
${DEFAULT ADMIN PASS} test_admin_pass
${SPEC CHARS ADMIN PASS} Admin@2$s%^&*!
${TEST_IMAGE} %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.2}
${UPGRADE_TEST_IMAGE} progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.2
${TEST_IMAGE} %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.3}
${UPGRADE_TEST_IMAGE} progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.3
${DOCKER TIMEOUT} 300s
${LICENSE KEY} %{QA_LICENSE_KEY=none}
${LICENSEE} MarkLogic - Version 9 QA Test License
Expand All @@ -22,7 +22,7 @@ ${BUILD_BRANCH} release_2.2.1
${IMAGE_TYPE} ubi-rootless
${VOL_NAME} MarkLogic_vol_1
${VOL_INFO} src=${VOL_NAME},dst=/var/opt/MarkLogic
${MARKLOGIC_DOCKER_VERSION} 2.2.2
${MARKLOGIC_DOCKER_VERSION} 2.2.3
${TEST_RESULTS_DIR} test_results

*** Keywords ***
Expand Down