Skip to content

Commit 444f2da

Browse files
committed
Adding PHP 7.4 and making 7.2 default
As far as 3.9 is going to require 7.2, let's make it the default.
1 parent 8f46ad9 commit 444f2da

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ You can change the configuration of the docker images by setting various environ
125125
|-------------------------------------------|-----------|---------------------------------------|---------------|------------------------------------------------------------------------------|
126126
| `MOODLE_DOCKER_DB` | yes | pgsql, mariadb, mysql, mssql, oracle | none | The database server to run against |
127127
| `MOODLE_DOCKER_WWWROOT` | yes | path on your file system | none | The path to the Moodle codebase you intend to test |
128-
| `MOODLE_DOCKER_PHP_VERSION` | no | 7.3, 7.2, 7.1, 7.0, 5.6 | 7.1 | The php version to use |
128+
| `MOODLE_DOCKER_PHP_VERSION` | no | 7.4, 7.3, 7.2, 7.1, 7.0, 5.6 | 7.2 | The php version to use |
129129
| `MOODLE_DOCKER_BROWSER` | no | firefox, chrome | firefox | The browser to run Behat against |
130130
| `MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES` | no | any value | not set | If set, dependencies for memcached, redis, solr, and openldap are added |
131131
| `MOODLE_DOCKER_WEB_HOST` | no | any valid hostname | localhost | The hostname for web |

bin/moodle-docker-compose

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dockercompose="docker-compose -f ${basedir}/base.yml"
2929
dockercompose="${dockercompose} -f ${basedir}/service.mail.yml"
3030

3131
# PHP Version.
32-
export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-7.1}
32+
export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-7.2}
3333

3434
# Database flavour
3535
if [ "$MOODLE_DOCKER_DB" != 'pgsql' ];

bin/moodle-docker-compose.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SET DOCKERCOMPOSE=docker-compose -f "%BASEDIR%\base.yml"
2222
SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\service.mail.yml"
2323

2424
IF "%MOODLE_DOCKER_PHP_VERSION%"=="" (
25-
SET MOODLE_DOCKER_PHP_VERSION=7.1
25+
SET MOODLE_DOCKER_PHP_VERSION=7.2
2626
)
2727

2828
IF NOT "%MOODLE_DOCKER_DB%"=="pgsql" (

0 commit comments

Comments
 (0)