Merged
Conversation
- Add OS-specific Containerfiles (Containerfile.el9, Containerfile.el10) - Add OS-specific OCP Containerfiles (Containerfile.ocp.el9, Containerfile.ocp.el10) - Update GitHub workflows to build both EL9 and EL10 variants with matrix strategy - Add comprehensive Makefile with targets for building all OS variants - Update README.md with container build documentation - Maintain backward compatibility with existing Containerfile/Containerfile.ocp This enables flightctl-ui to support both Enterprise Linux 9 and 10, completing EDM-3308 implementation across the FlightCtl ecosystem.
Align flightctl-ui with main flightctl repo structure:
STRUCTURE CHANGES:
- Move OS-specific Containerfiles to packaging/images/{el9,el10}/ directories
- Remove redundant root-level Containerfile and Containerfile.ocp files
- Remove suffix-based files (Containerfile.el9, Containerfile.ocp.el10, etc.)
FILE ORGANIZATION:
- packaging/images/el9/Containerfile (standalone UI)
- packaging/images/el9/Containerfile.ocp (OCP plugin UI)
- packaging/images/el10/Containerfile (standalone UI)
- packaging/images/el10/Containerfile.ocp (OCP plugin UI)
UPDATES:
- Update Makefile to use directory-based paths: packaging/images/$(OS)/Containerfile
- Update GitHub workflows to use new directory structure
- Update README documentation with new structure and examples
This matches the main flightctl repository approach and eliminates redundancy
while maintaining clean separation between OS variants.
Add comprehensive container build verification for all EDM-3308 variants: MATRIX TESTING: - EL9 standalone UI container - EL9 OCP plugin UI container - EL10 standalone UI container - EL10 OCP plugin UI container VERIFICATION: - Tests all 4 Containerfile combinations - Verifies container builds successfully - Basic container startup/binary verification - Catches syntax errors and missing dependencies in PRs This ensures our directory-based Containerfiles work correctly before merge and prevents broken container builds.
- Update workflows to use OS-suffixed image names instead of OS-suffixed tags - Remove generic 'latest' tags from Makefile to avoid last OS wins issue - Align UI image naming with backend: flightctl-ui-el9, flightctl-ocp-ui-el9 - Update documentation to reflect correct image naming examples - Remove unused RHEL_OS variable, use el9/el10 directly for consistency This ensures UI images follow the same pattern as backend images: Backend: quay.io/flightctl/flightctl-api-el9:latest UI: quay.io/flightctl/flightctl-ui-el9:latest
- Added 'text' language identifier to fenced code block containing containerfile paths - Fixes markdownlint MD040 error requiring labeled code fences
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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
2 participants
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.
No description provided.