From a37b72131bcbf7c4a25633d89fc4ece23281fc4a Mon Sep 17 00:00:00 2001 From: Katerina Koukiou Date: Fri, 7 Feb 2025 14:49:55 +0100 Subject: [PATCH] infra: Adjust the Containers to Use Full systemd The systemd-standalone-sysusers package, which is pre-installed in the containers, conflicts with systemd. Since Anaconda requires systemd as a dependency, this conflict prevents installation during tests. This update ensures that containers use the full systemd package to resolve the dependency issue. --- dockerfile/anaconda-ci/Dockerfile | 4 ++++ dockerfile/anaconda-rpm/Dockerfile | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dockerfile/anaconda-ci/Dockerfile b/dockerfile/anaconda-ci/Dockerfile index 3b0990d91d29..ff56aa2d052e 100644 --- a/dockerfile/anaconda-ci/Dockerfile +++ b/dockerfile/anaconda-ci/Dockerfile @@ -30,6 +30,10 @@ LABEL maintainer=anaconda-devel@lists.fedoraproject.org # the build is invoked by Makefile. COPY ["anaconda.spec.in", "requirements.txt", "/root/"] +# Replace standalone systemd package with systemd as these are conflicting +RUN set -ex; \ + dnf swap -y systemd-standalone-sysusers systemd + # Prepare environment and install build dependencies RUN set -ex; \ # disable fedora-cisco repository otherwise freerdp will depend on openh264 from fedora-cisco diff --git a/dockerfile/anaconda-rpm/Dockerfile b/dockerfile/anaconda-rpm/Dockerfile index c626520baa48..3ba26bc49d48 100644 --- a/dockerfile/anaconda-rpm/Dockerfile +++ b/dockerfile/anaconda-rpm/Dockerfile @@ -25,6 +25,10 @@ LABEL maintainer=anaconda-devel@lists.fedoraproject.org # the build is invoked by Makefile. COPY ["anaconda.spec.in", "/root/"] +# Replace standalone systemd package with systemd as these are conflicting +RUN set -ex; \ + dnf swap -y systemd-standalone-sysusers systemd + # Prepare environment and install build dependencies RUN set -ex; \ # disable fedora-cisco repository otherwise freerdp will depend on openh264 from fedora-cisco