dbld: add almalinux-9 as distro

Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
axoflow · May 24, 2024 · ddbc2c2 · ddbc2c2
1 parent 9d9f179
commit ddbc2c2
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 2 deletions.
diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml
@@ -24,6 +24,7 @@ on:
           "ubuntu-lunar",
           "ubuntu-mantic",
           "almalinux-8",
+          "almalinux-9",
           "fedora-39"
         ]'
 

diff --git a/.github/workflows/dbld-images.yml b/.github/workflows/dbld-images.yml
@@ -29,6 +29,7 @@ jobs:
     strategy:
       matrix:
         image:
+          - almalinux-9
           - almalinux-8
           - fedora-39
           - debian-bullseye

diff --git a/dbld/Makefile.am b/dbld/Makefile.am
@@ -27,6 +27,7 @@ EXTRA_DIST += \
 	dbld/images/centos.prepare.sh \
 	dbld/images/fedora.prepare.sh \
 	dbld/images/almalinux-8.dockerfile \
+	dbld/images/almalinux-9.dockerfile \
 	dbld/images/devshell.dockerfile \
 	dbld/images/fedora-39.dockerfile \
 	dbld/images/debian-bullseye.dockerfile \

diff --git a/dbld/builddeps b/dbld/builddeps
@@ -113,8 +113,15 @@ function add_copr_repo {
     # PIP installation later.
     case "${OS_DISTRIBUTION}" in
         centos|almalinux)
-            $YUM_INSTALL yum-plugin-copr
-            yum config-manager --set-enabled powertools
+            case "${OS_DISTRIBUTION_CODE_NAME}" in
+                8)
+                    $YUM_INSTALL yum-plugin-copr
+                    yum config-manager --set-enabled powertools
+                ;;
+                9)
+                    dnf config-manager --set-enabled crb
+                ;;
+            esac
             ;;
         fedora)
             $DNF_INSTALL -y dnf-plugins-core

diff --git a/dbld/images/almalinux-9.dockerfile b/dbld/images/almalinux-9.dockerfile
@@ -0,0 +1,25 @@
+FROM almalinux:9
+LABEL maintainer="Laszlo Varady <laszlo.varady@axoflow.com>, Balazs Scheidler <balazs.scheidler@axoflow.com>"
+ENV OS_DISTRIBUTION=almalinux
+ENV OS_DISTRIBUTION_CODE_NAME=9
+
+ARG ARG_IMAGE_PLATFORM
+ARG COMMIT
+ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM}
+LABEL COMMIT=${COMMIT}
+
+COPY images/entrypoint.sh /
+COPY . /dbld/
+
+RUN /dbld/builddeps install_dbld_dependencies
+RUN /dbld/builddeps add_epel_repo
+RUN /dbld/builddeps add_copr_repo
+RUN /dbld/builddeps install_yum_packages
+RUN /dbld/builddeps install_rpm_build_deps
+
+RUN /dbld/builddeps install_criterion
+
+VOLUME /source
+VOLUME /build
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dbld/rules b/dbld/rules
@@ -2,6 +2,7 @@
 
 BUILDER_IMAGES=		\
 	almalinux-8	\
+	almalinux-9	\
 	fedora-39	\
 	debian-stretch	\
 	debian-bullseye	\

diff --git a/packaging/rhel/axosyslog.spec b/packaging/rhel/axosyslog.spec
@@ -69,7 +69,9 @@ BuildRequires: glib2-devel
 BuildRequires: ivykis-devel
 BuildRequires: json-c-devel
 BuildRequires: libcap-devel
+%if 0%{?rhel} <= 8
 BuildRequires: libdbi-devel
+%endif
 BuildRequires: libnet-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre2-devel