CI: Add systemd installation to Fedora Dockerfiles and make exception in bird.spec...

diff --git a/distro/pkg/rpm/bird.spec b/distro/pkg/rpm/bird.spec
index eb6b8aa90982e494ccfb950f351e8cbf3d43caee..79bf4510837dc6ad30ee5555e78958c2d9f04c0a 100644 (file)
--- a/distro/pkg/rpm/bird.spec
+++ b/distro/pkg/rpm/bird.spec
@@ -2,6 +2,9 @@
 %global _without_doc 1
 %{!?_rundir:%global _rundir %%{_localstatedir}/run}
 
+%define bird_user bird
+%define bird_group bird
+
 Name:             bird
 Version:          {{ version }}
 Release:          cznic.{{ release }}%{?dist}
@@ -89,7 +92,14 @@ install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/bird.conf
 make test
 
 %pre
+%if 0%{?suse_version} || ( 0%{?rhel} && 0%{?rhel} <= 8 )
+# Create bird user/group manually
+getent group %{bird_group} >/dev/null || groupadd -r %{bird_group}
+getent passwd %{bird_user} >/dev/null || useradd -r -g %{bird_group} -d /var/lib/bird -s /sbin/nologin -c "BIRD daemon user" %{bird_user}
+%else
 %sysusers_create_compat %{SOURCE3}
+%endif
+
 
 %post
 %systemd_post bird.service

diff --git a/misc/docker/fedora-33-amd64/Dockerfile b/misc/docker/fedora-33-amd64/Dockerfile
index 08efe2f8c15623f1eb4342c4c6c12bb05afc9422..4b3c4ba4f30d8fe4429bfe43531b9dad68fad4f4 100644 (file)
--- a/misc/docker/fedora-33-amd64/Dockerfile
+++ b/misc/docker/fedora-33-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \

diff --git a/misc/docker/fedora-34-amd64/Dockerfile b/misc/docker/fedora-34-amd64/Dockerfile
index f39087b7e2f09a6955bf593f140cd10063dd02dd..afd27ccc806cb909a3d3909b7f07a20425b3c9c4 100644 (file)
--- a/misc/docker/fedora-34-amd64/Dockerfile
+++ b/misc/docker/fedora-34-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \

diff --git a/misc/docker/fedora-35-amd64/Dockerfile b/misc/docker/fedora-35-amd64/Dockerfile
index ff728bd1a8824232c7559674be14639f22bab2d9..93c363e2a6a7e8610ba3b29f45cd3e0bfd369ab3 100644 (file)
--- a/misc/docker/fedora-35-amd64/Dockerfile
+++ b/misc/docker/fedora-35-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \

diff --git a/misc/docker/fedora-36-amd64/Dockerfile b/misc/docker/fedora-36-amd64/Dockerfile
index eb98def6f73d1fe4e1be69fe7147177096cf1ce9..965edcff23bbff80b2dcd05a1e7e26a4ba7e5555 100644 (file)
--- a/misc/docker/fedora-36-amd64/Dockerfile
+++ b/misc/docker/fedora-36-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \

diff --git a/misc/docker/fedora-37-amd64/Dockerfile b/misc/docker/fedora-37-amd64/Dockerfile
index a8003d2240f7c10cb159999b91bebeed2783a23a..949a5217c6d36d0cb7c678b64dea49b65018f01f 100644 (file)
--- a/misc/docker/fedora-37-amd64/Dockerfile
+++ b/misc/docker/fedora-37-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \

diff --git a/misc/docker/fedora-38-amd64/Dockerfile b/misc/docker/fedora-38-amd64/Dockerfile
index 1ef81e76ab0c21d9f8230cc9e3b9024bee594576..9c51de0dbcff4cc997220deeaca4f673281b1b9a 100644 (file)
--- a/misc/docker/fedora-38-amd64/Dockerfile
+++ b/misc/docker/fedora-38-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \

diff --git a/misc/docker/fedora-39-amd64/Dockerfile b/misc/docker/fedora-39-amd64/Dockerfile
index e986bf2187e564f82f93efc6ce9929eeda5ce792..7544a956ca3d9332ab80f5d1072b8894b66a98a3 100644 (file)
--- a/misc/docker/fedora-39-amd64/Dockerfile
+++ b/misc/docker/fedora-39-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \

diff --git a/misc/docker/fedora-40-amd64/Dockerfile b/misc/docker/fedora-40-amd64/Dockerfile
index ab2c532ea5008107667945fd65b4d86793920263..18e6cc107dc00417e28b554b1215c4c50ef8e307 100644 (file)
--- a/misc/docker/fedora-40-amd64/Dockerfile
+++ b/misc/docker/fedora-40-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \

diff --git a/misc/docker/fedora-41-amd64/Dockerfile b/misc/docker/fedora-41-amd64/Dockerfile
index 6d9b80d944ddc0b69efb06f9020d09816b1b9518..c7f50852fee71a6dabb771614c064bb6455b5e39 100644 (file)
--- a/misc/docker/fedora-41-amd64/Dockerfile
+++ b/misc/docker/fedora-41-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \

diff --git a/misc/docker/fedora-42-amd64/Dockerfile b/misc/docker/fedora-42-amd64/Dockerfile
index bc8ac5c0521dc94e2f8ec86feb3126cd4f6b4b41..f01bbe5dff5ce6be1cd7318e4c83693ee3e92375 100644 (file)
--- a/misc/docker/fedora-42-amd64/Dockerfile
+++ b/misc/docker/fedora-42-amd64/Dockerfile
@@ -14,6 +14,7 @@ RUN dnf -y install \
 RUN dnf -y install \
        git \
        rpm-build \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \