NO-JIRA: chore(docker): add mongocli-builder stage into dockerfile_fragments.py templates
#1834
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
…fragments.py templates Successfully integrated mongocli compilation stages into the templating system managed by [`scripts/dockerfile_fragments.py`](scripts/dockerfile_fragments.py:1). ## Changes Made: ### 1. Enhanced Template System Added three new templates to [`dockerfile_fragments.py`](scripts/dockerfile_fragments.py:63): - **`mongocli-builder stage`**: Simple mongocli builder for most images - **`mongocli-builder stage with s390x support`**: Advanced builder with s390x architecture handling for datascience images - **`Copy mongocli from builder`**: Template for copying the compiled binary ### 2. Automated Marker Addition Created [`scripts/add_mongocli_markers.py`](scripts/add_mongocli_markers.py:1) to automatically add BEGIN/END markers to all Dockerfile.* files containing mongocli stages. ### 3. Applied Templates Successfully applied templates to **16 Dockerfiles** across: - jupyter/pytorch (cuda, konflux.cuda) - jupyter/pytorch+llmcompressor (cuda, konflux.cuda) - jupyter/tensorflow (cuda, konflux.cuda) - jupyter/trustyai (cpu, konflux.cpu, cowsay.cpu) - jupyter/rocm/pytorch (rocm, konflux.rocm) - jupyter/rocm/tensorflow (rocm, konflux.rocm) - jupyter/datascience (cpu, konflux.cpu, cpu.j2, mongocli-builder) ## Benefits: - **Centralized Management**: All mongocli build stages now managed from a single location - **Consistency**: Ensures identical mongocli compilation across all images - **Easy Updates**: Future changes to mongocli version or build process only need to be made in [`dockerfile_fragments.py`](scripts/dockerfile_fragments.py:1) - **Maintainability**: Reduces code duplication and potential for drift between Dockerfiles
|
Skipping CI for Draft Pull Request. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
5 tasks
Member
Author
|
/build-konflux |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
mongocli-builderstage into dockerfile_fragments.py templates opendatahub-io/notebooks#2798Description
Successfully integrated mongocli compilation stages into the templating system managed by
scripts/dockerfile_fragments.py.Changes Made:
1. Enhanced Template System
Added three new templates to
dockerfile_fragments.py:mongocli-builder stage: Simple mongocli builder for most imagesmongocli-builder stage with s390x support: Advanced builder with s390x architecture handling for datascience imagesCopy mongocli from builder: Template for copying the compiled binary2. Automated Marker Addition
Created
scripts/add_mongocli_markers.pyto automatically add BEGIN/END markers to all Dockerfile.* files containing mongocli stages.3. Applied Templates
Successfully applied templates to 16 Dockerfiles across:
Benefits:
dockerfile_fragments.pyHow Has This Been Tested?
Self checklist (all need to be checked):
make test(gmakeon macOS) before asking for reviewDockerfile.konfluxfiles should be done inodh/notebooksand automatically synced torhds/notebooks. For Konflux-specific changes, modifyDockerfile.konfluxfiles directly inrhds/notebooksas these require special attention in the downstream repository and flow to the upcoming RHOAI release.Merge criteria: