diff options
| author | Joe Orton <jorton@apache.org> | 2021-01-29 13:42:56 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2021-01-29 13:42:56 +0100 |
| commit | bdd21c82ea69f8334b7a7b2cfcc28bc5fb3740d9 (patch) | |
| tree | 38ed36d623c894715a193572d20b2a72e0f3004b | |
| parent | * Add lognumber (diff) | |
| download | apache2-bdd21c82ea69f8334b7a7b2cfcc28bc5fb3740d9.tar.xz apache2-bdd21c82ea69f8334b7a7b2cfcc28bc5fb3740d9.zip | |
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/trunk@1886015 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | test/travis_Dockerfile_slapd.centos7 | 5 | ||||
| -rwxr-xr-x | test/travis_before_linux.sh | 2 |
2 files changed, 6 insertions, 1 deletions
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 |