Merge pull request #76 from middelkoopt/tm-upgrade-and-prune-versions

Upgrade EL9 and remove extra versions

Author: anderbubble

.github/workflows/container-publish.yml

@@ -27,14 +27,6 @@ jobs:
             version: "8"
             context: rockylinux-8
             file: rockylinux-8/Containerfile
-          - os: rockylinux
-            version: 8.7
-            context: rockylinux-8
-            file: rockylinux-8/Containerfile-8.7
-          - os: rockylinux
-            version: "8.8"
-            context: rockylinux-8
-            file: rockylinux-8/Containerfile-8.8
           - os: rockylinux
             version: "8.9"
             context: rockylinux-8
@@ -47,42 +39,18 @@ jobs:
             version: "9"
             context: rockylinux-9
             file: rockylinux-9/Containerfile
-          - os: rockylinux
-            version: "9.0"
-            context: rockylinux-9
-            file: rockylinux-9/Containerfile-9.0
-          - os: rockylinux
-            version: "9.1"
-            context: rockylinux-9
-            file: rockylinux-9/Containerfile-9.1
-          - os: rockylinux
-            version: "9.2"
-            context: rockylinux-9
-            file: rockylinux-9/Containerfile-9.2
-          - os: rockylinux
-            version: "9.3"
-            context: rockylinux-9
-            file: rockylinux-9/Containerfile-9.3
-          - os: rockylinux
-            version: "9.4"
-            context: rockylinux-9
-            file: rockylinux-9/Containerfile-9.4
           - os: rockylinux
             version: "9.5"
             context: rockylinux-9
             file: rockylinux-9/Containerfile-9.5
+          - os: rockylinux
+            version: "9.6"
+            context: rockylinux-9
+            file: rockylinux-9/Containerfile-9.6
           - os: almalinux
             version: "8"
             context: almalinux-8
             file: almalinux-8/Containerfile
-          - os: almalinux
-            version: 8.7
-            context: almalinux-8
-            file: almalinux-8/Containerfile-8.7
-          - os: almalinux
-            version: "8.8"
-            context: almalinux-8
-            file: almalinux-8/Containerfile-8.8
           - os: almalinux
             version: "8.9"
             context: almalinux-8
@@ -95,30 +63,14 @@ jobs:
             version: "9"
             context: almalinux-9
             file: almalinux-9/Containerfile
-          - os: almalinux
-            version: "9.0"
-            context: almalinux-9
-            file: almalinux-9/Containerfile-9.0
-          - os: almalinux
-            version: "9.1"
-            context: almalinux-9
-            file: almalinux-9/Containerfile-9.1
-          - os: almalinux
-            version: "9.2"
-            context: almalinux-9
-            file: almalinux-9/Containerfile-9.2
-          - os: almalinux
-            version: "9.3"
-            context: almalinux-9
-            file: almalinux-9/Containerfile-9.3
-          - os: almalinux
-            version: "9.4"
-            context: almalinux-9
-            file: almalinux-9/Containerfile-9.4
           - os: almalinux
             version: "9.5"
             context: almalinux-9
             file: almalinux-9/Containerfile-9.5
+          - os: almalinux
+            version: "9.6"
+            context: almalinux-9
+            file: almalinux-9/Containerfile-9.6
           - os: leap
             version: "15"
             context: leap

almalinux-8/Makefile

@@ -1,6 +1,4 @@
 .PHONY: all
-all: Containerfile-8.7
-all: Containerfile-8.8
 all: Containerfile-8.9
 all: Containerfile-8.10
 

almalinux-9/Containerfile

@@ -30,7 +30,6 @@ RUN dnf update -y \
     && dnf clean all
 
 RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
-RUN userdel systemd-oom # remove unused dynamic system user
 
 COPY excludes /etc/warewulf/
 COPY container_exit.sh /etc/warewulf/

almalinux-9/Containerfile-fixed

@@ -36,7 +36,6 @@ RUN dnf update -y \
     && dnf clean all
 
 RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
-RUN userdel systemd-oom # remove unused dynamic system user
 
 COPY excludes /etc/warewulf/
 COPY container_exit.sh /etc/warewulf/

almalinux-9/Makefile

@@ -1,10 +1,6 @@
 .PHONY: all
-all: Containerfile-9.0
-all: Containerfile-9.1
-all: Containerfile-9.2
-all: Containerfile-9.3
 all: Containerfile-9.5
-all: Containerfile-9.4
+all: Containerfile-9.6
 
 .PHONY: clean
 clean:
@@ -13,5 +9,5 @@ clean:
 Containerfile-9.%: Containerfile-vault
 	env release=9.$* envsubst '$$release' <Containerfile-vault >$@
 
-Containerfile-9.5: Containerfile-fixed
-	env release=9.5 envsubst '$$release' <Containerfile-fixed >$@
+Containerfile-9.6: Containerfile-fixed
+	env release=9.6 envsubst '$$release' <Containerfile-fixed >$@

rockylinux-8/Makefile

@@ -1,6 +1,4 @@
 .PHONY: all
-all: Containerfile-8.7
-all: Containerfile-8.8
 all: Containerfile-8.9
 all: Containerfile-8.10
 

rockylinux-9/Makefile

@@ -1,10 +1,6 @@
 .PHONY: all
-all: Containerfile-9.0
-all: Containerfile-9.1
-all: Containerfile-9.2
-all: Containerfile-9.3
 all: Containerfile-9.5
-all: Containerfile-9.4
+all: Containerfile-9.6
 
 .PHONY: clean
 clean:
@@ -13,5 +9,5 @@ clean:
 Containerfile-9.%: Containerfile-vault
 	env release=9.$* envsubst '$$release' <Containerfile-vault >$@
 
-Containerfile-9.5: Containerfile-fixed
-	env release=9.5 envsubst '$$release' <Containerfile-fixed >$@
+Containerfile-9.6: Containerfile-fixed
+	env release=9.6 envsubst '$$release' <Containerfile-fixed >$@