From 3b53ee061b236c703ccffb00687ef814a5339088 Mon Sep 17 00:00:00 2001 From: Rene Cannao Date: Tue, 3 Feb 2026 18:36:48 +0000 Subject: [PATCH] Add systemd-rpm-macros to Docker build images This change adds the systemd-rpm-macros package to all RHEL-based and OpenSUSE-based Docker build images. This is required for proper RPM package uninstallation on Amazon Linux 2023 and other systemd-based RHEL distributions, as the %systemd_preun macro in the RPM spec files requires this package to be available in the build environment. Fixes ProxySQL/docker-images#15 Related to: - ProxySQL issue sysown/proxysql#5335 - ProxySQL PR sysown/proxysql#5336 --- build-images/build-almalinux10/Dockerfile | 3 ++- build-images/build-almalinux8/Dockerfile | 3 ++- build-images/build-almalinux9/Dockerfile | 3 ++- build-images/build-centos10/Dockerfile | 3 ++- build-images/build-centos9/Dockerfile | 3 ++- build-images/build-fedora41/Dockerfile | 3 ++- build-images/build-fedora42/Dockerfile | 3 ++- build-images/build-fedora43/Dockerfile | 3 ++- build-images/build-opensuse15/Dockerfile | 3 ++- build-images/build-opensuse16/Dockerfile | 3 ++- build-images/experimental/build-amazon2/Dockerfile | 3 ++- build-images/experimental/build-amazon2023/Dockerfile | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/build-images/build-almalinux10/Dockerfile b/build-images/build-almalinux10/Dockerfile index 7e10df9..b8f0fa1 100644 --- a/build-images/build-almalinux10/Dockerfile +++ b/build-images/build-almalinux10/Dockerfile @@ -17,7 +17,8 @@ RUN yum install -y \ libtool \ rpm-build \ python3 \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN yum install -y \ diff --git a/build-images/build-almalinux8/Dockerfile b/build-images/build-almalinux8/Dockerfile index 2ed7047..73a0710 100644 --- a/build-images/build-almalinux8/Dockerfile +++ b/build-images/build-almalinux8/Dockerfile @@ -17,7 +17,8 @@ RUN yum install -y \ libtool \ rpm-build \ python3 \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN yum install -y \ diff --git a/build-images/build-almalinux9/Dockerfile b/build-images/build-almalinux9/Dockerfile index af77544..318bd46 100644 --- a/build-images/build-almalinux9/Dockerfile +++ b/build-images/build-almalinux9/Dockerfile @@ -17,7 +17,8 @@ RUN yum install -y \ libtool \ rpm-build \ python3 \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN yum install -y \ diff --git a/build-images/build-centos10/Dockerfile b/build-images/build-centos10/Dockerfile index 8ced52f..372e399 100644 --- a/build-images/build-centos10/Dockerfile +++ b/build-images/build-centos10/Dockerfile @@ -17,7 +17,8 @@ RUN yum install -y \ libtool \ rpm-build \ python3 \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN yum install -y \ diff --git a/build-images/build-centos9/Dockerfile b/build-images/build-centos9/Dockerfile index c066726..c0fe692 100644 --- a/build-images/build-centos9/Dockerfile +++ b/build-images/build-centos9/Dockerfile @@ -17,7 +17,8 @@ RUN yum install -y \ libtool \ rpm-build \ python3 \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN yum install -y \ diff --git a/build-images/build-fedora41/Dockerfile b/build-images/build-fedora41/Dockerfile index 99d55da..865a2f1 100644 --- a/build-images/build-fedora41/Dockerfile +++ b/build-images/build-fedora41/Dockerfile @@ -13,7 +13,8 @@ RUN dnf install -y \ libtool \ rpm-build \ python3 \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN dnf install -y \ diff --git a/build-images/build-fedora42/Dockerfile b/build-images/build-fedora42/Dockerfile index f2d0441..e4f8d85 100644 --- a/build-images/build-fedora42/Dockerfile +++ b/build-images/build-fedora42/Dockerfile @@ -13,7 +13,8 @@ RUN dnf install -y \ libtool \ rpm-build \ python3 \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN dnf install -y \ diff --git a/build-images/build-fedora43/Dockerfile b/build-images/build-fedora43/Dockerfile index cfe0f4d..35f39e5 100644 --- a/build-images/build-fedora43/Dockerfile +++ b/build-images/build-fedora43/Dockerfile @@ -13,7 +13,8 @@ RUN dnf install -y \ libtool \ rpm-build \ python3 \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN dnf install -y \ diff --git a/build-images/build-opensuse15/Dockerfile b/build-images/build-opensuse15/Dockerfile index a834a9b..0334932 100644 --- a/build-images/build-opensuse15/Dockerfile +++ b/build-images/build-opensuse15/Dockerfile @@ -18,7 +18,8 @@ RUN zypper install -y \ rpm-build \ python3 \ libtool \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN zypper install -y \ diff --git a/build-images/build-opensuse16/Dockerfile b/build-images/build-opensuse16/Dockerfile index 323b29b..c3a6e75 100644 --- a/build-images/build-opensuse16/Dockerfile +++ b/build-images/build-opensuse16/Dockerfile @@ -18,7 +18,8 @@ RUN zypper install -y \ rpm-build \ python3 \ libtool \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN zypper install -y \ diff --git a/build-images/experimental/build-amazon2/Dockerfile b/build-images/experimental/build-amazon2/Dockerfile index b23a1ef..5b37a29 100644 --- a/build-images/experimental/build-amazon2/Dockerfile +++ b/build-images/experimental/build-amazon2/Dockerfile @@ -25,7 +25,8 @@ RUN yum install -y\ gcc gcc-c++\ libtool\ rpm-build\ - python3 + python3\ + systemd-rpm-macros # proxysql build dependencies RUN yum install -y\ diff --git a/build-images/experimental/build-amazon2023/Dockerfile b/build-images/experimental/build-amazon2023/Dockerfile index 4948e7c..ddca2a8 100644 --- a/build-images/experimental/build-amazon2023/Dockerfile +++ b/build-images/experimental/build-amazon2023/Dockerfile @@ -17,7 +17,8 @@ RUN yum install -y \ libtool \ rpm-build \ python3 \ - pkg-config + pkg-config \ + systemd-rpm-macros # proxysql build dependencies RUN yum install -y \