suse-edge/Factory
SHA256
13
0
Fork 14
Code Issues Pull Requests 6 Actions Packages Projects Releases Wiki Activity

Make an effort to (partially) realign the Dockerfile with upstream #201

Merged
mchiappero merged 1 commits from mchiappero/Factory:alignment-dockerfile into main 2025-07-10 10:11:34 +02:00
Conversation 5 Commits 1 Files Changed 1 +3 -1
mchiappero commented 2025-06-30 18:11:54 +02:00
Owner
Copy Link

Apply misc changes to Dockerfile to align with upstream

Having a completely different image and build system the Dockerfile will
always differ quite significantly from the upstream one. Nonetheless,
it's still useful to make the commont parts to look alike as much as
possible to ease maintanance and update.

Note, this is just a small set of changes that are possible, more effort
into this direction may follow at later stage.

This PR depends on #200.

Apply misc changes to Dockerfile to align with upstream Having a completely different image and build system the Dockerfile will always differ quite significantly from the upstream one. Nonetheless, it's still useful to make the commont parts to look alike as much as possible to ease maintanance and update. Note, this is just a small set of changes that are possible, more effort into this direction may follow at later stage. This PR depends on #200.
mchiappero added 6 commits 2025-06-30 18:11:56 +02:00
Drop inotify-tools and switch to pyinotify
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 22s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 20s
Details
09c8fb927a 
No longer inotifywait use and move to python pyinotify.

See https://github.com/metal3-io/ironic-image/issues/605 for
more details.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Restore the upstream directory structure
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 14s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in -1m15s
Details
b3a46f16f1 
It is now possible to bring back the original directory structure for
config (/ironic-config) files and scripts (/scripts). This will make
updates to re-align with upstream easier.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Apply misc changes to Dockerfile to align with upstream d4f8eee19e 
Having a completely different image and build system the Dockerfile will
always differ quite significantly from the upstream one. Nonetheless,
it's still useful to make the commont parts to look alike as much as
possible to ease maintanance and update.

Note, this is just a small set of changes that are possible, more effort
into this direction may follow at later stage.
Remove stale file entries for old BIOS based machines 37106f7335 
Two entries pointing to old and unesed files for non UEFI servers seem
to be unused both here and upstream, so this commit removes them.
Move the install of EFI packages in prepare-efi.sh eb40007970 
This commit move the installation of packages required for EFI booting
from Dockerfile to prepare-efi.sh, in order to align with upstream.

Also, remove some spaces between some commands in the script to match
upstream.
Move the copy of Jinja templates to resemble upstream
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 1m12s
Details
fec5b28494 
Follow the same location for the COPY command moving the Jinja template
files in the image.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
mchiappero requested review from amorgante 2025-06-30 18:16:35 +02:00
mchiappero requested review from dprodanov 2025-06-30 18:16:49 +02:00
mchiappero requested review from nbelouin 2025-06-30 18:16:52 +02:00
mchiappero requested review from steven.hardy 2025-06-30 18:16:54 +02:00
mchiappero force-pushed alignment-dockerfile from fec5b28494 to b4e5833111 2025-07-02 15:36:58 +02:00 Compare
mchiappero force-pushed alignment-dockerfile from b4e5833111 to ecdb953890 2025-07-03 14:50:28 +02:00 Compare
mchiappero commented 2025-07-07 23:24:16 +02:00
Author
Owner
Copy Link

Tested, looks okay to me.

Tested, looks okay to me.
mchiappero force-pushed alignment-dockerfile from ecdb953890 to d00b6ece5f 2025-07-07 23:50:37 +02:00 Compare
mchiappero commented 2025-07-08 10:06:47 +02:00
Author
Owner
Copy Link

@nbelouin @steven.hardy Does it look okay to you?

@nbelouin @steven.hardy Does it look okay to you?
steven.hardy commented 2025-07-08 10:28:39 +02:00
Owner
Copy Link

lgtm - although in future we should perhaps consider an upstream change to make the location of the j2 templates more consistent - it's a bit weird atm since some end up in /tmp and others in /etc/ironic/ etc, not something to fix downstream though

lgtm - although in future we should perhaps consider an upstream change to make the location of the j2 templates more consistent - it's a bit weird atm since some end up in `/tmp` and others in `/etc/ironic/` etc, not something to fix downstream though
steven.hardy approved these changes 2025-07-08 10:28:51 +02:00
mchiappero commented 2025-07-08 13:09:14 +02:00
Author
Owner
Copy Link

lgtm - although in future we should perhaps consider an upstream change to make the location of the j2 templates more consistent - it's a bit weird atm since some end up in /tmp and others in /etc/ironic/ etc, not something to fix downstream though

I agree, had the same comment.

> lgtm - although in future we should perhaps consider an upstream change to make the location of the j2 templates more consistent - it's a bit weird atm since some end up in `/tmp` and others in `/etc/ironic/` etc, not something to fix downstream though I agree, had the same comment.
mchiappero merged commit d00b6ece5f into main 2025-07-08 14:07:19 +02:00
mchiappero deleted branch alignment-dockerfile 2025-07-08 14:07:20 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
amorgante
dprodanov
nbelouin
steven.hardy
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
amorgante atanasdinov atrendafilov dbekhit dprodanov eminguez fdegirmenci ipetrov117 jtomasek kzhelyazkov mchiappero nbelouin roxenham steven.hardy
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: suse-edge/Factory#201
No description provided.
Delete Branch "mchiappero/Factory:alignment-dockerfile"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?