Skip to content
This repository has been archived by the owner on Aug 31, 2024. It is now read-only.

Commit

Permalink
add support for chromium needed for arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
@skodak
skodak committed Aug 20, 2024
1 parent 6a5144c commit 3f144d5
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 4 deletions.
12 changes: 9 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ This repository contains Docker configuration aimed at Moodle developers and tes
* [Docker](https://docs.docker.com) and [Docker Compose](https://docs.docker.com/compose/cli-command/#installing-compose-v2) installed if your Docker CLI version does not support `docker compose` command.
* It's recommended to always run the latest versions of each, but at the minimum Docker v20.10.15 and Docker Compose v2.5.0 should be used.
* 3.25GB of RAM (if you choose [Microsoft SQL Server](https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-setup#prerequisites) as db server)
* When using _Docker for Mac_ you should use _gRPC FUSE_ as file sharing implementation, because _VirtioFS_ is still buggy.

## Quick start

Expand Down Expand Up @@ -150,6 +149,13 @@ mdc exec webserver php -d pcov.enabled=1 -d pcov.directory=. vendor/bin/phpunit

## Use docker for running Behat tests

NOTE: On Macs with M processor configure MDC to use Chromium browser instead of Chrome.

```
# Specifies Chromium to be used in behat
MOODLE_DOCKER_BROWSER=chromium:4.23.1
```

To initialise the Behat test environment execute `behat-init` script:

```bash
Expand Down Expand Up @@ -303,9 +309,9 @@ first call `mdc-down`, then update the environment file and finally start the co
| `MOODLE_DOCKER_WWWROOT` | no | path on your file system | current directory if ./_moodle-docker.env_ file exists | 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.0 | 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_BROWSER` | no | firefox, chrome, chromium 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 |
| `MOODLE_DOCKER_BBB_MOCK` | no | any value | not set | If set the BigBlueButton mock image is started and configured |
| `MOODLE_DOCKER_BEHAT_FAILDUMP` | no | Path on your file system | not set | Behat faildumps are already available at http://localhost:8000/_/faildumps/ by default, this allows for mapping a specific filesystem folder to retrieve the faildumps in bulk / automated ways |
| `MOODLE_DOCKER_PHP_ERROR_LOG` | no | Path to PHP error log on your file system | not set | |
| `MOODLE_DOCKER_BACKUPS` | no | Path to backup directory on your file system | not set | |
Expand Down
3 changes: 3 additions & 0 deletions bin/mdc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ then
elif [[ "$MOODLE_DOCKER_BROWSER_NAME" = "chrome" ]];
then
MOODLE_DOCKER_BROWSER_TAG=3
elif [[ "$MOODLE_DOCKER_BROWSER_NAME" = "chromium" ]];
then
MOODLE_DOCKER_BROWSER_TAG=4
fi
fi

Expand Down
3 changes: 3 additions & 0 deletions cmd/moodle-docker-compose.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ IF "%MOODLE_DOCKER_BROWSER_TAG%"=="" (
IF "%MOODLE_DOCKER_BROWSER_NAME%"=="chrome" (
SET MOODLE_DOCKER_BROWSER_TAG=3
)
IF "%MOODLE_DOCKER_BROWSER_NAME%"=="chromium" (
SET MOODLE_DOCKER_BROWSER_TAG=4
)
)

IF NOT "%MOODLE_DOCKER_BROWSER_NAME%"=="firefox" (
Expand Down
11 changes: 11 additions & 0 deletions selenium.chromium.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
services:
webserver:
environment:
MOODLE_DOCKER_BROWSER: chromium
selenium:
image: "selenium/standalone-chromium${MOODLE_DOCKER_SELENIUM_SUFFIX:-}:${MOODLE_DOCKER_BROWSER_TAG}"
volumes:
- /dev/shm:/dev/shm
environment:
SCREEN_WIDTH: 1600
SCREEN_HEIGHT: 1200
2 changes: 1 addition & 1 deletion templates/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
$CFG->behat_prefix = 'b_';
$CFG->behat_profiles = array(
'default' => array(
'browser' => getenv('MOODLE_DOCKER_BROWSER'),
'browser' => (getenv('MOODLE_DOCKER_BROWSER') === 'chromium') ? 'chrome' : getenv('MOODLE_DOCKER_BROWSER'),
'wd_host' => 'http://selenium:4444/wd/hub',
),
);
Expand Down

0 comments on commit 3f144d5

Please sign in to comment.