From d6a054b8c31eed9bccba6cca4e035e21153982d5 Mon Sep 17 00:00:00 2001
From: Vitaly <vitaly.korolev@gmail.com>
Date: Mon, 17 Nov 2025 10:37:12 -0800
Subject: [PATCH 01/20] Update UBI base versions

---
 dockerFiles/marklogic-deps-ubi9:base | 2 +-
 dockerFiles/marklogic-deps-ubi:base  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base
index e49ccafa..5d47e2d9 100644
--- a/dockerFiles/marklogic-deps-ubi9:base
+++ b/dockerFiles/marklogic-deps-ubi9:base
@@ -4,7 +4,7 @@
 #
 ###############################################################
 
-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"
 
 ###############################################################
diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index d8228a40..6fe783a5 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -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

From 6ebfd1371fcf4f9b8c667c2d1fec308ff8b480ed Mon Sep 17 00:00:00 2001
From: Vitaly <vitaly.korolev@gmail.com>
Date: Mon, 17 Nov 2025 10:41:29 -0800
Subject: [PATCH 02/20] Remove UBI9 update to resolve libnsl conflict

---
 dockerFiles/marklogic-deps-ubi9:base | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base
index 5d47e2d9..5a8253a8 100644
--- a/dockerFiles/marklogic-deps-ubi9:base
+++ b/dockerFiles/marklogic-deps-ubi9:base
@@ -11,8 +11,7 @@ LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 # install libnsl rpm package
 ###############################################################
 
-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
 

From 1ccdb77f0fa85b1556f39cb44b96fadc8b021cad Mon Sep 17 00:00:00 2001
From: Vitaly <vitaly.korolev@gmail.com>
Date: Wed, 26 Nov 2025 08:31:55 -0800
Subject: [PATCH 03/20] Fix notice file and increment Docker version for
 release

---
 Jenkinsfile            | 2 +-
 NOTICE.txt             | 2 +-
 test/keywords.resource | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 404b21d1..7bdfaa0d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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')
diff --git a/NOTICE.txt b/NOTICE.txt
index e440874a..116953d9 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -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):
 
 RedHat UBI Docker Base Image 8 
 https://catalog.redhat.com/software/containers/ubi8/5c647760bed8bd28d0e38f9f?architecture=amd64&image=6643ab9ff6bc4ca6c09fb093&container-tabs=gti
diff --git a/test/keywords.resource b/test/keywords.resource
index 0d12eafc..bfd6c142 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -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
@@ -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 ***

From fc02d986c4a14ce47c9470afda60411e87e1c407 Mon Sep 17 00:00:00 2001
From: SameeraPriyathamTadikonda <preethu4476@gmail.com>
Date: Wed, 8 Apr 2026 18:23:49 -0700
Subject: [PATCH 04/20] PDP-1182: Remove per-repo pr-workflow.yaml

---
 .github/workflows/pr-workflow.yaml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 .github/workflows/pr-workflow.yaml

diff --git a/.github/workflows/pr-workflow.yaml b/.github/workflows/pr-workflow.yaml
deleted file mode 100644
index f2a31ab9..00000000
--- a/.github/workflows/pr-workflow.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: 🏷️ JIRA ID Validator
-
-on:
-  # Using pull_request_target instead of pull_request to handle PRs from forks
-  pull_request_target:
-    types: [opened, edited, reopened, synchronize]
-    # No branch filtering - will run on all PRs
-
-jobs:
-  jira-pr-check:
-    name: 🏷️ Validate JIRA ticket ID
-    # Use the reusable workflow from the central repository
-    uses: marklogic/pr-workflows/.github/workflows/jira-id-check.yml@main
-    with:
-      # Pass the PR title from the event context
-      pr-title: ${{ github.event.pull_request.title }}

From a50402c7c1a8c05518d6b619a339b0d13167ef9b Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Thu, 21 May 2026 08:45:35 -0700
Subject: [PATCH 05/20] MLE-29703 MLE-29709 Update UBI base images and fix
 libnsl dependency

