From 64e83b350bbbc336fa3c000ded7c17d0ed8dbe25 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Sun, 17 Jul 2022 22:25:16 +0200 Subject: [PATCH] el9: remove epel-testing, new re2 is in epel9 stable now --- builder-support/dockerfiles/Dockerfile.rpmbuild | 5 ----- 1 file changed, 5 deletions(-) diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild index 4ed620b40b..806c5c8222 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmbuild +++ b/builder-support/dockerfiles/Dockerfile.rpmbuild @@ -39,11 +39,6 @@ RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then @IF [ -n "$M_dnsdist$M_all" ] -# remove --enablerepo=epel-testing when new re2 lands -RUN touch /var/lib/rpm/* && if $(grep -q 'release 9' /etc/redhat-release); then \ - dnf install -y re2 re2-devel --enablerepo=epel-testing; \ - fi - # --allowerasing does not exist on el7, so we fall back to just installing # this is fine because --allowerasing is only there to deal with libcurl conflicting with libcurl-minimal on some el9 images RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \ -- 2.47.2