Repository navigation
build(konflux): align base image pins with downstream - #6
Closed
Gkrumbach07 wants to merge 1 commit into
Closed
Gkrumbach07 wants to merge 1 commit into
Gkrumbach07 wants to merge 1 commit into
Conversation
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.
Problem
The ODH fork owns
deploy/Dockerfile.konflux, but its three base image references are behind the values already used by downstreamred-hat-data-services/openshell-dashboard. Independent downstream MintMaker updates then caused themain→rhoai-3.6sync to conflict on the Go and UBI minimal lines (failed run).Solution
Bring the ODH Dockerfile's Node, Go, and UBI minimal references to the exact digest-pinned values already present on downstream
rhoai-3.6. This keeps the source copy aligned with downstream after downstream PR #25 merges.Evidence
main, downstreammain, and downstreamrhoai-3.6.git diff --quiet codex/align-main-konflux-image-tags -- deploy/Dockerfile.konfluxpasses: the resulting Dockerfile matches downstream PR fix(security): harden BFF auth endpoints and federated CSS ai-openshell/console#25 exactly.git diff --checkpassed.Merge downstream PR ai-openshell#25 first to clear the current release sync conflict. This PR keeps the ODH source copy aligned afterward.
Summary by CodeRabbit