Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase Moodle 5.0 requirements #309

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Increase Moodle 5.0 requirements #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ jobs:
include:
# PostgreSQL (highest, lowest php supported)
- { branch: main, php: "8.3", database: pgsql, browser: chrome, suite: behat }
- { branch: main, php: "8.1", database: pgsql, browser: firefox, suite: behat }
- { branch: main, php: "8.2", database: pgsql, browser: firefox, suite: behat }
- { branch: MOODLE_405_STABLE, php: "8.3", database: pgsql, browser: chrome, suite: behat }
- { branch: MOODLE_405_STABLE, php: "8.1", database: pgsql, browser: firefox, suite: behat }
- { branch: MOODLE_404_STABLE, php: "8.3", database: pgsql, browser: chrome, suite: behat }
- { branch: MOODLE_404_STABLE, php: "8.1", database: pgsql, browser: firefox, suite: behat }
- { branch: MOODLE_403_STABLE, php: "8.2", database: pgsql, browser: chrome, suite: behat }
Expand All @@ -156,7 +158,8 @@ jobs:
- { branch: MOODLE_39_STABLE, php: "7.4", database: pgsql, browser: chrome, suite: behat }
- { branch: MOODLE_39_STABLE, php: "7.2", database: pgsql, browser: firefox, suite: behat }
# MariaDB (lowest php supported)
- { branch: main, php: "8.1", database: mariadb, browser: chrome, suite: behat }
- { branch: main, php: "8.2", database: mariadb, browser: chrome, suite: behat }
- { branch: MOODLE_405_STABLE, php: "8.1", database: mariadb, browser: firefox, suite: behat }
- { branch: MOODLE_404_STABLE, php: "8.1", database: mariadb, browser: firefox, suite: behat }
- { branch: MOODLE_403_STABLE, php: "8.0", database: mariadb, browser: firefox, suite: behat }
- { branch: MOODLE_402_STABLE, php: "8.0", database: mariadb, browser: firefox, suite: behat }
Expand All @@ -167,6 +170,7 @@ jobs:
- { branch: MOODLE_39_STABLE, php: "7.2", database: mariadb, browser: chrome, suite: behat }
# Other databases (highest php supported")
- { branch: main, php: "8.3", database: mssql, browser: firefox, suite: behat }
- { branch: MOODLE_405_STABLE, php: "8.3", database: mssql, browser: chrome, suite: behat }
- { branch: MOODLE_404_STABLE, php: "8.3", database: mssql, browser: chrome, suite: behat }
- { branch: MOODLE_403_STABLE, php: "8.2", database: mssql, browser: chrome, suite: behat }
- { branch: MOODLE_402_STABLE, php: "8.2", database: mssql, browser: chrome, suite: behat }
Expand All @@ -176,6 +180,7 @@ jobs:
- { branch: MOODLE_310_STABLE, php: "7.4", database: mssql, browser: chrome, suite: behat }
- { branch: MOODLE_39_STABLE, php: "7.4", database: mssql, browser: firefox, suite: behat }
- { branch: main, php: "8.3", database: mysql, browser: chrome, suite: behat }
- { branch: MOODLE_405_STABLE, php: "8.3", database: mysql, browser: firefox, suite: behat }
- { branch: MOODLE_404_STABLE, php: "8.3", database: mysql, browser: firefox, suite: behat }
- { branch: MOODLE_403_STABLE, php: "8.2", database: mysql, browser: firefox, suite: behat }
- { branch: MOODLE_402_STABLE, php: "8.2", database: mysql, browser: firefox, suite: behat }
Expand All @@ -185,6 +190,7 @@ jobs:
- { branch: MOODLE_310_STABLE, php: "7.4", database: mysql, browser: firefox, suite: behat }
- { branch: MOODLE_39_STABLE, php: "7.4", database: mysql, browser: chrome, suite: behat }
- { branch: main, php: "8.3", database: oracle, browser: firefox, suite: behat }
- { branch: MOODLE_405_STABLE, php: "8.3", database: oracle, browser: chrome, suite: behat }
- { branch: MOODLE_404_STABLE, php: "8.3", database: oracle, browser: chrome, suite: behat }
- { branch: MOODLE_403_STABLE, php: "8.2", database: oracle, browser: chrome, suite: behat }
- { branch: MOODLE_402_STABLE, php: "8.2", database: oracle, browser: chrome, suite: behat }
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,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 <br/>pgsql: 13 <br/>mariadb: 10.7 <br/>mssql: 2017-latest <br/>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.1 | 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.2 | The php version to use |
| `MOODLE_DOCKER_BROWSER` | no | firefox, chrome, firefox:&lt;tag&gt;, chrome:&lt;tag&gt; | 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 |
Expand Down
2 changes: 1 addition & 1 deletion bin/moodle-docker-compose
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1}
export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-8.2}

# Database flavour.
dockercompose="${dockercompose} -f ${basedir}/db.${MOODLE_DOCKER_DB}.yml"
Expand Down
2 changes: 1 addition & 1 deletion bin/moodle-docker-compose.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
SET MOODLE_DOCKER_PHP_VERSION=8.2
)

SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\db.%MOODLE_DOCKER_DB%.yml"
Expand Down
2 changes: 1 addition & 1 deletion db.mariadb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
MOODLE_DOCKER_DBTYPE: mariadb
MOODLE_DOCKER_DBCOLLATION: utf8mb4_bin
db:
image: mariadb:${MOODLE_DOCKER_DB_VERSION:-10.7}
image: mariadb:${MOODLE_DOCKER_DB_VERSION:-10.11}
command: >
--character-set-server=utf8mb4
--collation-server=utf8mb4_bin
Expand Down
2 changes: 1 addition & 1 deletion db.mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
MOODLE_DOCKER_DBTYPE: mysqli
MOODLE_DOCKER_DBCOLLATION: utf8mb4_bin
db:
image: mysql:${MOODLE_DOCKER_DB_VERSION:-8.0}
image: mysql:${MOODLE_DOCKER_DB_VERSION:-8.4}
command: >
--character-set-server=utf8mb4
--collation-server=utf8mb4_bin
Expand Down
2 changes: 1 addition & 1 deletion db.pgsql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
environment:
MOODLE_DOCKER_DBTYPE: pgsql
db:
image: postgres:${MOODLE_DOCKER_DB_VERSION:-13}
image: postgres:${MOODLE_DOCKER_DB_VERSION:-14}
environment:
POSTGRES_USER: moodle
POSTGRES_PASSWORD: "m@0dl3ing"
Expand Down
Loading