Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
5 changes: 3 additions & 2 deletions dockerFiles/marklogic-deps-ubi9:base
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dockerFiles/marklogic-deps-ubi:base
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-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
Expand Down