MLE-32332: pass pinned UBI base image to BlackDuck scan job - #479
Merged
vitalykorolev merged 2 commits intoSep 4, 2026
Conversation
Resolves the base image from the matching marklogic-deps Dockerfile's FROM line (so it always matches whatever is currently pinned) and passes it as BASE_IMAGE_TO_EXCLUDE, enabling the downstream pipeline's additional filtered scan that excludes base image components.
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The new deps Dockerfile selection logic does not correctly match ubi9-rootless-arm, so ARM rootless builds may derive the base image from the wrong Dockerfile.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Updates the Jenkins pipeline’s BlackDuck scan trigger to dynamically read the pinned UBI base image from the appropriate marklogic-deps Dockerfile and pass it to the downstream scan job so it can run an additional “exclude base image components” scan.
Changes:
- Determine the correct
marklogic-depsDockerfile based ondockerImageTypeand parse its firstFROMimage reference. - Pass the resolved base image value to the BlackDuck scan job via a new
BASE_IMAGE_TO_EXCLUDEparameter. - Extend the
scanWithBlackDuck()function header comment to describe the new behavior.
File summaries
| File | Description |
|---|---|
| Jenkinsfile | Derives the pinned base image from the relevant deps Dockerfile and forwards it to the BlackDuck scan job. |
Review details
- Files reviewed: 1/1 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
contains('ubi9-arm') doesn't match 'ubi9-rootless-arm' since it's not a
contiguous substring, so that variant incorrectly fell back to the non-arm
ubi9 deps Dockerfile. Check ubi9 and arm independently instead.
vitalykorolev
requested review from
barkhachoithani,
pengzhouml,
rwinieski and
sumanthravipati
September 4, 2026 04:38
rwinieski
approved these changes
Sep 4, 2026
vitalykorolev
deleted the
MLE-32332_pass-base-image-to-blackduck-scan
branch
September 4, 2026 14:25
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.
Description
Resolves the base image from the matching marklogic-deps Dockerfile's FROM line (so it always matches whatever is currently pinned) and passes it as BASE_IMAGE_TO_EXCLUDE, enabling the downstream pipeline's additional filtered scan that excludes base image components.
Checklist:
Owner:
JIRA_ID as part of branch/PR name
Rebase the branch with upstream
Squashed all commits into a single commit
Added Tests
Reviewer:
Reviewed Tests
Added to Release Wiki/Jira