Ensure yum is installed on Rocky 9

Once CentOS 7 goes EoL, we can switch to dnf

diff --git a/.github/workflows/ci-rpm.yml b/.github/workflows/ci-rpm.yml
index 3a8add69a53c56228f7ef93da399dc2f03adc603..9aa584ac7c7ad528c62a471cab76066e981ce293 100644 (file)
--- a/.github/workflows/ci-rpm.yml
+++ b/.github/workflows/ci-rpm.yml
@@ -40,6 +40,12 @@ jobs:
       run: |
         yum install -y https://packages.endpointdev.com/rhel/7/os/x86_64/git-core-2.30.1-1.ep7.x86_64.rpm
 
+    # Rocky 9 uses dnf by default.  CentOS 7 doesn't have dnf.  Install yum on Rocky 9 so all distros work
+    - name: Install yum
+      if: ${{ matrix.env.NAME == 'rocky-9'}}
+      run: |
+        dnf install -y yum
+
     - name: Install distro git for Rocky.
       if: ${{ startsWith(matrix.env.NAME, 'rocky-') }}
       run: |
@@ -202,6 +208,11 @@ jobs:
 
     steps:
 
+    - name: Install yum
+      if: ${{ matrix.env.NAME == 'rocky-9'}}
+      run: |
+        dnf install -y yum
+
     - name: LTB repo for CentOS and Rocky 8
       if: ${{ startsWith(matrix.env.NAME, 'centos-') || matrix.env.NAME == 'rocky-8' }}
       run: |

diff --git a/scripts/crossbuild/docker/rocky9/Dockerfile b/scripts/crossbuild/docker/rocky9/Dockerfile
index e85ee512f67d9193f4be6fd9bbc4c196335ad72f..9936fe461b63d318c846713b124ee452878820c2 100644 (file)
--- a/scripts/crossbuild/docker/rocky9/Dockerfile
+++ b/scripts/crossbuild/docker/rocky9/Dockerfile
@@ -6,6 +6,11 @@
 ARG from=rockylinux/rockylinux:9
 FROM ${from} as build
 
+#
+#  Install yum
+#
+RUN dnf install -y yum
+
 #
 #  Install devtools like make and git and the EPEL
 #  repository for freetds and hiredis

diff --git a/scripts/crossbuild/m4/Dockerfile.rpm.m4 b/scripts/crossbuild/m4/Dockerfile.rpm.m4
index 5a33166f68c416c770d293bdbefc9f5d189cfe23..cd56d34ad1dc160d0a89a457aeda15d29db58e50 100644 (file)
--- a/scripts/crossbuild/m4/Dockerfile.rpm.m4
+++ b/scripts/crossbuild/m4/Dockerfile.rpm.m4
@@ -1,6 +1,13 @@
 ARG from=DOCKER_IMAGE
 FROM ${from} as build
 
+ifelse(OS_VER, `9', `dnl
+#
+#  Install yum
+#
+RUN dnf install -y yum
+')dnl
+
 #
 #  Install devtools like make and git and the EPEL
 #  repository for freetds and hiredis

diff --git a/scripts/docker/m4/Dockerfile.rpm.m4 b/scripts/docker/m4/Dockerfile.rpm.m4
index 20bbf6638e72a477bcd5c788ddf891ac2b769c04..9f793f0e562b47a3b829994e371dbf2403746d78 100644 (file)
--- a/scripts/docker/m4/Dockerfile.rpm.m4
+++ b/scripts/docker/m4/Dockerfile.rpm.m4
@@ -1,6 +1,13 @@
 ARG from=DOCKER_IMAGE
 FROM ${from} as build
 
+ifelse(OS_VER, `9', `dnl
+#
+#  Install yum
+#
+RUN dnf install -y yum
+')dnl
+
 ifelse(OS_VER, 8, `dnl
 RUN rpmkeys --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 ')dnl

diff --git a/scripts/docker/rocky9/Dockerfile b/scripts/docker/rocky9/Dockerfile
index 6e42bd3d2736a571e7edb6e41b972301d18d6e1d..241be86363b92709abadab3520aec57e8972520c 100644 (file)
--- a/scripts/docker/rocky9/Dockerfile
+++ b/scripts/docker/rocky9/Dockerfile
@@ -6,6 +6,11 @@
 ARG from=rockylinux/rockylinux:9
 FROM ${from} as build
 
+#
+#  Install yum
+#
+RUN dnf install -y yum
+
 RUN rpmkeys --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 #