You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2025/01/31 14:28:57 UTC

svn commit: r1923479 - /httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos

Author: jorton
Date: Fri Jan 31 14:28:57 2025
New Revision: 1923479

URL: http://svn.apache.org/viewvc?rev=1923479&view=rev
Log:
CI: Try to cope with CentOS Stream containers being out-of-sync with
the yum repos when building the slapd container. [skip ci]

Modified:
    httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos

Modified: httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos?rev=1923479&r1=1923478&r2=1923479&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos (original)
+++ httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos Fri Jan 31 14:28:57 2025
@@ -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:///'