From 4ac4da4226fd6af43cb99fa444c3872fc64b5154 Mon Sep 17 00:00:00 2001 From: Matej Matuska Date: Thu, 27 Jun 2024 11:51:01 +0200 Subject: [PATCH] Add build container for RHEL 9 --- Makefile | 9 ++++++--- utils/container-builds/Containerfile.ubi9 | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 utils/container-builds/Containerfile.ubi9 diff --git a/Makefile b/Makefile index 2b16c44818..5b2bc4d2b4 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ help: @echo " packaging" @echo " srpm create the SRPM" @echo " build_container create the RPM in container" - @echo " - set BUILD_CONTAINER to el7 or el8" + @echo " - set BUILD_CONTAINER to el7, el8 or el9" @echo " - don't run more than one build at the same time" @echo " since containers operate on the same files!" @echo " copr_build create the COPR build using the COPR TOKEN" @@ -164,7 +164,7 @@ help: @echo " PR=7 SUFFIX='my_additional_suffix' make " @echo " MR=6 COPR_CONFIG='path/to/the/config/copr/file' make " @echo " ACTOR= TEST_LIBS=y make test" - @echo " BUILD_CONTAINER=rhel7 make build_container" + @echo " BUILD_CONTAINER=el7 make build_container" @echo " TEST_CONTAINER=f34 make test_container" @echo " CONTAINER_TOOL=docker TEST_CONTAINER=rhel7 make test_container_no_lint" @echo "" @@ -258,12 +258,15 @@ build_container: el8) \ CONT_FILE="utils/container-builds/Containerfile.ubi8"; \ ;; \ + el9) \ + CONT_FILE="utils/container-builds/Containerfile.ubi9"; \ + ;; \ "") \ echo "BUILD_CONTAINER must be set"; \ exit 1; \ ;; \ *) \ - echo "Available containers are el7, el8"; \ + echo "Available containers are el7, el8, el9"; \ exit 1; \ ;; \ esac && \ diff --git a/utils/container-builds/Containerfile.ubi9 b/utils/container-builds/Containerfile.ubi9 new file mode 100644 index 0000000000..53567c08d7 --- /dev/null +++ b/utils/container-builds/Containerfile.ubi9 @@ -0,0 +1,10 @@ +FROM registry.access.redhat.com/ubi9/ubi:latest + +VOLUME /repo + +RUN dnf update -y && \ + dnf install -y python3-devel rpm-build make git + +WORKDIR /repo +ENV DIST_VERSION 9 +ENTRYPOINT make _build_local