Revert the AlmaLinux part of "Workaround https://bugzilla.redhat.com/…

…show_bug.cgi?id=1941142 and AlmaLinux/docker-images#97." This partially reverts commit 1fac652.
freeipa · Dec 12, 2023 · db06a77 · db06a77
1 parent 383fc3a
commit db06a77
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git 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
@@ -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
@@ -1,2 +1 @@
 # Workaround https://bugzilla.redhat.com/show_bug.cgi?id=1941142
-# and https://github.com/AlmaLinux/docker-images/issues/97
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		# Workaround https://bugzilla.redhat.com/show_bug.cgi?id=1941142
		# and https://github.com/AlmaLinux/docker-images/issues/97