Merge pull request #6158 from jkonecny12/f42-systemd-standalone

infra: adjust the containers to use full systemd
rhinstaller · Feb 12, 2025 · 6e3e9b4 · 6e3e9b4
2 parents 3562ed2 + 2dbeea4
commit 6e3e9b4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/dockerfile/anaconda-ci/Dockerfile b/dockerfile/anaconda-ci/Dockerfile
@@ -30,6 +30,10 @@ LABEL [email protected]
 # 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-iso-creator/Dockerfile b/dockerfile/anaconda-iso-creator/Dockerfile
@@ -30,6 +30,10 @@ FROM ${image}
 # see https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
 LABEL [email protected]
 
+# 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; \
   dnf update -y; \

diff --git a/dockerfile/anaconda-rpm/Dockerfile b/dockerfile/anaconda-rpm/Dockerfile
@@ -25,6 +25,10 @@ LABEL [email protected]
 # 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