From 757963188109aeac02983a69e8cd7323eb018730 Mon Sep 17 00:00:00 2001 From: Vitaly Korolev Date: Wed, 3 Dec 2025 21:18:45 -0800 Subject: [PATCH] Update UBI versions and switch to ML 12.1 --- Jenkinsfile | 2 +- dockerFiles/marklogic-deps-ubi9:base | 5 +++-- dockerFiles/marklogic-deps-ubi:base | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ec3aafe..a3ec961 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -197,7 +197,7 @@ void copyRPMs() { else if (marklogicVersion == "12") { RPMsuffix = ".nightly-rhel" RPMbranch = "b12" - RPMversion = "12.0" + RPMversion = "12.1" } else { error "Invalid value in marklogicVersion parameter." diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base index c86f21c..54bbe2c 100644 --- a/dockerFiles/marklogic-deps-ubi9:base +++ b/dockerFiles/marklogic-deps-ubi9:base @@ -4,14 +4,15 @@ # ############################################################### -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6-1760515502 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1764794109 LABEL "com.marklogic.maintainer"="docker@marklogic.com" ############################################################### # install libnsl rpm package ############################################################### -RUN rpm -i https://download.rockylinux.org/vault/rocky/9.6/BaseOS/x86_64/os/Packages/l/libnsl-2.34-168.el9_6.23.x86_64.rpm +RUN microdnf -y update \ + && rpm -i https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/l/libnsl-2.34-231.el9_7.2.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 99f480e..d0a17af 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-1761032271 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1764046129 LABEL "com.marklogic.maintainer"="docker@marklogic.com" # MarkLogic version passed from build to enable conditional deps