From cb99d79742a4e3c3b7e994901fd1d2654f6a53d3 Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <janderson@ciq.com>
Date: Mon, 22 Jan 2024 23:50:07 -0700
Subject: [PATCH] Don't use releasever to peg Rocky Linux 9

EPEL9 uses `$releasever` and doesn't consider point releases valid; so
we can't use it to peg Rocky Linux 9 to a given point release. Use raw
string substitution in stead.

Fixes #47

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
---
 rockylinux-9/Containerfile-fixed | 4 ++--
 rockylinux-9/Containerfile-vault | 4 ++--
 rockylinux-9/Makefile            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rockylinux-9/Containerfile-fixed b/rockylinux-9/Containerfile-fixed
index 1413d54..973f8f9 100644
--- 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
index 6692f37..1c6c419 100644
--- 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
index 0529d81..31ba477 100644
--- 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 >$@