From 2bd9fee038360fed53bfcca19ab136d959ba4842 Mon Sep 17 00:00:00 2001 From: David Petera Date: Wed, 7 May 2025 15:36:14 +0200 Subject: [PATCH] CI: Add systemd installation to Fedora Dockerfiles and make exception in bird.spec for CentOS and OpenSUSE distros. --- distro/pkg/rpm/bird.spec | 10 ++++++++++ misc/docker/fedora-33-amd64/Dockerfile | 1 + misc/docker/fedora-34-amd64/Dockerfile | 1 + misc/docker/fedora-35-amd64/Dockerfile | 1 + misc/docker/fedora-36-amd64/Dockerfile | 1 + misc/docker/fedora-37-amd64/Dockerfile | 1 + misc/docker/fedora-38-amd64/Dockerfile | 1 + misc/docker/fedora-39-amd64/Dockerfile | 1 + misc/docker/fedora-40-amd64/Dockerfile | 1 + misc/docker/fedora-41-amd64/Dockerfile | 1 + misc/docker/fedora-42-amd64/Dockerfile | 1 + 11 files changed, 20 insertions(+) diff --git a/distro/pkg/rpm/bird.spec b/distro/pkg/rpm/bird.spec index eb6b8aa90..79bf45108 100644 --- 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 08efe2f8c..4b3c4ba4f 100644 --- 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 f39087b7e..afd27ccc8 100644 --- 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 ff728bd1a..93c363e2a 100644 --- 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 eb98def6f..965edcff2 100644 --- 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 a8003d224..949a5217c 100644 --- 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 1ef81e76a..9c51de0db 100644 --- 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 e986bf218..7544a956c 100644 --- 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 ab2c532ea..18e6cc107 100644 --- 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 6d9b80d94..c7f50852f 100644 --- 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 bc8ac5c05..f01bbe5df 100644 --- 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 \ -- 2.47.2