Skip to content

Commit

Permalink
Add build container for RHEL 9
Browse files Browse the repository at this point in the history
  • Loading branch information
matejmatuska committed Jun 27, 2024
1 parent 02f1c6a commit 4ac4da4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -164,7 +164,7 @@ help:
@echo " PR=7 SUFFIX='my_additional_suffix' make <target>"
@echo " MR=6 COPR_CONFIG='path/to/the/config/copr/file' make <target>"
@echo " ACTOR=<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 ""
Expand Down Expand Up @@ -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 && \
Expand Down
10 changes: 10 additions & 0 deletions utils/container-builds/Containerfile.ubi9
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 4ac4da4

Please sign in to comment.