Improved variable names for the Moodle App

Author: NeillM

.travis.yml

@@ -65,7 +65,7 @@ install:
     - export MOODLE_DOCKER_BROWSER=$BROWSER
     - export MOODLE_DOCKER_WWWROOT="$HOME/moodle"
     - export MOODLE_DOCKER_PHP_VERSION=$PHP
-    - export MOODLE_MOBILE_VERSION=$MOBILE
+    - export MOODLE_APP_VERSION=$MOBILE
 before_script:
     - tests/setup.sh
 script:

README.md

@@ -134,7 +134,7 @@ You can change the configuration of the docker images by setting various environ
 | `MOODLE_DOCKER_WEB_HOST`                  | no        | any valid hostname                    | localhost     | The hostname for web                                |
 | `MOODLE_DOCKER_WEB_PORT`                  | no        | any integer value (or bind_ip:integer)| 127.0.0.1:8000| The port number for web. If set to 0, no port is used.<br/>If you want to bind to any host IP different from the default 127.0.0.1, you can specify it with the bind_ip:port format (0.0.0.0 means bind to all) |
 | `MOODLE_DOCKER_SELENIUM_VNC_PORT`         | no        | any integer value (or bind_ip:integer)| not set       | If set, the selenium node will expose a vnc session on the port specified. Similar to MOODLE_DOCKER_WEB_PORT, you can optionally define the host IP to bind to. If you just set the port, VNC binds to 127.0.0.1 |
-| `MOODLE_MOBILE_VERSION`                   | no        | next, latest, or an app version number| not set       | If set will start an instance of the Mmodle app if the chrome browser is selected |
+| `MOODLE_APP_VERSION`                      | no        | next, latest, or an app version number| not set       | If set will start an instance of the Mmodle app if the chrome browser is selected |
 
 ## Advanced usage
 

bin/moodle-docker-compose

@@ -45,7 +45,7 @@ if [ -f $filename ]; then
 fi
 
 # Mobile app
-if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" == "chrome" ]] && [[ ! -z "$MOODLE_MOBILE_VERSION" ]];
+if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" == "chrome" ]] && [[ ! -z "$MOODLE_APP_VERSION" ]];
 then
     dockercompose="${dockercompose} -f ${basedir}/moodle-app.yml"
 fi

bin/moodle-docker-compose.cmd

@@ -35,7 +35,7 @@ if exist %filename% (
 )
 
 IF "%MOODLE_DOCKER_BROWSER%"=="chrome" (
-    IF NOT "%MOODLE_MOBILE_VERSION%"=="" (
+    IF NOT "%MOODLE_APP_VERSION%"=="" (
         SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\moodle-app.yml"
     )
 )

bin/moodle-docker-wait-for-app

@@ -3,9 +3,9 @@ set -e
 
 basedir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
 
-if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" == "chrome" ]] && [[ ! -z "$MOODLE_MOBILE_VERSION" ]];
+if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" == "chrome" ]] && [[ ! -z "$MOODLE_APP_VERSION" ]];
 then
-    until $basedir/bin/moodle-docker-compose logs mobileapp | grep -q 'dev server running: ';
+    until $basedir/bin/moodle-docker-compose logs moodleapp | grep -q 'dev server running: ';
     do
         echo 'Waiting for Moodle app to come up...'
         sleep 15

config.docker-template.php

@@ -58,7 +58,7 @@
 
 define('PHPUNIT_LONGTEST', true);
 
-if (getenv('MOODLE_DOCKER_MOBILE')) {
+if (getenv('MOODLE_DOCKER_APP')) {
     $CFG->behat_ionic_wwwroot = 'http://mobileapp:8100';
 }
 

moodle-app.yml

@@ -2,6 +2,6 @@ version: "2"
 services:
   webserver:
     environment:
-      MOODLE_DOCKER_MOBILE: "true"
-  mobileapp:
-    image: "moodlehq/moodleapp:${MOODLE_MOBILE_VERSION}"
+      MOODLE_DOCKER_APP: "true"
+  moodleapp:
+    image: "moodlehq/moodleapp:${MOODLE_APP_VERSION}"