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 2021/01/29 12:42:56 UTC
svn commit: r1886015 - in /httpd/httpd/trunk/test:
travis_Dockerfile_slapd.centos7 travis_before_linux.sh
Author: jorton
Date: Fri Jan 29 12:42:56 2021
New Revision: 1886015
URL: http://svn.apache.org/viewvc?rev=1886015&view=rev
Log:
Update Travis LDAP testing to use a CentOS based container, pulled
from quay.io, to avoid the new Docker hub pull rate-limiting which
is causing intermittent failures.
Submitted by: jorton, Lubos Uhliarik <luhliari redhat.com>
Github: closes #167
Added:
httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos7
Modified:
httpd/httpd/trunk/test/travis_before_linux.sh
Added: httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos7
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos7?rev=1886015&view=auto
==============================================================================
--- httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos7 (added)
+++ httpd/httpd/trunk/test/travis_Dockerfile_slapd.centos7 Fri Jan 29 12:42:56 2021
@@ -0,0 +1,5 @@
+FROM quay.io/centos/centos:7
+RUN yum install -y yum-utils && \
+ yum install -y openldap openldap-clients openldap-servers openldap-devel && \
+ yum -y clean all --enablerepo='*'
+CMD /usr/sbin/slapd -u ldap -d1 '-h ldap:// ldapi:///'
Modified: httpd/httpd/trunk/test/travis_before_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_before_linux.sh?rev=1886015&r1=1886014&r2=1886015&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_before_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_before_linux.sh Fri Jan 29 12:42:56 2021
@@ -98,7 +98,7 @@ fi
# For LDAP testing, run slapd listening on port 8389 and populate the
# directory as described in t/modules/ldap.t in the test framework:
if test -v TEST_LDAP -a -x test/perl-framework/scripts/ldap-init.sh; then
- docker build -t httpd_ldap -f test/travis_Dockerfile_slapd test/
+ docker build -t httpd_ldap -f test/travis_Dockerfile_slapd.centos7 test/
pushd test/perl-framework
./scripts/ldap-init.sh
popd