Skip to content

Commit 08a328d

Browse files
committed
Merged changes from master
1 parent c02c0f6 commit 08a328d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ script:
66
- "docker run --name test0 -d -p 8000:80 -v $PWD/tests/fixtures:/var/www/html moodle-php-apache"
77
- docker exec test0 php /var/www/html/test.php
88
- curl --fail http://127.0.0.1:8000/test.php
9+
after_failure:
10+
- docker logs test0
911
after_script:
1012
- docker rm -f test0
11-

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
A Moodle PHP environment configured for Moodle development.
44

5-
Based on <a href="https://hub.docker.com/_/php/">Official PHP Images</a> with php extensions required
6-
for all Moodle database drivers.
5+
PHP and Apache configured to serve /var/www/html/ based on [Official PHP Images](https://hub.docker.com/_/php/) with php extensions required for all Moodle database drivers and extensions.
76

87
# Versions
98

root/tmp/setup/php-extensions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ echo "Installing apt depdencies"
66

77
BUILD_PACKAGES="gettext libcurl4-openssl-dev libpq-dev libmysqlclient-dev libldap2-dev libxslt-dev \
88
libxml2-dev libicu-dev libfreetype6-dev libjpeg62-turbo-dev libmemcached-dev \
9-
zlib1g-dev libpng12-dev locales unixodbc-dev"
9+
zlib1g-dev libpng12-dev unixodbc-dev"
1010

1111
LIBS="libaio1 libcurl3 libgss3 libicu52 libmysqlclient18 libpq5 libmemcached11 libmemcachedutil2 libldap-2.4-2 libxml2 libxslt1.1 unixodbc"
1212

0 commit comments

Comments
 (0)