From: Joe Orton Date: Fri, 31 Jan 2025 14:38:37 +0000 (+0000) Subject: Merge r1923479 from trunk: X-Git-Tag: 2.4.64-rc1-candidate~106 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=347d7b390fbae9632adb2dd66486023fb2f599a0;p=thirdparty%2Fapache%2Fhttpd.git Merge r1923479 from trunk: CI: Try to cope with CentOS Stream containers being out-of-sync with the yum repos when building the slapd container. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923480 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/test/travis_Dockerfile_slapd.centos b/test/travis_Dockerfile_slapd.centos index 713e5de507..921927733d 100644 --- a/test/travis_Dockerfile_slapd.centos +++ b/test/travis_Dockerfile_slapd.centos @@ -1,5 +1,5 @@ FROM quay.io/centos/centos:stream9 -RUN dnf install -y epel-release && \ - dnf install -y openldap openldap-clients openldap-servers openldap-devel && \ - dnf -y clean all --enablerepo='*' +RUN rpm -q openldap-servers || (dnf install --refresh -y epel-release && \ + dnf install --nobest -y openldap-clients openldap-servers openldap-devel && \ + dnf -y clean all --enablerepo='*') CMD /usr/sbin/slapd -u ldap -d1 '-h ldap:// ldapi:///'