Fix the HEALTHCHECK --interval=2m

Author: elgalu

CHANGELOG.md

@@ -7,8 +7,31 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## TBD_DOCKER_TAG
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...master (TBD_DATE)
+    + Fix the HEALTHCHECK --interval=2m
+ + **Image tag details:**
+    + Selenium version: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
+    + Chrome stable:  TBD_CHROME_STABLE
+    + Firefox stable: TBD_FIREFOX_FOR_SEL3
+    + Geckodriver: TBD_GECKO_DRIVER
+    + Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
+    + Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
+    + Timezone: TBD_TIME_ZONE
+    + FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
+    + Python: TBD_PYTHON_VERSION
+    + Tested on kernel dev host: 4.4.0-78-generic x86_64
+    + Tested on kernel CI  host: TBD_HOST_UNAME
+    + Built at dev host with: Docker version 17.05.0-ce, build 89658be
+    + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+    + Built at dev host with: Docker Compose version 1.13.0, build 1719ceb
+    + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
+    + Image size: TBD_IMAGE_SIZE
+    + Digest: TBD_DIGEST
+    + Image ID: TBD_IMAGE_ID
+
 ## 3.3.1-p10
- + **Changes:** https://github.com/elgalu/docker-selenium/compare/659750865bf0fd569d...master (2017-05-19)
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/659750865bf0fd569d...5e74ec04c8398054f024d13ed (2017-05-19)
      + BREAKING CHANGES:
          ++ Drop support for Selenium 2
          ++ From now on we will show a banner and switch directly to selenium 3

CONTRIBUTING.md

@@ -12,7 +12,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Upgrade to Python 3"
+    git commit -m "Fix the HEALTHCHECK --interval=2m"
     git tag -d latest; git tag -d `cat VERSION`; git push origin :`cat VERSION`; git tag `cat VERSION` && git push --force origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -910,7 +910,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
 #================================
 # VOLUME ${LOGS_DIR}
 
-HEALTHCHECK --interval=1s --timeout=35s --retries=1 \
+HEALTHCHECK --interval=2m --timeout=50s --retries=2 \
   CMD wait_all_done 30s
 
 #================

TBD_DOCKER_TAG.md

@@ -11,7 +11,7 @@
     + Timezone: TBD_TIME_ZONE
     + FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
     + Python: TBD_PYTHON_VERSION
-    + Tested on kernel dev host: 4.4.0-77-generic x86_64
+    + Tested on kernel dev host: 4.4.0-78-generic x86_64
     + Tested on kernel CI  host: TBD_HOST_UNAME
     + Built at dev host with: Docker version 17.05.0-ce, build 89658be
     + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

VERSION

@@ -1 +1 @@
-3.3.1-p10
+3.3.1-p11

selenium-node-chrome/bin/start-selenium-node-chrome.sh

@@ -24,6 +24,10 @@ die () {
 # Wait for this process dependencies
 timeout --foreground ${WAIT_TIMEOUT} wait-xvfb.sh
 timeout --foreground ${WAIT_TIMEOUT} wait-xmanager.sh
+if [ "${ZALENIUM}" == "true" ]; then
+  timeout --foreground ${WAIT_TIMEOUT} wait-vnc.sh
+  timeout --foreground ${WAIT_TIMEOUT} wait-novnc.sh
+fi
 timeout --foreground ${WAIT_TIMEOUT} wait-selenium-hub.sh
 
 JAVA_OPTS="$(java-dynamic-memory-opts.sh) ${JAVA_OPTS}"

selenium-node-firefox/bin/start-selenium-node-firefox.sh

@@ -22,9 +22,20 @@ die () {
 [ -z "${FIREFOX_DEST_BIN}" ] && die "Required env var FIREFOX_DEST_BIN"
 
 # Wait for this process dependencies
-timeout --foreground ${WAIT_TIMEOUT} wait-xvfb.sh
-timeout --foreground ${WAIT_TIMEOUT} wait-xmanager.sh
-timeout --foreground ${WAIT_TIMEOUT} wait-selenium-hub.sh
+timeout --foreground ${WAIT_TIMEOUT} wait-xvfb.sh || \
+  die "Failed while waiting for Xvfb to start!"
+timeout --foreground ${WAIT_TIMEOUT} wait-xmanager.sh || \
+  die "Failed while waiting for XManager to start!"
+
+if [ "${ZALENIUM}" == "true" ]; then
+  timeout --foreground ${NOVNC_WAIT_TIMEOUT} wait-vnc.sh || \
+    error "wait-vnc.sh failed within ${NOVNC_WAIT_TIMEOUT} -- Zalenium check."
+  timeout --foreground ${NOVNC_WAIT_TIMEOUT} wait-novnc.sh || \
+    error "wait-novnc.sh failed within ${NOVNC_WAIT_TIMEOUT} -- Zalenium check."
+fi
+
+timeout --foreground ${WAIT_TIMEOUT} wait-selenium-hub.sh || \
+  die "Failed while waiting for the Selenium hub to be available!!"
 
 JAVA_OPTS="-Dwebdriver.gecko.driver=/usr/bin/geckodriver ${JAVA_OPTS}"
 JAVA_OPTS="$(java-dynamic-memory-opts.sh) ${JAVA_OPTS}"