Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for UBI 8 base image to Pbench Server container image build #3582

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Add support for UBI 8 base image to Pbench Server container image build #3582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/pbenchinacan/container-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion server/rpm/pbench-server.spec.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down