From 98928635a56cd850e6c8bd7ec7283865942bcc9d Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Wed, 25 Dec 2024 18:45:45 +0100 Subject: [PATCH] Revert "Fedora rawhide base image no longer ships shadow-utils." This reverts commit 073beea053c71ef7e61dea121430b6e6682fe747. The shadow-utils package seems back. --- Dockerfile.fedora-41 | 6 +++--- Dockerfile.fedora-rawhide | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.fedora-41 b/Dockerfile.fedora-41 index 792202da..f66e6df3 100644 --- a/Dockerfile.fedora-41 +++ b/Dockerfile.fedora-41 @@ -4,13 +4,13 @@ FROM registry.fedoraproject.org/fedora:41 # Workaround https://bugzilla.redhat.com/show_bug.cgi?id=1941142 COPY resolv.conf hostname /etc/ +RUN groupadd -g 288 kdcproxy ; useradd -u 288 -g 288 -c 'IPA KDC Proxy User' -r -d / -s '/sbin/nologin' kdcproxy +RUN groupadd -g 289 ipaapi; useradd -u 289 -g 289 -c 'IPA Framework User' -r -d / -s '/sbin/nologin' ipaapi + # Workaround 1615948 RUN ln -s /bin/false /usr/sbin/systemd-machine-id-setup RUN sed -i 's!%_install_langs.*!%_install_langs all!' /etc/rpm/macros.image-language-conf RUN dnf upgrade -y --setopt=install_weak_deps=False \ - && dnf install -y --setopt=install_weak_deps=False shadow-utils \ - && groupadd -g 288 kdcproxy ; useradd -u 288 -g 288 -c 'IPA KDC Proxy User' -r -d / -s '/sbin/nologin' kdcproxy \ - && groupadd -g 289 ipaapi; useradd -u 289 -g 289 -c 'IPA Framework User' -r -d / -s '/sbin/nologin' ipaapi \ && dnf install -y --setopt=install_weak_deps=False freeipa-server freeipa-server-dns freeipa-server-trust-ad freeipa-healthcheck freeipa-client-epn patch \ && dnf clean all diff --git a/Dockerfile.fedora-rawhide b/Dockerfile.fedora-rawhide index df8f3f39..54bd76e5 100644 --- a/Dockerfile.fedora-rawhide +++ b/Dockerfile.fedora-rawhide @@ -4,13 +4,13 @@ FROM registry.fedoraproject.org/fedora:rawhide # Workaround https://bugzilla.redhat.com/show_bug.cgi?id=1941142 COPY resolv.conf hostname /etc/ +RUN groupadd -g 288 kdcproxy ; useradd -u 288 -g 288 -c 'IPA KDC Proxy User' -r -d / -s '/sbin/nologin' kdcproxy +RUN groupadd -g 289 ipaapi; useradd -u 289 -g 289 -c 'IPA Framework User' -r -d / -s '/sbin/nologin' ipaapi + # Workaround 1615948 RUN ln -s /bin/false /usr/sbin/systemd-machine-id-setup RUN sed -i 's!%_install_langs.*!%_install_langs all!' /etc/rpm/macros.image-language-conf RUN dnf upgrade -y --setopt=install_weak_deps=False \ - && dnf install -y --setopt=install_weak_deps=False shadow-utils \ - && groupadd -g 288 kdcproxy ; useradd -u 288 -g 288 -c 'IPA KDC Proxy User' -r -d / -s '/sbin/nologin' kdcproxy \ - && groupadd -g 289 ipaapi; useradd -u 289 -g 289 -c 'IPA Framework User' -r -d / -s '/sbin/nologin' ipaapi \ && dnf install -y --setopt=install_weak_deps=False freeipa-server freeipa-server-dns freeipa-server-trust-ad freeipa-healthcheck freeipa-client-epn patch \ && dnf clean all