containerfiles: consolidate directories (RHIN-2576)#98
Merged
Conversation
lzap
requested review from
avitova,
croissanne,
supakeen and
thozza
and removed request for
a team
June 18, 2026 12:55
lzap
force-pushed
the
consolidate1
branch
3 times, most recently
from
June 18, 2026 13:10
0162379 to
44cf53f
Compare
lzap
changed the title
Extract heredoc to individual files, except two cases where it is better to keep it inplace.
For more consistent experience across containerfiles, prepare for .gitkeep files.
Create empty directories for more consistent editing experience.
Create empty directories for more consistent editing experience.
Create empty directories for more consistent editing experience.
Create empty directories for more consistent editing experience.
Create empty directories for more consistent editing experience.
This script regenerates .gitlab-ci.yml and should be run before committing changes to Containerfiles.
Collaborator
Author
|
Rebased to fix the tests and improved commit messages. |
supakeen
approved these changes
Jun 29, 2026
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.
Extracts inlined files from rhel-10-installer.
Then all Containerfiles are consolidated so the following pattern is used via
.gitkeep:imgtype/etc- common filesimgtype/usr- common filesimgtype-ARCH/etc- arch-based filesimgtype-ARCH/usr- arch-based filesAlso created a new
prepare-source.shthat regenerates cicd config.I am open to other solutions, my ultimate goal is to make a consistent experience.
https://redhat.atlassian.net/browse/RHIN-2576