From: Peter van Dijk Date: Sun, 17 Jul 2022 20:25:16 +0000 (+0200) Subject: el9: remove epel-testing, new re2 is in epel9 stable now X-Git-Tag: auth-4.8.0-alpha0~10^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F11793%2Fhead;p=thirdparty%2Fpdns.git el9: remove epel-testing, new re2 is in epel9 stable now --- 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 && \