From 25a7f88ad7a810855f12ba2fa962f008ecfe9263 Mon Sep 17 00:00:00 2001
From: Ian <i3149@users.noreply.github.com>
Date: Tue, 23 Jul 2024 21:27:05 -0700
Subject: [PATCH] Fix package build for centos 8, remove centos 7. (#727)

* Moving off of centos8 because its been removed.

* Removing support for centos 7
---
 .github/workflows/create-release.yml   |  5 -----
 .github/workflows/publish-packages.yml | 22 +++++++---------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 8ff1e152..a666a414 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -36,11 +36,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: centos
-            release: 7
-            pkg: rpm
-            pkg_name: el
-            image: centos:7
           - distro: ubi
             release: 8
             pkg: rpm
diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
index 6ee17b55..564e094b 100644
--- a/.github/workflows/publish-packages.yml
+++ b/.github/workflows/publish-packages.yml
@@ -42,14 +42,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: centos
-            release: 7
+          - distro: ubi8
+            release: 8.10
             pkg: rpm
-            image: centos
-          - distro: centos
-            release: 8
-            pkg: rpm
-            image: centos
+            image: redhat/ubi8
           - distro: ubi9
             release: 9.2
             pkg: rpm
@@ -116,14 +112,10 @@ jobs:
         run: |
           if [ "${{ matrix.distro }}" = "centos" ]
           then
-            if [ "${{ matrix.release }}" = "7" ]
-            then
-              yum install -y make gcc diffutils libpcap-devel
-            else
-              dnf -y --disablerepo '*' --enablerepo=extras swap centos-linux-repos centos-stream-repos
-              yum install -y make gcc diffutils
-              dnf -y --enablerepo=powertools install libpcap-devel
-            fi
+            yum install -y make gcc diffutils libpcap-devel
+          elif [ "${{ matrix.distro }}" = "ubi8" ]
+          then
+            yum install -y make gcc diffutils libpcap-devel
           elif [ "${{ matrix.distro }}" = "ubi9" ]
           then
             yum install -y make gcc diffutils libpcap-devel