From 11d637bf528c1a53e571142e5b28ae34d3d727bc Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sat, 11 May 2019 03:14:58 +0200 Subject: [PATCH 1/2] Versions cleanup - only show own version in branches. - link to master. --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1a4f5fe..ce29bb5 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,13 @@ A Moodle PHP environment configured for Moodle development based on [Official PHP Images](https://hub.docker.com/_/php/). -### Versions +### Version | PHP Version | Variant | Tags | Status | |--------------|---------|------------------|--------| | PHP 7.1 | Stretch | 7.1, 7.1-stretch | [![Build Status](https://travis-ci.org/moodlehq/moodle-php-apache.svg?branch=7.1-stretch)](https://travis-ci.org/moodlehq/moodle-php-apache)| -| PHP 7.0 | Stretch | 7.0, 7.0-stretch | [![Build Status](https://travis-ci.org/moodlehq/moodle-php-apache.svg?branch=7.0-stretch)](https://travis-ci.org/moodlehq/moodle-php-apache)| -| PHP 5.6 | Stretch | 5.6, 5.6-stretch | [![Build Status](https://travis-ci.org/moodlehq/moodle-php-apache.svg?branch=5.6-stretch)](https://travis-ci.org/moodlehq/moodle-php-apache)| -| PHP 7.1 | Jessie | 7.1-jessie | [![Build Status](https://travis-ci.org/moodlehq/moodle-php-apache.svg?branch=7.1-jessie)](https://travis-ci.org/moodlehq/moodle-php-apache)| -| PHP 7.0 | Jessie | 7.0-jessie | [![Build Status](https://travis-ci.org/moodlehq/moodle-php-apache.svg?branch=7.0-jessie)](https://travis-ci.org/moodlehq/moodle-php-apache)| -| PHP 5.6 | Jessie | 5.6-jessie | [![Build Status](https://travis-ci.org/moodlehq/moodle-php-apache.svg?branch=5.6-jessie)](https://travis-ci.org/moodlehq/moodle-php-apache)| + +For a complete list of supported versions, look to the [master README](https://github.com/moodlehq/moodle-php-apache/tree/master). # Example usage The following command will expose the current working directory on port 8080: From b302d351d41a6e13a3a3cb8a3b144347eb47ef2d Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sat, 11 May 2019 18:02:57 +0200 Subject: [PATCH 2/2] Latest changes to keep stretch 7.1 building - lock sqlsrv version. --- root/tmp/setup/php-extensions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index e888fe0..5406b44 100755 --- a/root/tmp/setup/php-extensions.sh +++ b/root/tmp/setup/php-extensions.sh @@ -70,7 +70,7 @@ curl https://packages.microsoft.com/config/debian/9/prod.list -o /etc/apt/source apt-get update ACCEPT_EULA=Y apt-get install -y msodbcsql17 -pecl install sqlsrv +pecl install sqlsrv-5.6.1 docker-php-ext-enable sqlsrv # Keep our image size down..