- 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
---
 Jenkinsfile                          |  2 +-
 dockerFiles/marklogic-deps-ubi9:base | 12 +++++++++---
 dockerFiles/marklogic-deps-ubi:base  |  7 ++++---
 test/keywords.resource               |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0dcce9fb..ccaaccce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -470,7 +470,7 @@ pipeline {
 
     parameters {
         string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
-        string(name: 'dockerVersion', defaultValue: '2.2.4', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${dockerVersion}', trim: true)
+        string(name: 'dockerVersion', defaultValue: '2.2.5', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${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')
diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base
index 5fe0de0a..a9487e7c 100644
--- a/dockerFiles/marklogic-deps-ubi9:base
+++ b/dockerFiles/marklogic-deps-ubi9:base
@@ -4,15 +4,21 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1771346502
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1778562320
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 ###############################################################
 # install libnsl rpm package
 ###############################################################
 
-RUN microdnf -y update \
-    && rpm -i https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm
+# microdnf -y upgrade glibc brings the UBI9 glibc to a level consistent with the
+# pinned AlmaLinux libnsl build. --nodeps is required because the AlmaLinux libnsl RPM
+# declares an exact glibc version from the AlmaLinux package set that UBI9 repos do not
+# supply verbatim; the symbol ABI is compatible and smoke-tested across all four
+# UBI8/UBI9 x ML11/ML12 build combinations.
+RUN microdnf -y upgrade glibc \
+    && rpm -i --nodeps https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm \
+    && microdnf clean all
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index fe415096..715adae9 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -4,7 +4,7 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1771947229
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1778735208
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 # MarkLogic version passed from build to enable conditional deps
@@ -14,8 +14,9 @@ ARG ML_VERSION
 # install libnsl rpm package
 ###############################################################
 
-RUN microdnf -y update \
-    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.27.x86_64.rpm
+RUN microdnf -y upgrade glibc \
+    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
+    && microdnf clean all
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/test/keywords.resource b/test/keywords.resource
index d684010c..c505fd14 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -12,7 +12,7 @@ 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.4}
+${TEST_IMAGE}    %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.5}
 ${UPGRADE_TEST_IMAGE}    progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IMAGE_TYPE}-${MARKLOGIC_DOCKER_VERSION}
 ${DOCKER TIMEOUT}    300s
 ${LICENSE KEY}    %{QA_LICENSE_KEY=none}
@@ -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.4
+${MARKLOGIC_DOCKER_VERSION}    2.2.5
 ${TEST_RESULTS_DIR}    test_results
 
 *** Keywords ***

From 53c5c85cbec309c83626ccea9ee85718a1c2c456 Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Thu, 21 May 2026 09:12:20 -0700
Subject: [PATCH 06/20] Revert "MLE-29703 MLE-29709 Update UBI base images and
 fix libnsl dependency"

This reverts commit a50402c7c1a8c05518d6b619a339b0d13167ef9b.
---
 Jenkinsfile                          |  2 +-
 dockerFiles/marklogic-deps-ubi9:base | 12 +++---------
 dockerFiles/marklogic-deps-ubi:base  |  7 +++----
 test/keywords.resource               |  4 ++--
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ccaaccce..0dcce9fb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -470,7 +470,7 @@ pipeline {
 
     parameters {
         string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
-        string(name: 'dockerVersion', defaultValue: '2.2.5', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${dockerVersion}', trim: true)
+        string(name: 'dockerVersion', defaultValue: '2.2.4', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${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')
diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base
index a9487e7c..5fe0de0a 100644
--- a/dockerFiles/marklogic-deps-ubi9:base
+++ b/dockerFiles/marklogic-deps-ubi9:base
@@ -4,21 +4,15 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1778562320
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1771346502
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 ###############################################################
 # install libnsl rpm package
 ###############################################################
 
-# microdnf -y upgrade glibc brings the UBI9 glibc to a level consistent with the
-# pinned AlmaLinux libnsl build. --nodeps is required because the AlmaLinux libnsl RPM
-# declares an exact glibc version from the AlmaLinux package set that UBI9 repos do not
-# supply verbatim; the symbol ABI is compatible and smoke-tested across all four
-# UBI8/UBI9 x ML11/ML12 build combinations.
-RUN microdnf -y upgrade glibc \
-    && rpm -i --nodeps https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm \
-    && microdnf clean all
+RUN microdnf -y update \
+    && rpm -i https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index 715adae9..fe415096 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -4,7 +4,7 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1778735208
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1771947229
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 # MarkLogic version passed from build to enable conditional deps
@@ -14,9 +14,8 @@ ARG ML_VERSION
 # install libnsl rpm package
 ###############################################################
 
-RUN microdnf -y upgrade glibc \
-    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
-    && microdnf clean all
+RUN microdnf -y update \
+    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.27.x86_64.rpm
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/test/keywords.resource b/test/keywords.resource
index c505fd14..d684010c 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -12,7 +12,7 @@ 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.5}
+${TEST_IMAGE}    %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.4}
 ${UPGRADE_TEST_IMAGE}    progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IMAGE_TYPE}-${MARKLOGIC_DOCKER_VERSION}
 ${DOCKER TIMEOUT}    300s
 ${LICENSE KEY}    %{QA_LICENSE_KEY=none}
@@ -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.5
+${MARKLOGIC_DOCKER_VERSION}    2.2.4
 ${TEST_RESULTS_DIR}    test_results
 
 *** Keywords ***

From 15ad66fc53feacc7d756b64ca6fc5522f08822ed Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Thu, 21 May 2026 08:45:35 -0700
Subject: [PATCH 07/20] MLE-29703 MLE-29709 Update UBI base images and fix
 libnsl dependency

- 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
---
 Jenkinsfile                          |  2 +-
 dockerFiles/marklogic-deps-ubi9:base | 12 +++++++++---
 dockerFiles/marklogic-deps-ubi:base  |  7 ++++---
 test/keywords.resource               |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0dcce9fb..ccaaccce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -470,7 +470,7 @@ pipeline {
 
     parameters {
         string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
-        string(name: 'dockerVersion', defaultValue: '2.2.4', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${dockerVersion}', trim: true)
+        string(name: 'dockerVersion', defaultValue: '2.2.5', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${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')
diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base
index 5fe0de0a..a9487e7c 100644
--- a/dockerFiles/marklogic-deps-ubi9:base
+++ b/dockerFiles/marklogic-deps-ubi9:base
@@ -4,15 +4,21 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1771346502
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1778562320
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 ###############################################################
 # install libnsl rpm package
 ###############################################################
 
-RUN microdnf -y update \
-    && rpm -i https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm
+# microdnf -y upgrade glibc brings the UBI9 glibc to a level consistent with the
+# pinned AlmaLinux libnsl build. --nodeps is required because the AlmaLinux libnsl RPM
+# declares an exact glibc version from the AlmaLinux package set that UBI9 repos do not
+# supply verbatim; the symbol ABI is compatible and smoke-tested across all four
+# UBI8/UBI9 x ML11/ML12 build combinations.
+RUN microdnf -y upgrade glibc \
+    && rpm -i --nodeps https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm \
+    && microdnf clean all
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index fe415096..715adae9 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -4,7 +4,7 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1771947229
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1778735208
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 # MarkLogic version passed from build to enable conditional deps
@@ -14,8 +14,9 @@ ARG ML_VERSION
 # install libnsl rpm package
 ###############################################################
 
-RUN microdnf -y update \
-    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.27.x86_64.rpm
+RUN microdnf -y upgrade glibc \
+    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
+    && microdnf clean all
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/test/keywords.resource b/test/keywords.resource
index d684010c..c505fd14 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -12,7 +12,7 @@ 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.4}
+${TEST_IMAGE}    %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.5}
 ${UPGRADE_TEST_IMAGE}    progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IMAGE_TYPE}-${MARKLOGIC_DOCKER_VERSION}
 ${DOCKER TIMEOUT}    300s
 ${LICENSE KEY}    %{QA_LICENSE_KEY=none}
@@ -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.4
+${MARKLOGIC_DOCKER_VERSION}    2.2.5
 ${TEST_RESULTS_DIR}    test_results
 
 *** Keywords ***

From c4697aba1683a73e1a811181a3a6c11789068b07 Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Thu, 21 May 2026 13:24:19 -0700
Subject: [PATCH 08/20] Revert "MLE-29703 MLE-29709 Update UBI base images and
 fix libnsl dependency"

This reverts commit 15ad66fc53feacc7d756b64ca6fc5522f08822ed.
---
 Jenkinsfile                          |  2 +-
 dockerFiles/marklogic-deps-ubi9:base | 12 +++---------
 dockerFiles/marklogic-deps-ubi:base  |  7 +++----
 test/keywords.resource               |  4 ++--
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ccaaccce..0dcce9fb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -470,7 +470,7 @@ pipeline {
 
     parameters {
         string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
-        string(name: 'dockerVersion', defaultValue: '2.2.5', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${dockerVersion}', trim: true)
+        string(name: 'dockerVersion', defaultValue: '2.2.4', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${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')
diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base
index a9487e7c..5fe0de0a 100644
--- a/dockerFiles/marklogic-deps-ubi9:base
+++ b/dockerFiles/marklogic-deps-ubi9:base
@@ -4,21 +4,15 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1778562320
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1771346502
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 ###############################################################
 # install libnsl rpm package
 ###############################################################
 
-# microdnf -y upgrade glibc brings the UBI9 glibc to a level consistent with the
-# pinned AlmaLinux libnsl build. --nodeps is required because the AlmaLinux libnsl RPM
-# declares an exact glibc version from the AlmaLinux package set that UBI9 repos do not
-# supply verbatim; the symbol ABI is compatible and smoke-tested across all four
-# UBI8/UBI9 x ML11/ML12 build combinations.
-RUN microdnf -y upgrade glibc \
-    && rpm -i --nodeps https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm \
-    && microdnf clean all
+RUN microdnf -y update \
+    && rpm -i https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index 715adae9..fe415096 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -4,7 +4,7 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1778735208
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1771947229
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 # MarkLogic version passed from build to enable conditional deps
@@ -14,9 +14,8 @@ ARG ML_VERSION
 # install libnsl rpm package
 ###############################################################
 
-RUN microdnf -y upgrade glibc \
-    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
-    && microdnf clean all
+RUN microdnf -y update \
+    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.27.x86_64.rpm
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/test/keywords.resource b/test/keywords.resource
index c505fd14..d684010c 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -12,7 +12,7 @@ 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.5}
+${TEST_IMAGE}    %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.4}
 ${UPGRADE_TEST_IMAGE}    progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IMAGE_TYPE}-${MARKLOGIC_DOCKER_VERSION}
 ${DOCKER TIMEOUT}    300s
 ${LICENSE KEY}    %{QA_LICENSE_KEY=none}
@@ -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.5
+${MARKLOGIC_DOCKER_VERSION}    2.2.4
 ${TEST_RESULTS_DIR}    test_results
 
 *** Keywords ***

From 90eb682329256fe7323f272970d1c9b1084b4102 Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Thu, 21 May 2026 08:45:35 -0700
Subject: [PATCH 09/20] MLE-29703 MLE-29709 Update UBI base images and fix
 libnsl dependency

- 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
---
 Jenkinsfile                          |  2 +-
 dockerFiles/marklogic-deps-ubi9:base | 12 +++++++++---
 dockerFiles/marklogic-deps-ubi:base  |  7 ++++---
 test/keywords.resource               |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0dcce9fb..ccaaccce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -470,7 +470,7 @@ pipeline {
 
     parameters {
         string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
-        string(name: 'dockerVersion', defaultValue: '2.2.4', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${dockerVersion}', trim: true)
+        string(name: 'dockerVersion', defaultValue: '2.2.5', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${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')
diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base
index 5fe0de0a..a9487e7c 100644
--- a/dockerFiles/marklogic-deps-ubi9:base
+++ b/dockerFiles/marklogic-deps-ubi9:base
@@ -4,15 +4,21 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1771346502
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1778562320
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 ###############################################################
 # install libnsl rpm package
 ###############################################################
 
-RUN microdnf -y update \
-    && rpm -i https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm
+# microdnf -y upgrade glibc brings the UBI9 glibc to a level consistent with the
+# pinned AlmaLinux libnsl build. --nodeps is required because the AlmaLinux libnsl RPM
+# declares an exact glibc version from the AlmaLinux package set that UBI9 repos do not
+# supply verbatim; the symbol ABI is compatible and smoke-tested across all four
+# UBI8/UBI9 x ML11/ML12 build combinations.
+RUN microdnf -y upgrade glibc \
+    && rpm -i --nodeps https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm \
+    && microdnf clean all
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index fe415096..715adae9 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -4,7 +4,7 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1771947229
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1778735208
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
 # MarkLogic version passed from build to enable conditional deps
@@ -14,8 +14,9 @@ ARG ML_VERSION
 # install libnsl rpm package
 ###############################################################
 
-RUN microdnf -y update \
-    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.27.x86_64.rpm
+RUN microdnf -y upgrade glibc \
+    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
+    && microdnf clean all
 
 ###############################################################
 # install networking, base deps and tzdata for timezone
diff --git a/test/keywords.resource b/test/keywords.resource
index d684010c..c505fd14 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -12,7 +12,7 @@ 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.4}
+${TEST_IMAGE}    %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.5}
 ${UPGRADE_TEST_IMAGE}    progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IMAGE_TYPE}-${MARKLOGIC_DOCKER_VERSION}
 ${DOCKER TIMEOUT}    300s
 ${LICENSE KEY}    %{QA_LICENSE_KEY=none}
@@ -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.4
+${MARKLOGIC_DOCKER_VERSION}    2.2.5
 ${TEST_RESULTS_DIR}    test_results
 
 *** Keywords ***

From 6989f081e7245e3dc8dc8631d374a8c687e3885f Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Wed, 27 May 2026 10:46:59 -0700
Subject: [PATCH 10/20] MLE-29914: update libnsl repo path to AlmaLinux 9.7

---
 dockerFiles/marklogic-deps-ubi9:base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base
index a9487e7c..1811e0bc 100644
--- a/dockerFiles/marklogic-deps-ubi9:base
+++ b/dockerFiles/marklogic-deps-ubi9:base
@@ -17,7 +17,7 @@ LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 # supply verbatim; the symbol ABI is compatible and smoke-tested across all four
 # UBI8/UBI9 x ML11/ML12 build combinations.
 RUN microdnf -y upgrade glibc \
-    && rpm -i --nodeps https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm \
+    && rpm -i --nodeps https://repo.almalinux.org/almalinux/9.7/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm \
     && microdnf clean all
 
 ###############################################################

From 60ac71d4cf86103e6fb0eb6f5bc11d83d74eb2b1 Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Wed, 27 May 2026 11:42:01 -0700
Subject: [PATCH 11/20] MLE-29914: update UBI8 libnsl repo path to AlmaLinux
 8.10

---
 dockerFiles/marklogic-deps-ubi:base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index 715adae9..aa2ba584 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -15,7 +15,7 @@ ARG ML_VERSION
 ###############################################################
 
 RUN microdnf -y upgrade glibc \
-    && rpm -i https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
+    && rpm -i https://repo.almalinux.org/almalinux/8.10/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
     && microdnf clean all
 
 ###############################################################

From f5ba7721b052f9ea00421923c5eb794f1970bce4 Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Wed, 27 May 2026 11:48:13 -0700
Subject: [PATCH 12/20] MLE-29914: add --nodeps to UBI8 libnsl install to fix
 glibc compatibility

---
 dockerFiles/marklogic-deps-ubi:base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index aa2ba584..99c7a22d 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -15,7 +15,7 @@ ARG ML_VERSION
 ###############################################################
 
 RUN microdnf -y upgrade glibc \
-    && rpm -i https://repo.almalinux.org/almalinux/8.10/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
+    && rpm -i --nodeps https://repo.almalinux.org/almalinux/8.10/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
     && microdnf clean all
 
 ###############################################################

From 2b95ef1769999d38541fc1c5b9eaa6ef7368a66c Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Wed, 27 May 2026 22:00:37 -0700
Subject: [PATCH 13/20] MLE-29914: upgrade tzdata in UBI8 deps to fix reinstall
 failure in server image

---
 dockerFiles/marklogic-deps-ubi:base | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index 99c7a22d..6d069b02 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -24,6 +24,7 @@ RUN microdnf -y upgrade glibc \
 # hadolint ignore=DL3006
 RUN echo "NETWORKING=yes" > /etc/sysconfig/network \
     && microdnf -y install --setopt install_weak_deps=0 gdb redhat-lsb-core initscripts tzdata glibc libstdc++ hostname \
+    && microdnf -y upgrade tzdata \
     && microdnf clean all
 
 ###############################################################

From a070a9d5cf5025b6dc2f20caef9fe0f31326d988 Mon Sep 17 00:00:00 2001
From: Vitaly <vitaly.korolev@gmail.com>
Date: Wed, 24 Jun 2026 15:48:45 -0700
Subject: [PATCH 14/20] Update libnsl version

---
 dockerFiles/marklogic-deps-ubi9:base | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base
index 1811e0bc..afa2fe1a 100644
--- a/dockerFiles/marklogic-deps-ubi9:base
+++ b/dockerFiles/marklogic-deps-ubi9:base
@@ -11,13 +11,12 @@ LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 # install libnsl rpm package
 ###############################################################
 
-# microdnf -y upgrade glibc brings the UBI9 glibc to a level consistent with the
-# pinned AlmaLinux libnsl build. --nodeps is required because the AlmaLinux libnsl RPM
-# declares an exact glibc version from the AlmaLinux package set that UBI9 repos do not
-# supply verbatim; the symbol ABI is compatible and smoke-tested across all four
-# UBI8/UBI9 x ML11/ML12 build combinations.
+# microdnf -y upgrade glibc brings the UBI9 glibc to el9_8 (currently 2.34-270.el9_8).
+# --nodeps is required because the AlmaLinux libnsl RPM declares a dependency on
+# AlmaLinux's glibc packaging; UBI9 provides the same ABI but different package provenance.
+# The AlmaLinux 9.8 libnsl version is kept in sync with the glibc version UBI9 pulls.
 RUN microdnf -y upgrade glibc \
-    && rpm -i --nodeps https://repo.almalinux.org/almalinux/9.7/BaseOS/x86_64/os/Packages/libnsl-2.34-231.el9_7.10.x86_64.rpm \
+    && rpm -i --nodeps https://repo.almalinux.org/almalinux/9.8/BaseOS/x86_64/os/Packages/libnsl-2.34-270.el9_8.x86_64.rpm \
     && microdnf clean all
 
 ###############################################################

From b7078967086c27400cd8064b008b33a7c17efa41 Mon Sep 17 00:00:00 2001
From: Vitaly <vitaly.korolev@gmail.com>
Date: Wed, 24 Jun 2026 16:03:43 -0700
Subject: [PATCH 15/20] Increment Docker version to 2.2.6

---
 Jenkinsfile            | 2 +-
 test/keywords.resource | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ccaaccce..ab36bcc1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -470,7 +470,7 @@ pipeline {
 
     parameters {
         string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
-        string(name: 'dockerVersion', defaultValue: '2.2.5', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${dockerVersion}', trim: true)
+        string(name: 'dockerVersion', defaultValue: '2.2.6', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${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')
diff --git a/test/keywords.resource b/test/keywords.resource
index c505fd14..b57f9c28 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -12,7 +12,7 @@ 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.5}
+${TEST_IMAGE}    %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.6}
 ${UPGRADE_TEST_IMAGE}    progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IMAGE_TYPE}-${MARKLOGIC_DOCKER_VERSION}
 ${DOCKER TIMEOUT}    300s
 ${LICENSE KEY}    %{QA_LICENSE_KEY=none}
@@ -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.5
+${MARKLOGIC_DOCKER_VERSION}    2.2.6
 ${TEST_RESULTS_DIR}    test_results
 
 *** Keywords ***

From bca3a002d09736e29c965f9d76fb94a4c266a634 Mon Sep 17 00:00:00 2001
From: Vitaly <vitaly.korolev@gmail.com>
Date: Thu, 2 Jul 2026 12:52:33 -0700
Subject: [PATCH 16/20] increment marklogic version in tests

---
 test/keywords.resource | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/keywords.resource b/test/keywords.resource
index b57f9c28..41ba739c 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -12,7 +12,7 @@ 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.6}
+${TEST_IMAGE}    %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.6-ubi-rootless-2.2.6}
 ${UPGRADE_TEST_IMAGE}    progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IMAGE_TYPE}-${MARKLOGIC_DOCKER_VERSION}
 ${DOCKER TIMEOUT}    300s
 ${LICENSE KEY}    %{QA_LICENSE_KEY=none}

From ab861fbd76cbabf43e7dc58dafd2ddce8a953429 Mon Sep 17 00:00:00 2001
From: Vitaly <vitaly.korolev@gmail.com>
Date: Thu, 2 Jul 2026 15:49:36 -0700
Subject: [PATCH 17/20] implement copilot suggestions (typos)

---
 Jenkinsfile            | 2 +-
 test/keywords.resource | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ab36bcc1..bab30528 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -472,7 +472,7 @@ pipeline {
         string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
         string(name: 'dockerVersion', defaultValue: '2.2.6', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${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)
+        string(name: 'upgradeDockerImage', defaultValue: '', description: 'Docker image for testing upgrades. Defaults to ubi image if left blank.\n Currently upgrading to ubi-rootless 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')
         string(name: 'ML_RPM', defaultValue: '', description: 'URL for RPM to be used for Image creation. \n If left blank nightly ML rpm will be used.\n Please provide Jenkins accessible path e.g. /project/engineering or /project/qa', trim: true)
         string(name: 'ML_CONVERTERS', defaultValue: '', description: 'URL for the converters RPM to be included in the image creation \n If left blank the nightly ML Converters Package will be used.', trim: true)
diff --git a/test/keywords.resource b/test/keywords.resource
index 41ba739c..6bc1c39b 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -17,7 +17,7 @@ ${UPGRADE_TEST_IMAGE}    progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IM
 ${DOCKER TIMEOUT}    300s
 ${LICENSE KEY}    %{QA_LICENSE_KEY=none}
 ${LICENSEE}    MarkLogic - Version 9 QA Test License
-${MARKLOGIC_VERSION}    11.3.1
+${MARKLOGIC_VERSION}    11.3.6
 ${BUILD_BRANCH}    release_2.2.1
 ${IMAGE_TYPE}    ubi-rootless
 ${VOL_NAME}    MarkLogic_vol_1

From c22bf0de388bd4cc8c74c3b4c18da482c2b39595 Mon Sep 17 00:00:00 2001
From: Vitaly <vitaly.korolev@gmail.com>
Date: Thu, 2 Jul 2026 16:47:49 -0700
Subject: [PATCH 18/20] increment docker version with the release

---
 test/keywords.resource | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/keywords.resource b/test/keywords.resource
index 6bc1c39b..3e7ac93d 100644
--- a/test/keywords.resource
+++ b/test/keywords.resource
@@ -18,7 +18,7 @@ ${DOCKER TIMEOUT}    300s
 ${LICENSE KEY}    %{QA_LICENSE_KEY=none}
 ${LICENSEE}    MarkLogic - Version 9 QA Test License
 ${MARKLOGIC_VERSION}    11.3.6
-${BUILD_BRANCH}    release_2.2.1
+${BUILD_BRANCH}    release_2.2.6
 ${IMAGE_TYPE}    ubi-rootless
 ${VOL_NAME}    MarkLogic_vol_1
 ${VOL_INFO}    src=${VOL_NAME},dst=/var/opt/MarkLogic

From 0d0081c6c06c334cf94916b7087856c9d55ec369 Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Tue, 7 Jul 2026 12:35:04 -0700
Subject: [PATCH 19/20] fix mixed up merge

---
 Jenkinsfile                         | 5 ++---
 dockerFiles/marklogic-deps-ubi:base | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index be5e1cfb..caea25f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -504,11 +504,10 @@ pipeline {
     }
 
     parameters {
-        string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
         string(name: 'dockerVersion', defaultValue: '2.2.6', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${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-rootless 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')
+        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', description: 'MarkLogic Server Branch. used to pick appropriate rpm')
         string(name: 'ML_RPM', defaultValue: '', description: 'URL for RPM to be used for Image creation. \n If left blank nightly ML rpm will be used.\n Please provide Jenkins accessible path e.g. /project/engineering or /project/qa', trim: true)
         string(name: 'ML_CONVERTERS', defaultValue: '', description: 'URL for the converters RPM to be included in the image creation \n If left blank the nightly ML Converters Package will be used.', trim: true)
         booleanParam(name: 'PUBLISH_IMAGE', defaultValue: false, description: 'Publish image to internal registry')
diff --git a/dockerFiles/marklogic-deps-ubi:base b/dockerFiles/marklogic-deps-ubi:base
index 599d4766..4d5f9361 100644
--- a/dockerFiles/marklogic-deps-ubi:base
+++ b/dockerFiles/marklogic-deps-ubi:base
@@ -4,7 +4,6 @@
 #
 ###############################################################
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1778735208
 FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1778735208
 LABEL "com.marklogic.maintainer"="docker@marklogic.com"
 
@@ -15,9 +14,6 @@ ARG ML_VERSION
 # install libnsl rpm package from trusted repositories
 ###############################################################
 
-RUN microdnf -y upgrade glibc \
-    && rpm -i --nodeps https://repo.almalinux.org/almalinux/8.10/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
-    && microdnf clean all
 RUN microdnf -y upgrade glibc \
     && rpm -i --nodeps https://repo.almalinux.org/almalinux/8.10/BaseOS/x86_64/os/Packages/libnsl-2.28-251.el8_10.34.x86_64.rpm \
     && microdnf clean all

From 30286c0aa0169ddc7320faddfda065564f799f66 Mon Sep 17 00:00:00 2001
From: Vitaly Korolev <vitaly.korolev@marklogic.com>
Date: Tue, 7 Jul 2026 12:44:27 -0700
Subject: [PATCH 20/20] another missing commit

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index caea25f1..6199b7d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -506,7 +506,7 @@ pipeline {
     parameters {
         string(name: 'dockerVersion', defaultValue: '2.2.6', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${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)
+        string(name: 'upgradeDockerImage', defaultValue: '', description: 'Docker image for testing upgrades. Defaults to ubi image if left blank.\n Currently upgrading to ubi-rootless is not supported hence the test is skipped when ubi-rootless image is provided.', trim: true)
         choice(name: 'marklogicVersion', choices: '12\n11', description: 'MarkLogic Server Branch. used to pick appropriate rpm')
         string(name: 'ML_RPM', defaultValue: '', description: 'URL for RPM to be used for Image creation. \n If left blank nightly ML rpm will be used.\n Please provide Jenkins accessible path e.g. /project/engineering or /project/qa', trim: true)
         string(name: 'ML_CONVERTERS', defaultValue: '', description: 'URL for the converters RPM to be included in the image creation \n If left blank the nightly ML Converters Package will be used.', trim: true)