Adding small script to check the Grid status, plus docs for HEALTHCHECK, fixes #691

Author: diemol

.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,11 @@
 ## Meta -
+
+<!-- Please fill out the whole template so we have enough information to help you fix 
+ the issue as fast as possible. -->
+
+<!-- If the template is not complete or deleted, we might close the issue right away 
+ since we will lack the needed information to troubleshoot it. -->
+
 Image(s):  
 <!-- node-chrome? hub? standalone-firefox? -->
 Docker-Selenium Image Version(s):  
@@ -21,3 +28,9 @@ https://bugzilla.mozilla.org/buglist.cgi?product=Testing&component=Marionette
 ## Expected Behavior -
 
 ## Actual Behavior -
+
+## Steps to reproduce -
+<!--
+Please be sure to include an SSCCE (Short, Self Contained, Correct [compilable] example) http://sscce.org/
+If you can't provide a link to the page, consider creating a reproducible page on https://jsfiddle.net/
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1 +1,5 @@
+<!-- Thanks for sending us a PR to improve this project! If you are adding a 
+feature or fixing a bug, and this needs more documentation, please add it to your PR. -->
+
+
 - [ ] By placing an `X` in the preceding checkbox, I verify that I have signed the [Contributor License Agreement](https://github.com/SeleniumHQ/docker-selenium/blob/master/CONTRIBUTING.md#contributing-code-to-selenium)

Base/Dockerfile

@@ -25,6 +25,8 @@ RUN apt-get -qqy update \
     sudo \
     unzip \
     wget \
+    jq \
+    curl \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
   && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security
 
@@ -54,8 +56,9 @@ RUN  mkdir -p /opt/bin
 #======================================
 # Add intermediate service discovery
 #======================================
-COPY wait-for-it.sh \
+COPY check-grid.sh \
        /opt/bin/
+RUN chmod +x /opt/bin/check-grid.sh
 
 #===================================================
 # Run the following commands as non-privileged user

Base/check-grid.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# check-grid.sh
+
+set -e
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        --host)
+        HOST="$2"
+        if [[ ${HOST} == "" ]]; then HOST="localhost"; fi
+        shift 2
+        ;;
+        --port)
+        PORT="$2"
+        if [[ ${PORT} == "" ]]; then PORT="4444"; fi
+        shift 2
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        ;;
+    esac
+done
+
+curl -sSL http://${HOST}:${PORT}/wd/hub/status | jq -r '.value.ready' | grep "true" || exit 1

Base/wait-for-it.sh

@@ -30,9 +30,7 @@ ENV GRID_HUB_HOST "0.0.0.0"
 COPY generate_config \
     entry_point.sh \
     /opt/bin/
-# Running this command as sudo just to avoid the message:
-# To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
-# When logging into the container
+
 RUN /opt/bin/generate_config > /opt/selenium/config.json
 
 CMD ["/opt/bin/entry_point.sh"]

Hub/Dockerfile.txt

@@ -25,7 +25,5 @@ java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!
 
-/opt/bin/wait-for-it.sh -h 127.0.0.1 -p $GRID_HUB_PORT -t 30 -- echo "Hub is up and running."
-
 trap shutdown SIGTERM SIGINT
 wait $NODE_PID

Hub/entry_point.sh

@@ -46,8 +46,6 @@ SERVERNUM=$(get_server_num)
 
 rm -f /tmp/.X*lock
 
-/opt/bin/wait-for-it.sh -h $HUB_PORT_4444_TCP_ADDR -p $HUB_PORT_4444_TCP_PORT -t 30 -s -- echo "Hub is ready for connections"
-
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
@@ -57,7 +55,5 @@ xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR"
     ${SE_OPTS} &
 NODE_PID=$!
 
-/opt/bin/wait-for-it.sh -h 127.0.0.1 -p $NODE_PORT -t 30 -s -- echo "Node is up."
-
 trap shutdown SIGTERM SIGINT
 wait $NODE_PID

NodeBase/entry_point.sh

