Merge pull request #48 from anderbubble/fix-epel-9

Don't use releasever to peg Rocky Linux 9
warewulf · Jan 23, 2024 · 13db06a · 13db06a
2 parents 010743f + cb99d79
commit 13db06a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/rockylinux-9/Containerfile-fixed b/rockylinux-9/Containerfile-fixed
@@ -1,9 +1,9 @@
-FROM docker.io/library/rockylinux:${releasever}
+FROM docker.io/library/rockylinux:${release}
 
 RUN sed -i /etc/yum.repos.d/rocky*.repo \
       -e 's/^#baseurl=/baseurl=/' \
       -e 's/^mirrorlist=/#mirrorlist=/' \
-    && echo "${releasever}" >/etc/dnf/vars/releasever \
+      -e 's/\$releasever/${release}/' \
     && dnf clean all
 
 RUN dnf update -y \

diff --git a/rockylinux-9/Containerfile-vault b/rockylinux-9/Containerfile-vault
@@ -1,10 +1,10 @@
-FROM docker.io/library/rockylinux:${releasever}
+FROM docker.io/library/rockylinux:${release}
 
 RUN sed -i /etc/yum.repos.d/rocky*.repo \
       -e 's/^#baseurl=/baseurl=/' \
       -e 's/^mirrorlist=/#mirrorlist=/' \
+      -e 's/\$releasever/${release}/' \
     && echo 'vault/rocky' >/etc/dnf/vars/contentdir \
-    && echo "${releasever}" >/etc/dnf/vars/releasever \
     && dnf clean all
 
 RUN dnf update -y \

diff --git a/rockylinux-9/Makefile b/rockylinux-9/Makefile
@@ -9,7 +9,7 @@ clean:
 	rm -f Containerfile-9.*
 
 Containerfile-9.%: Containerfile-vault
-	env releasever=9.$* envsubst <Containerfile-vault >$@
+	env release=9.$* envsubst '$$release' <Containerfile-vault >$@
 
 Containerfile-9.3: Containerfile-fixed
-	env releasever=9.3 envsubst <Containerfile-fixed >$@
+	env release=9.3 envsubst '$$release' <Containerfile-fixed >$@