From db06a772d0ff6fd037f525c49e1476fba33491b0 Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Tue, 12 Dec 2023 20:54:57 +0100 Subject: [PATCH] Revert the AlmaLinux part of "Workaround https://bugzilla.redhat.com/show_bug.cgi?id=1941142 and https://github.com/AlmaLinux/docker-images/issues/97." This partially reverts commit 1fac6528e51f2388ed4f1e99a471c19de5a1c2fd. --- Dockerfile.almalinux-8 | 4 ---- Dockerfile.almalinux-9 | 4 ---- resolv.conf | 1 - 3 files changed, 9 deletions(-) diff --git a/Dockerfile.almalinux-8 b/Dockerfile.almalinux-8 index 2b558f84..001bef7d 100644 --- a/Dockerfile.almalinux-8 +++ b/Dockerfile.almalinux-8 @@ -1,10 +1,6 @@ # Build on top of base AlmaLinux 8 image FROM docker.io/almalinux/8-init -# Workaround https://bugzilla.redhat.com/show_bug.cgi?id=1941142 -# and https://github.com/AlmaLinux/docker-images/issues/97 -COPY resolv.conf hostname /etc/ - RUN groupadd -g 288 kdcproxy ; useradd -u 288 -g 288 -c 'IPA KDC Proxy User' -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 diff --git a/Dockerfile.almalinux-9 b/Dockerfile.almalinux-9 index 6c96271b..86c97320 100644 --- a/Dockerfile.almalinux-9 +++ b/Dockerfile.almalinux-9 @@ -1,10 +1,6 @@ # Build on top of base AlmaLinux 9 image FROM docker.io/almalinux/9-init -# Workaround https://bugzilla.redhat.com/show_bug.cgi?id=1941142 -# and https://github.com/AlmaLinux/docker-images/issues/97 -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 diff --git a/resolv.conf b/resolv.conf index 3f3ddf95..649074b1 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,2 +1 @@ # Workaround https://bugzilla.redhat.com/show_bug.cgi?id=1941142 -# and https://github.com/AlmaLinux/docker-images/issues/97