fix: Fix building RPM packages by switching from CentOS to RockyLinux (…

…#34)

fix: Fix building RPM packages by switching from CentOS to RockyLinux

Refs: XRDCAT-11

.github/workflows/run_tests.yaml

@@ -11,6 +11,8 @@ on:
       - 'xroad-catalog-persistence/src/**'
       - '.github/**'
       - 'gradle/libs.versions.toml' # So that dependabot PRs are tested
+      - 'xroad-catalog-collector/packages/**'
+      - 'xroad-catalog-lister/packages/**'
   pull_request:
     types: [opened, synchronize, reopened]
     paths:

xroad-catalog-collector/packages/xroad-catalog-collector/docker/Dockerfile

@@ -1,12 +1,12 @@
-FROM centos:7
+FROM rockylinux:9
 MAINTAINER "Nordic Institute for Interoperability Solutions (NIIS)" <x-road@niis.org>
 
-RUN yum -y install sudo git rpm-build java-21-openjdk-headless
-RUN yum clean all
-RUN sed -i 's/requiretty/!requiretty/' /etc/sudoers
+RUN dnf -y install sudo git rpm-build systemd-rpm-macros systemd java-21-openjdk-headless \
+    && dnf clean all \
+    && sed -i 's/requiretty/!requiretty/' /etc/sudoers
 
 ARG CATALOG_PROFILE
 ENV CATALOG_PROFILE=${CATALOG_PROFILE}
 USER root
+RUN git config --global --add safe.directory /workspace
 CMD /workspace/xroad-catalog-collector/build_rpm.sh -p $CATALOG_PROFILE
-

xroad-catalog-lister/packages/xroad-catalog-lister/docker/Dockerfile

@@ -1,11 +1,12 @@
-FROM centos:7
+FROM rockylinux:9
 MAINTAINER "Nordic Institute for Interoperability Solutions (NIIS)" <x-road@niis.org>
 
-RUN yum -y install sudo git rpm-build java-21-openjdk-headless
-RUN yum clean all
-RUN sed -i 's/requiretty/!requiretty/' /etc/sudoers
+RUN dnf -y install sudo git rpm-build systemd-rpm-macros systemd java-21-openjdk-headless \
+    && dnf clean all \
+    && sed -i 's/requiretty/!requiretty/' /etc/sudoers
 
 ARG CATALOG_PROFILE
 ENV CATALOG_PROFILE=${CATALOG_PROFILE}
 USER root
+RUN git config --global --add safe.directory /workspace
 CMD /workspace/xroad-catalog-lister/build_rpm.sh -p $CATALOG_PROFILE