Revert MLE-29703 MLE-29709: Fix UBI base image updates and libnsl dependency mismatch (2.2.5)#448
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR reverts the previously merged (unapproved) changes from PR #447, restoring the prior Docker image version/tag defaults and rolling back UBI base image / libnsl installation adjustments in the dependency base images.
Changes:
- Revert Docker image version defaults from
2.2.5back to2.2.4in CI (Jenkins) and Robot test variables. - Revert UBI8/UBI9 minimal base image tags to the earlier pinned versions.
- Revert libnsl install steps in the UBI deps images back to the earlier
microdnf update+rpm -iapproach.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
test/keywords.resource |
Reverts the default test image tag and ${MARKLOGIC_DOCKER_VERSION} to 2.2.4. |
Jenkinsfile |
Reverts the default dockerVersion parameter value to 2.2.4. |
dockerFiles/marklogic-deps-ubi9:base |
Reverts UBI9 base tag and simplifies libnsl install step. |
dockerFiles/marklogic-deps-ubi:base |
Reverts UBI8 base tag and libnsl RPM version/install step. |
| && 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 |
| && 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts commit a50402c (PR #447) which was merged prematurely without review approval.