Rename container_exit.sh to image_exit.sh#77
Rename container_exit.sh to image_exit.sh#77anderbubble wants to merge 1 commit intowarewulf:mainfrom
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR updates various Containerfiles to use the newly renamed image_exit.sh (from container_exit.sh) and creates a backward-compatibility symlink. It also adds DOCA repository example files for Rocky Linux.
- Replace
COPY container_exit.shwithCOPY image_exit.shand addln -s …/container_exit.shacross all distro Containerfiles - Introduce two DOCA
.repoexample files for RHEL8.10 and RHEL9.5 - Add example DOCA build Containerfiles for Rocky Linux 8 and 9
Reviewed Changes
Copilot reviewed 23 out of 31 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| tumbleweed/Containerfile | Switch to image_exit.sh and create symlink for container_exit.sh |
| rockylinux-9/Containerfile-vault | Same script rename and symlink update |
| rockylinux-9/Containerfile-fixed | Same script rename and symlink update |
| rockylinux-9/Containerfile | Same script rename and symlink update |
| rockylinux-8/fixed | Same script rename and symlink update |
| rockylinux-8/Containerfile-vault | Same script rename and symlink update |
| rockylinux-8/Containerfile-fixed | Same script rename and symlink update |
| rockylinux-8/Containerfile | Same script rename and symlink update |
| leap/Containerfile.15 | Same script rename and symlink update |
| leap/Containerfile | Same script rename and symlink update |
| examples/rockylinux-doca/doca-el9.5.repo | Add DOCA online repo definition |
| examples/rockylinux-doca/doca-el8.10.repo | Add DOCA online repo definition |
| examples/rockylinux-doca/Containerfile-9 | New DOCA build Containerfile for Rocky Linux 9 |
| examples/rockylinux-doca/Containerfile-8 | New DOCA build Containerfile for Rocky Linux 8 |
| examples/rhel-9/Containerfile | Script rename and symlink update |
| debian/Containerfile-12.0 | Script rename and symlink update |
| debian/Containerfile | Script rename and symlink update |
| almalinux-9/Containerfile-vault | Script rename and symlink update |
| almalinux-9/Containerfile-fixed | Script rename and symlink update |
| almalinux-9/Containerfile | Script rename and symlink update |
| almalinux-8/Containerfile-vault | Script rename and symlink update |
| almalinux-8/Containerfile-fixed | Script rename and symlink update |
| almalinux-8/Containerfile | Script rename and symlink update |
tumbleweed/Containerfile
Outdated
| COPY excludes /etc/warewulf/ | ||
| COPY container_exit.sh /etc/warewulf/ | ||
| COPY image_exit.sh /etc/warewulf/ | ||
| RUN ln -s image_exit.sh /etc/warewulf/container_exit.sh |
There was a problem hiding this comment.
Consider using ln -sf instead of ln -s to force overwriting any existing container_exit.sh and avoid build failures if the link already exists.
| RUN ln -s image_exit.sh /etc/warewulf/container_exit.sh | |
| RUN ln -sf image_exit.sh /etc/warewulf/container_exit.sh |
4f0336e to
137dabb
Compare
middelkoopt
left a comment
There was a problem hiding this comment.
Looks good and builds and lightly tested (AlmaLinux). Other PR's will need to get rebased against this, so let's get it in.
bb94438 to
3e58da6
Compare
|
Rebased and updated based on other changes to images since initial submission. |
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
3e58da6 to
1aba417
Compare
|
@middelkoopt I've rebased this. They all appear to be building correctly; but can you give it another once-over before I merge it? (Or you can merge it if you're so inclined.) |
Warewulf v4.6 renamed container_exit.sh to image_exit.sh. Both are still supported for now.
To retain backward compatibility, these images include a symlink at container_exit.sh.