Merge r1886015 from trunk: (Travis RTC exception)

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1889011 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/travis_Dockerfile_slapd.centos7 b/test/travis_Dockerfile_slapd.centos7
new file mode 100644 (file)
index 0000000..85bcf0a
--- /dev/null
+++ b/test/travis_Dockerfile_slapd.centos7
@@ -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:///'

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 3ccc0e7282b160393d61e88006732a2e72c6978d..61e844f6b76b4124d473c8d052ab0ac8c6ca016f 100755 (executable)
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -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