Merge pull request #66 from abias/localhost-only

Add env variables to control the ip address a port binds to

Author: stronk7

README.md

@@ -132,8 +132,8 @@ You can change the configuration of the docker images by setting various environ
 | `MOODLE_DOCKER_BROWSER`                   | no        | firefox, chrome                       | firefox       | The browser to run Behat against                                             |
 | `MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES` | no        | any value                             | not set       | If set, dependencies for memcached, redis, solr, and openldap are added      |
 | `MOODLE_DOCKER_WEB_HOST`                  | no        | any valid hostname                    | localhost     | The hostname for web                                |
-| `MOODLE_DOCKER_WEB_PORT`                  | no        | any integer value                     | 8000          | The port number for web. If set to 0, no port is used                        |
-| `MOODLE_DOCKER_SELENIUM_VNC_PORT`         | no        | any integer value                     | not set       | If set, the selenium node will expose a vnc session on the port specified    |
+| `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 |
 
 ## Advanced usage
 

bin/moodle-docker-compose

@@ -50,11 +50,16 @@ then
     dockercompose="${dockercompose} -f ${basedir}/selenium.${MOODLE_DOCKER_BROWSER}.yml"
 fi
 
-if [[ -z "$MOODLE_DOCKER_SELENIUM_VNC_PORT" ]]
+# Selenium VNC port
+export MOODLE_DOCKER_SELENIUM_SUFFIX=""
+if [[ $MOODLE_DOCKER_SELENIUM_VNC_PORT == *":"* ]] || [[ $MOODLE_DOCKER_SELENIUM_VNC_PORT -gt 0 ]]
 then
-    export MOODLE_DOCKER_SELENIUM_SUFFIX=""
-else
     export MOODLE_DOCKER_SELENIUM_SUFFIX="-debug"
+    # If no bind ip has been configured (bind_ip:port), default to 127.0.0.1
+    if [[ ! $MOODLE_DOCKER_SELENIUM_VNC_PORT == *":"* ]]
+    then
+        MOODLE_DOCKER_SELENIUM_VNC_PORT=127.0.0.1:$MOODLE_DOCKER_SELENIUM_VNC_PORT
+    fi
     dockercompose="${dockercompose} -f ${basedir}/selenium.debug.yml"
 fi
 
@@ -69,8 +74,13 @@ export MOODLE_DOCKER_WEB_HOST=${MOODLE_DOCKER_WEB_HOST:-localhost}
 
 # Webserver port
 export MOODLE_DOCKER_WEB_PORT=${MOODLE_DOCKER_WEB_PORT:-8000}
-if [[ $MOODLE_DOCKER_WEB_PORT -gt 0 ]]
+if [[ $MOODLE_DOCKER_WEB_PORT == *":"* ]] || [[ $MOODLE_DOCKER_WEB_PORT -gt 0 ]]
 then
+    # If no bind ip has been configured (bind_ip:port), default to 127.0.0.1
+    if [[ ! $MOODLE_DOCKER_WEB_PORT == *":"* ]]
+    then
+        MOODLE_DOCKER_WEB_PORT=127.0.0.1:$MOODLE_DOCKER_WEB_PORT
+    fi
     dockercompose="${dockercompose} -f ${basedir}/webserver.port.yml"
 fi
 

bin/moodle-docker-compose.cmd

@@ -52,15 +52,31 @@ IF "%MOODLE_DOCKER_WEB_PORT%"=="" (
     SET MOODLE_DOCKER_WEB_PORT=8000
 )
 
-IF NOT "%MOODLE_DOCKER_WEB_PORT%"=="0" (
+SET "TRUE="
+IF NOT "%MOODLE_DOCKER_WEB_PORT%"=="%MOODLE_DOCKER_WEB_PORT::=%" SET TRUE=1
+IF NOT "%MOODLE_DOCKER_WEB_PORT%"=="0" SET TRUE=1
+IF DEFINED TRUE (
+    REM If no bind ip has been configured (bind_ip:port), default to 127.0.0.1
+    IF "%MOODLE_DOCKER_WEB_PORT%"=="%MOODLE_DOCKER_WEB_PORT::=%" (
+        SET MOODLE_DOCKER_WEB_PORT=127.0.0.1:%MOODLE_DOCKER_WEB_PORT%
+    )
     SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\webserver.port.yml"
 )
 
 IF "%MOODLE_DOCKER_SELENIUM_VNC_PORT%"=="" (
     SET MOODLE_DOCKER_SELENIUM_SUFFIX=
 ) ELSE (
-    SET MOODLE_DOCKER_SELENIUM_SUFFIX=-debug
-    SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\selenium.debug.yml"
+    SET "TRUE="
+    IF NOT "%MOODLE_DOCKER_SELENIUM_VNC_PORT%"=="%MOODLE_DOCKER_SELENIUM_VNC_PORT::=%" SET TRUE=1
+    IF NOT "%MOODLE_DOCKER_SELENIUM_VNC_PORT%"=="0" SET TRUE=1
+    IF DEFINED TRUE (
+        SET MOODLE_DOCKER_SELENIUM_SUFFIX=-debug
+        SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\selenium.debug.yml"
+        REM If no bind ip has been configured (bind_ip:port), default to 127.0.0.1
+        IF "%MOODLE_DOCKER_SELENIUM_VNC_PORT%"=="%MOODLE_DOCKER_SELENIUM_VNC_PORT::=%" (
+            SET MOODLE_DOCKER_SELENIUM_VNC_PORT=127.0.0.1:%MOODLE_DOCKER_SELENIUM_VNC_PORT%
+        )
+    )
 )
 
 %DOCKERCOMPOSE% %*

config.docker-template.php

@@ -20,7 +20,12 @@
 $CFG->wwwroot   = "http://{$host}";
 $port = getenv('MOODLE_DOCKER_WEB_PORT');
 if (!empty($port)) {
-    $CFG->wwwroot .= ":{$port}";
+    // Extract port in case the format is bind_ip:port.
+    $parts = explode(':', $port);
+    $port = end($parts);
+    if ((string)(int)$port === (string)$port) { // Only if it's int value.
+        $CFG->wwwroot .= ":{$port}";
+    }
 }
 $CFG->dataroot  = '/var/www/moodledata';
 $CFG->admin     = 'admin';