@@ -269,6 +269,102 @@ $ FF=$(docker run --rm --name=fx \
 
 _Note: Since a Docker container is not meant to preserve state and spawning a new one takes less than 3 seconds you will likely want to remove containers after each end-to-end test with_ `--rm` _command. You need to think of your Docker containers as single processes, not as running virtual machines, in case you are familiar with [Vagrant](https://www.vagrantup.com/)._
 
+## Waiting for the Grid to be ready
+
+It is a good practice to check first if the Grid is up and ready to receive requests, this can be done by checking the `/wd/hub/status` endpoint.
+
+A Grid that is ready, composed by a hub and a node, could look like this:
+
+```json
+{
+  "status": 0,
+  "value": {
+    "ready": true,
+    "message": "Hub has capacity",
+    "build": {
+      "revision": "aacccce0",
+      "time": "2018-08-02T20:13:22.693Z",
+      "version": "3.14.0"
+    },
+    "os": {
+      "arch": "amd64",
+      "name": "Linux",
+      "version": "4.9.93-linuxkit-aufs"
+    },
+    "java": {
+      "version": "1.8.0_181"
+    }
+  }
+}
+```
+
+The `"ready": true` value indicates that the Grid is ready to receive requests. This status can be polled through a 
+script before running any test, or it can be added as a [HEALTHCHECK](https://docs.docker.com/engine/reference/run/#healthcheck)
+when the docker container is started.
+
+### Adding a [HEALTHCHECK](https://docs.docker.com/engine/reference/run/#healthcheck) to the Grid
+
+The script [check-grid.sh](Base/check-grid.sh), which is included in the images, can be used to poll the Grid status.
+
+This example checks the status of the Grid every 15 seconds, with has a timeout of 30 seconds when the check is done,
+and it retries up to 5 times until the container is marked as unhealthy. Please use values that adjust to your needs,
+additionally (if needed) replace the `--host` and `--port` parameters for the ones you have in your configuration.
+
+``` bash
+$ docker network create grid
+$ docker run -d -p 4444:4444 --net grid --name selenium-hub \
+    --health-cmd='/opt/bin/check-grid.sh --host 0.0.0.0 --port 4444' \
+    --health-interval=15s --health-timeout=30s --health-retries=5 \
+    selenium/hub:3.14.0-arsenic
+$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-chrome:3.14.0-arsenic
+$ docker run -d --net grid -e HUB_HOST=selenium-hub -v /dev/shm:/dev/shm selenium/node-firefox:3.14.0-arsenic
+```
+**Note:** The `\` line delimiter won't work on Windows based terminals, try either `^` or `\``.
+
+The container health status can be checked by doing `docker ps` and verifying the `(healthy)|(unhealthy)` status or by
+inspecting it in the following way:
+
+```bash
+$ docker inspect --format='{{json .State.Health.Status}}' selenium-hub
+"healthy"
+```
+
+### Using a bash script to wait for the Grid
+
+A common problem known in docker is that a running container does not always mean that the application inside it is ready.
+A simple way to tackle this is by using a "wait-for-it" script, more information can be seen [here](https://docs.docker.com/compose/startup-order/).
+
+The following script is an example of how this can be done using bash, but the same principle applies if you want to do this in a method implemented
+in the programming language used to run the tests.
+
+```bash
+#!/bin/bash
+# wait-for-grid.sh
+
+set -e
+
+cmd="$@"
+
+while ! curl -sSL "http://localhost:4444/wd/hub/status" 2>&1 \
+        | jq -r '.value.ready' 2>&1 | grep "true" >/dev/null; do
+    echo 'Waiting for the Grid'
+    sleep 1
+done
+
+>&2 echo "Selenium Grid is up - executing tests"
+exec $cmd
+```
+**Note:** If needed, replace `localhost` and `4444` for the correct values in your environment. Also, this script is polling indefinitely, you might want
+to teak it and establish a timeout. 
+
+Let's say that the normal command to execute your tests is `mvn clean test`. Here is a way to use the above script and execute your tests:
+
+```bash
+$ ./wait-for-grid.sh mvn clean test
+```
+
+Like this, the script will poll until the Grid is ready, and then your tests will start. 
+
 ## Debugging
 
 In the event you wish to visually see what the browser is doing you will want to run the `debug` variant of node or standalone images. A VNC server will run on port 5900. You are free to map that to any free external port that you wish. Keep in mind that you will only be able to run one node per port so if you wish to include a second node, or more, you will have to use different ports, the 5900 as the internal port will have to remain the same though as thats the VNC service on the node. The second example below shows how to run multiple nodes and with different VNC ports open: