diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b9534cd601..cd9d5d9e2b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: include: # PostgreSQL (highest, lowest php supported) - { branch: master, php: "8.2", database: pgsql, suite: phpunit-full } # Full run only for master. - - { branch: master, php: "8.0", database: pgsql, suite: phpunit-full } + - { branch: master, php: "8.1", database: pgsql, suite: phpunit-full } - { branch: MOODLE_403_STABLE, php: "8.2", database: pgsql, suite: phpunit } # Other branches, quicker run. - { branch: MOODLE_403_STABLE, php: "8.0", database: pgsql, suite: phpunit } - { branch: MOODLE_402_STABLE, php: "8.2", database: pgsql, suite: phpunit } @@ -57,7 +57,7 @@ jobs: - { branch: MOODLE_39_STABLE, php: "7.4", database: pgsql, suite: phpunit } - { branch: MOODLE_39_STABLE, php: "7.2", database: pgsql, suite: phpunit } # MariaDB (lowest php supported) - - { branch: master, php: "8.0", database: mariadb, suite: phpunit } + - { branch: master, php: "8.1", database: mariadb, suite: phpunit } - { branch: MOODLE_403_STABLE, php: "8.0", database: mariadb, suite: phpunit } - { branch: MOODLE_402_STABLE, php: "8.0", database: mariadb, suite: phpunit } - { branch: MOODLE_401_STABLE, php: "7.4", database: mariadb, suite: phpunit } diff --git a/README.md b/README.md index 1dad089472f..fff55130ac2 100644 --- a/README.md +++ b/README.md @@ -211,7 +211,7 @@ When you change them, use `bin/moodle-docker-compose down && bin/moodle-docker-c | `MOODLE_DOCKER_DB` | yes | pgsql, mariadb, mysql, mssql, oracle | none | The database server to run against | | `MOODLE_DOCKER_WWWROOT` | yes | path on your file system | none | The path to the Moodle codebase you intend to test | | `MOODLE_DOCKER_DB_VERSION` | no | Docker tag - see relevant database page on docker-hub | mysql: 8.0
pgsql: 13
mariadb: 10.7
mssql: 2017-latest
oracle: 21| The database server docker image tag | -| `MOODLE_DOCKER_PHP_VERSION` | no | 8.1, 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6 | 8.0 | The php version to use | +| `MOODLE_DOCKER_PHP_VERSION` | no | 8.1, 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6| 8.1 | The php version to use | | `MOODLE_DOCKER_BROWSER` | no | firefox, chrome, firefox:<tag>, chrome:<tag> | firefox:3 | The browser to run Behat against. Supports a colon notation to specify a specific Selenium docker image version to use. e.g. firefox:2.53.1 can be used to run with older versions of Moodle (<3.5) | | `MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES` | no | any value | not set | If set, dependencies for memcached, redis, solr, and openldap are added | | `MOODLE_DOCKER_BBB_MOCK` | no | any value | not set | If set the BigBlueButton mock image is started and configured | diff --git a/bin/moodle-docker-compose b/bin/moodle-docker-compose index cc7e50e828f..5ae1bafaac0 100755 --- a/bin/moodle-docker-compose +++ b/bin/moodle-docker-compose @@ -33,7 +33,7 @@ dockercompose="${dockercompose} -f ${basedir}/base.yml" dockercompose="${dockercompose} -f ${basedir}/service.mail.yml" # PHP Version. -export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-8.0} +export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-8.1} # Database flavour. dockercompose="${dockercompose} -f ${basedir}/db.${MOODLE_DOCKER_DB}.yml" diff --git a/bin/moodle-docker-compose.cmd b/bin/moodle-docker-compose.cmd index 35fc8b30b43..6db20cc944d 100644 --- a/bin/moodle-docker-compose.cmd +++ b/bin/moodle-docker-compose.cmd @@ -22,7 +22,7 @@ SET DOCKERCOMPOSE=docker-compose -f "%BASEDIR%\base.yml" SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\service.mail.yml" IF "%MOODLE_DOCKER_PHP_VERSION%"=="" ( - SET MOODLE_DOCKER_PHP_VERSION=8.0 + SET MOODLE_DOCKER_PHP_VERSION=8.1 ) SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\db.%MOODLE_DOCKER_DB%.yml"