From d6a054b8c31eed9bccba6cca4e035e21153982d5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 17 Nov 2025 10:37:12 -0800 Subject: [PATCH 1/3] 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 e49ccaf..5d47e2d 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 d8228a4..6fe783a 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 Date: Mon, 17 Nov 2025 10:41:29 -0800 Subject: [PATCH 2/3] 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 5d47e2d..5a8253a 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 Date: Wed, 26 Nov 2025 08:31:55 -0800 Subject: [PATCH 3/3] 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 404b21d..7bdfaa0 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 e440874..116953d 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 0d12eaf..bfd6c14 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 ***