Add build support for ubi8 in the Server container build

distributed-system-analysis · Dec 8, 2023 · b5bee97 · b5bee97
1 parent 02fea2b
commit b5bee97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/server/pbenchinacan/container-build.sh b/server/pbenchinacan/container-build.sh
@@ -52,6 +52,9 @@ buildah run $container dnf update -y
 if [[ "${BASE_IMAGE}" == *"ubi9:"* || "${BASE_IMAGE}" == *"centos:stream9" ]]; then
     buildah run $container dnf install -y --nodocs \
         https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
+elif [[ "${BASE_IMAGE}" == *"ubi8:"* || "${BASE_IMAGE}" == *"centos:stream8" ]]; then
+    buildah run $container dnf install -y --nodocs \
+        https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 fi
 buildah run $container dnf install -y --nodocs \
     /tmp/pbench-server.rpm less nginx openssl rsyslog rsyslog-mmjsonparse

diff --git a/server/rpm/pbench-server.spec.j2 b/server/rpm/pbench-server.spec.j2
@@ -8,7 +8,7 @@ URL:            http://github.com/distributed-systems-analysis/pbench
 Source0:        pbench-server-%{version}.tar.gz
 Buildarch:      noarch
 
-Requires: python3 python3-devel tar xz util-linux-core hostname
+Requires: python3 python3-devel tar xz hostname
 
 # policycoreutils for semanage and restorecon
 Requires:       policycoreutils