Merge pull request #53 from anderbubble/update-rockylinux

Update Rocky Linux and CentOS
warewulf · Sep 20, 2024 · 31d5fbb · 31d5fbb
2 parents cd065d3 + fef6c66
commit 31d5fbb
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 69 deletions.
diff --git a/.github/workflows/container-publish.yml b/.github/workflows/container-publish.yml
@@ -23,18 +23,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: centos
-            version: 7
-            context: centos-7
-            file: centos-7/Containerfile
           - os: rockylinux
             version: 8
             context: rockylinux-8
             file: rockylinux-8/Containerfile
-          - os: rockylinux
-            version: 8.6
-            context: rockylinux-8
-            file: rockylinux-8/Containerfile-8.6
           - os: rockylinux
             version: 8.7
             context: rockylinux-8
@@ -47,6 +39,10 @@ jobs:
             version: 8.9
             context: rockylinux-8
             file: rockylinux-8/Containerfile-8.9
+          - os: rockylinux
+            version: 8.10
+            context: rockylinux-8
+            file: rockylinux-8/Containerfile-8.10
           - os: rockylinux
             version: 9
             context: rockylinux-9
@@ -67,6 +63,10 @@ jobs:
             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: leap
             version: 15
             context: leap

diff --git a/centos-7/Containerfile b/centos-7/Containerfile
diff --git a/centos-7/container_exit.sh b/centos-7/container_exit.sh
diff --git a/centos-7/excludes b/centos-7/excludes
diff --git a/rockylinux-8/Containerfile b/rockylinux-8/Containerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/rockylinux:8
+FROM docker.io/rockylinux/rockylinux:8
 
 RUN dnf update -y \
     && dnf install -y --allowerasing \

diff --git a/rockylinux-8/Containerfile-fixed b/rockylinux-8/Containerfile-fixed
@@ -1,4 +1,4 @@
-FROM docker.io/library/rockylinux:${releasever}
+FROM docker.io/rockylinux/rockylinux:${releasever}
 
 RUN echo "${releasever}" >/etc/dnf/vars/releasever \
     && dnf clean all

diff --git a/rockylinux-8/Containerfile-vault b/rockylinux-8/Containerfile-vault
@@ -1,4 +1,4 @@
-FROM docker.io/library/rockylinux:${releasever}
+FROM docker.io/rockylinux/rockylinux:${releasever}
 
 RUN sed -i /etc/yum.repos.d/Rocky*.repo \
       -e 's/^#baseurl=/baseurl=/' \

diff --git a/rockylinux-8/Makefile b/rockylinux-8/Makefile
@@ -1,8 +1,8 @@
 .PHONY: all
-all: Containerfile-8.6
 all: Containerfile-8.7
 all: Containerfile-8.8
 all: Containerfile-8.9
+all: Containerfile-8.10
 
 .PHONY: clean
 clean:
@@ -11,5 +11,5 @@ clean:
 Containerfile-8.%: Containerfile-vault
 	env releasever=8.$* envsubst <Containerfile-vault >$@
 
-Containerfile-8.9: Containerfile-fixed
-	env releasever=8.9 envsubst <Containerfile-fixed >$@
+Containerfile-8.10: Containerfile-fixed
+	env releasever=8.10 envsubst <Containerfile-fixed >$@
diff --git a/rockylinux-9/Containerfile b/rockylinux-9/Containerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/rockylinux:9
+FROM docker.io/rockylinux/rockylinux:9
 
 RUN dnf update -y \
     && dnf install -y --allowerasing \

diff --git a/rockylinux-9/Containerfile-fixed b/rockylinux-9/Containerfile-fixed
@@ -1,4 +1,4 @@
-FROM docker.io/library/rockylinux:${release}
+FROM docker.io/rockylinux/rockylinux:${release}
 
 RUN sed -i /etc/yum.repos.d/rocky*.repo \
       -e 's/^#baseurl=/baseurl=/' \

diff --git a/rockylinux-9/Containerfile-vault b/rockylinux-9/Containerfile-vault
@@ -1,4 +1,4 @@
-FROM docker.io/library/rockylinux:${release}
+FROM docker.io/rockylinux/rockylinux:${release}
 
 RUN sed -i /etc/yum.repos.d/rocky*.repo \
       -e 's/^#baseurl=/baseurl=/' \

diff --git a/rockylinux-9/Makefile b/rockylinux-9/Makefile
@@ -3,6 +3,7 @@ all: Containerfile-9.0
 all: Containerfile-9.1
 all: Containerfile-9.2
 all: Containerfile-9.3
+all: Containerfile-9.4
 
 .PHONY: clean
 clean:
@@ -11,5 +12,5 @@ clean:
 Containerfile-9.%: Containerfile-vault
 	env release=9.$* envsubst '$$release' <Containerfile-vault >$@
 
-Containerfile-9.3: Containerfile-fixed
-	env release=9.3 envsubst '$$release' <Containerfile-fixed >$@
+Containerfile-9.4: Containerfile-fixed
+	env release=9.4 envsubst '$$release' <Containerfile-fixed >$@