From a29e0fa682544182c5b7e3a714d082883bb4fdc1 Mon Sep 17 00:00:00 2001
From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Wed, 22 May 2024 20:01:39 +0100
Subject: [PATCH] docker: fixups for rocky8

---
 scripts/docker/m4/Dockerfile.rpm.m4 | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/docker/m4/Dockerfile.rpm.m4 b/scripts/docker/m4/Dockerfile.rpm.m4
index 9f793f0e56..52425c4320 100644
--- a/scripts/docker/m4/Dockerfile.rpm.m4
+++ b/scripts/docker/m4/Dockerfile.rpm.m4
@@ -1,7 +1,7 @@
 ARG from=DOCKER_IMAGE
 FROM ${from} as build
 
-ifelse(OS_VER, `9', `dnl
+ifelse(OS_VER, `7', `', `dnl
 #
 #  Install yum
 #
@@ -109,6 +109,13 @@ RUN mv $BUILDDIR/RPMS/*/*.rpm /root/rpms/
 FROM ${from}
 COPY --from=build /root/rpms /tmp/
 
+ifelse(OS_VER, `7', `', `dnl
+#
+#  Install yum
+#
+RUN dnf install -y yum
+')dnl
+
 changequote(`{', `}')dnl
 ifelse(ifelse(OS_VER, 7, yes, OS_VER, 8, yes, no), yes, {dnl
 # Use LTB's openldap packages intead of the distribution version to avoid linking against NSS
@@ -123,16 +130,17 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-LTB-project'\
 })dnl
 changequote({`}, {'})dnl
 
-ifelse(OS_VER, 9, `dnl
-#  Needed for mysql-libs on Rocky 9
-RUN yum install -y yum-utils
-RUN yum config-manager --enable crb
-')dnl
 
 #  EPEL repository for freetds and hiredis
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-OS_VER.noarch.rpm \
 ifelse(OS_VER, 7, `    \', `dnl
     && yum install -y dnf-utils \
+ifelse(OS_VER, 8, `dnl
+    && yum config-manager --enable powertools \
+')dnl
+ifelse(OS_VER, 9, `dnl
+    && yum config-manager --enable crb \
+')dnl
     && yum config-manager --enable epel-testing
 
 ARG radiusd_uid=95
-- 
2.47.3