Skip to content

Commit

Permalink
infra: adjust the containers to use full systemd
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
KKoukiou committed Feb 10, 2025
1 parent 02c2be4 commit 90ae506
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions dockerfile/anaconda-ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions dockerfile/anaconda-iso-creator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
4 changes: 4 additions & 0 deletions dockerfile/anaconda-rpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 90ae506

Please sign in to comment.