Add support for RHEL 10 and some improvements (#289)

Author: shinyaaa

.github/workflows/Dockerfile

@@ -1,12 +1,12 @@
 ARG RHEL_VERSION
-FROM rockylinux:${RHEL_VERSION}
+FROM rockylinux/rockylinux:${RHEL_VERSION:-10}
 
 ARG RHEL_VERSION
 ARG PG_VERSION
 ARG PG_RMAN_VERSION
 
-ENV PATH /usr/pgsql-${PG_VERSION}/bin:$PATH
-ENV PGDATA /var/lib/pgsql/${PG_VERSION}/data
+ENV PATH=/usr/pgsql-${PG_VERSION}/bin:$PATH
+ENV PGDATA=/var/lib/pgsql/${PG_VERSION}/data
 
 
 ################################################################################
@@ -16,8 +16,9 @@ ENV PGDATA /var/lib/pgsql/${PG_VERSION}/data
 ################################################################################
 
 # Install packages for build
-RUN dnf update -y
-RUN dnf install -y \
+RUN sed -i -e '/^mirrorlist=/s/^/#/' -e '/^#baseurl=/s/^#//' /etc/yum.repos.d/*.repo && \
+    dnf update -y && \
+    dnf install -y \
         clang gcc git krb5-devel libselinux-devel libzstd-devel lz4-devel make \
         openssl-devel pam-devel readline-devel rpmdevtools which zlib-devel
 
@@ -28,7 +29,9 @@ RUN if [ "${RHEL_VERSION}" = "8" ]; then \
         dnf install -y --enablerepo=crb perl-IPC-Run; \
     fi
 RUN dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-${RHEL_VERSION}-x86_64/pgdg-redhat-repo-latest.noarch.rpm
-RUN dnf -qy module disable postgresql
+RUN if [ "${RHEL_VERSION}" = "8" ] || [ "${RHEL_VERSION}" = "9" ]; then \
+        dnf -qy module disable postgresql; \
+    fi
 RUN dnf install -y postgresql${PG_VERSION}-server postgresql${PG_VERSION}-devel
 
 
@@ -53,7 +56,7 @@ RUN cd pg_rman && \
         --output=../rpmbuild/SOURCES/pg_rman-${PG_RMAN_VERSION}-pg${PG_VERSION}.tar.gz
 
 # Build RPMs
-RUN rpmbuild rpmbuild/SPECS/pg_rman${PG_VERSION}.spec \
+RUN QA_RPATHS=0x0002 rpmbuild rpmbuild/SPECS/pg_rman${PG_VERSION}.spec \
         -bb --define="dist .pg${PG_VERSION}.rhel${RHEL_VERSION}"
 
 

.github/workflows/release.yml

@@ -11,8 +11,9 @@ jobs:
     permissions:
       contents: write
     strategy:
+      fail-fast: false
       matrix:
-        RHEL_VERSION: ["8", "9"]
+        RHEL_VERSION: ["8", "9", "10"]
         PG_VERSION: ["13", "14", "15", "16", "17"]
     steps:
     - name: Checkout repository

docs/index-ja.html

@@ -1461,7 +1461,7 @@ <h1 id="requirement">動作環境</h2>
 <dt>PostgreSQLバージョン</dt>
 <dd>PostgreSQL 13, 14, 15, 16, 17</dd>
 <dt>OS</dt>
-<dd>RHEL 8, 9</dd>
+<dd>RHEL 8, 9, 10</dd>
 </dl>
 
 

docs/index.html

@@ -1451,7 +1451,7 @@ <h1 id="requirement">Requirements</h1>
 <dt>PostgreSQL</dt>
 <dd>PostgreSQL 13, 14, 15, 16, 17</dd>
 <dt>OS</dt>
-<dd>RHEL 8, 9</dd>
+<dd>RHEL 8, 9, 10</dd>
 </dl>