diff --git a/almalinux-8/Containerfile b/almalinux-8/Containerfile index 79ee1b5..be81d35 100644 --- a/almalinux-8/Containerfile +++ b/almalinux-8/Containerfile @@ -40,6 +40,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/almalinux-8/Containerfile-fixed b/almalinux-8/Containerfile-fixed index d3c3c64..5bdd4e2 100644 --- a/almalinux-8/Containerfile-fixed +++ b/almalinux-8/Containerfile-fixed @@ -43,6 +43,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/almalinux-8/Containerfile-vault b/almalinux-8/Containerfile-vault index 6f877d1..8bdceab 100644 --- a/almalinux-8/Containerfile-vault +++ b/almalinux-8/Containerfile-vault @@ -47,6 +47,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/almalinux-8/container_exit.sh b/almalinux-8/container_exit.sh index 72bbc02..00f7a7a 100755 --- a/almalinux-8/container_exit.sh +++ b/almalinux-8/container_exit.sh @@ -13,3 +13,4 @@ export LANG=C LC_CTYPE=C set -x dnf clean all +rm -f /etc/machine-id /var/lib/dbus/machine-id diff --git a/almalinux-9/Containerfile b/almalinux-9/Containerfile index 177f169..ce0d0ae 100644 --- a/almalinux-9/Containerfile +++ b/almalinux-9/Containerfile @@ -33,6 +33,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/almalinux-9/Containerfile-fixed b/almalinux-9/Containerfile-fixed index f759b6d..976b191 100644 --- a/almalinux-9/Containerfile-fixed +++ b/almalinux-9/Containerfile-fixed @@ -39,6 +39,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/almalinux-9/Containerfile-vault b/almalinux-9/Containerfile-vault index e71c8a1..766fe38 100644 --- a/almalinux-9/Containerfile-vault +++ b/almalinux-9/Containerfile-vault @@ -41,6 +41,7 @@ RUN userdel systemd-oom # remove unused dynamic system user COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/almalinux-9/container_exit.sh b/almalinux-9/container_exit.sh index 97a273f..ca1fc2d 100755 --- a/almalinux-9/container_exit.sh +++ b/almalinux-9/container_exit.sh @@ -13,3 +13,4 @@ export LANG=C LC_CTYPE=C set -x dnf clean all +rm -f /etc/machine-id /var/lib/dbus/machine-id diff --git a/debian/Containerfile b/debian/Containerfile index fda1074..521e2cd 100644 --- a/debian/Containerfile +++ b/debian/Containerfile @@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/debian/Containerfile-12.0 b/debian/Containerfile-12.0 index 28bc76e..adb60c8 100644 --- a/debian/Containerfile-12.0 +++ b/debian/Containerfile-12.0 @@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/debian/container_exit.sh b/debian/container_exit.sh index 11ce88f..cd59dc9 100755 --- a/debian/container_exit.sh +++ b/debian/container_exit.sh @@ -4,3 +4,4 @@ LANG=C LC_CTYPE=C export LANG LC_CTYPE apt-get clean +rm -f /etc/machine-id /var/lib/dbus/machine-id diff --git a/examples/rhel-9/Containerfile b/examples/rhel-9/Containerfile index 766cb26..7bc79de 100644 --- a/examples/rhel-9/Containerfile +++ b/examples/rhel-9/Containerfile @@ -61,6 +61,7 @@ RUN rm -f /etc/systemd/system/systemd-logind.service \ COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/examples/rhel-9/container_exit.sh b/examples/rhel-9/container_exit.sh index 84993a5..3fd185e 100755 --- a/examples/rhel-9/container_exit.sh +++ b/examples/rhel-9/container_exit.sh @@ -4,3 +4,4 @@ LANG=C LC_CTYPE=C export LANG LC_CTYPE dnf clean all +rm -f /etc/machine-id /var/lib/dbus/machine-id diff --git a/leap/Containerfile b/leap/Containerfile index 1c483da..ecb7bbe 100644 --- a/leap/Containerfile +++ b/leap/Containerfile @@ -47,6 +47,7 @@ RUN zypper update -y \ COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/leap/Containerfile.15 b/leap/Containerfile.15 index b03757e..eec18f3 100644 --- a/leap/Containerfile.15 +++ b/leap/Containerfile.15 @@ -47,6 +47,7 @@ RUN zypper update -y \ COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/leap/container_exit.sh b/leap/container_exit.sh index d614449..ad56653 100755 --- a/leap/container_exit.sh +++ b/leap/container_exit.sh @@ -2,3 +2,4 @@ export LANG=C LC_CTYPE=C set -x zypper clean -a +rm -f /etc/machine-id /var/lib/dbus/machine-id diff --git a/rockylinux-8/Containerfile b/rockylinux-8/Containerfile index 8098e85..bb31915 100644 --- a/rockylinux-8/Containerfile +++ b/rockylinux-8/Containerfile @@ -40,6 +40,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/rockylinux-8/Containerfile-fixed b/rockylinux-8/Containerfile-fixed index f99661b..1e72a37 100644 --- a/rockylinux-8/Containerfile-fixed +++ b/rockylinux-8/Containerfile-fixed @@ -43,6 +43,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/rockylinux-8/Containerfile-vault b/rockylinux-8/Containerfile-vault index 04bbb4f..98244c0 100644 --- a/rockylinux-8/Containerfile-vault +++ b/rockylinux-8/Containerfile-vault @@ -47,6 +47,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/rockylinux-8/container_exit.sh b/rockylinux-8/container_exit.sh index e728e2a..f533dc2 100755 --- a/rockylinux-8/container_exit.sh +++ b/rockylinux-8/container_exit.sh @@ -13,3 +13,4 @@ export LANG=C LC_CTYPE=C set -x dnf clean all +rm -f /etc/machine-id /var/lib/dbus/machine-id diff --git a/rockylinux-9/Containerfile b/rockylinux-9/Containerfile index 7c7c9e8..0017ef4 100644 --- a/rockylinux-9/Containerfile +++ b/rockylinux-9/Containerfile @@ -33,6 +33,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/rockylinux-9/Containerfile-fixed b/rockylinux-9/Containerfile-fixed index 6530504..d5bca08 100644 --- a/rockylinux-9/Containerfile-fixed +++ b/rockylinux-9/Containerfile-fixed @@ -39,6 +39,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/rockylinux-9/Containerfile-vault b/rockylinux-9/Containerfile-vault index 8a3f39d..e99155f 100644 --- a/rockylinux-9/Containerfile-vault +++ b/rockylinux-9/Containerfile-vault @@ -40,6 +40,7 @@ RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061 COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/rockylinux-9/container_exit.sh b/rockylinux-9/container_exit.sh index c0b2a5c..a8701b2 100755 --- a/rockylinux-9/container_exit.sh +++ b/rockylinux-9/container_exit.sh @@ -13,3 +13,4 @@ export LANG=C LC_CTYPE=C set -x dnf clean all +rm -f /etc/machine-id /var/lib/dbus/machine-id diff --git a/tumbleweed/Containerfile b/tumbleweed/Containerfile index 482ef69..813ae62 100644 --- a/tumbleweed/Containerfile +++ b/tumbleweed/Containerfile @@ -46,6 +46,7 @@ RUN zypper update -y \ COPY excludes /etc/warewulf/ COPY container_exit.sh /etc/warewulf/ +RUN /etc/warewulf/container_exit.sh CMD [ "/bin/echo", "-e", \ "This image is intended to be used with the Warewulf cluster management and", \ diff --git a/tumbleweed/container_exit.sh b/tumbleweed/container_exit.sh index d614449..ad56653 100755 --- a/tumbleweed/container_exit.sh +++ b/tumbleweed/container_exit.sh @@ -2,3 +2,4 @@ export LANG=C LC_CTYPE=C set -x zypper clean -a +rm -f /etc/machine-id /var/lib/dbus/machine-id