From bdd21c82ea69f8334b7a7b2cfcc28bc5fb3740d9 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 29 Jan 2021 12:42:56 +0000 Subject: 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 Github: closes #167 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1886015 13f79535-47bb-0310-9956-ffa450edef68 --- test/travis_Dockerfile_slapd.centos7 | 5 +++++ test/travis_before_linux.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 test/travis_Dockerfile_slapd.centos7 diff --git a/test/travis_Dockerfile_slapd.centos7 b/test/travis_Dockerfile_slapd.centos7 new file mode 100644 index 0000000000..85bcf0aa08 --- /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 3ccc0e7282..61e844f6b7 100755 --- 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 -- cgit v1.2.3