Add warning that Selenium 2 support will be deprecated

Author: elgalu

CHANGELOG.md

@@ -7,8 +7,32 @@ 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/113d70a33933ea54168f85c2f5...TBD_CUR_COMM (TBD_DATE)
+    + Upgrade Chrome patch to 58.0.3029.96
+    + Add warning that Selenium 2 support will be deprecated
+ + **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-77-generic x86_64
+    + Tested on kernel CI  host: TBD_HOST_UNAME
+    + Built at dev host with: Docker version 17.04.0-ce, build 4845c56
+    + 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-p6
- + **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...TBD_CUR_COMM (2017-04-26)
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/c4e8df12781eb031795ea6...113d70a33933ea54168f85c2f5 (2017-04-26)
     + Fix: Do not set --user-data-dir as it breaks the ability of clients to set Chrome options via the capabilities
     + Continue deprecating Selenium 2
     + Chrome arg default: --disable-infobars

Dockerfile

@@ -219,9 +219,9 @@ RUN apt-get -qqy update \
 USER seluser
 WORKDIR /home/seluser
 
-#======================
-# Selenium 2 (default)
-#======================
+#========================
+# Selenium 2 (deprecated)
+#========================
 # Layer size: medium: 21.23 MB
 ENV SEL_MAJOR_VER="2.53" \
     SEL_PATCH_LEVEL_VER="1"

README.md

@@ -20,7 +20,7 @@
 Selenium 3  `docker run ... elgalu/selenium:latest`
 ![docker-selenium-grid](./images/grid3_console.png)
 
-Selenium 2  `docker run ... elgalu/selenium:2` *no longer maintained*
+Selenium 2  `docker run ... elgalu/selenium:2` **no longer maintained**
 ![docker-selenium-grid](./images/grid2_console.png)
 
 ### Purpose

bin/entry.sh

@@ -11,14 +11,14 @@ set -e
 #  - this gives less erros: DBUS_SESSION_BUS_ADDRESS="unix:abstract=/dev/null"
 sudo rm -f /var/lib/dbus/machine-id
 sudo mkdir -p /var/run/dbus
-sudo service dbus restart
+sudo service dbus restart >dbus_service.log
 # Test dbus works
-service dbus status
+service dbus status >dbus_service_status.log
 export $(dbus-launch)
 export NSS_USE_SHARED_DB=ENABLED
-echo "-- INFO: DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}"
+# echo "-- INFO: DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}"
 #=> e.g. DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-APZO4BE4TJ,guid=6e9c098d053d3038cb0756ae57ecc885
-echo "-- INFO: DBUS_SESSION_BUS_PID=${DBUS_SESSION_BUS_PID}"
+# echo "-- INFO: DBUS_SESSION_BUS_PID=${DBUS_SESSION_BUS_PID}"
 #=> e.g. DBUS_SESSION_BUS_PID=44
 #
 #-----------------------------------------------
@@ -54,10 +54,23 @@ export FIREFOX_VERSION=$(firefox_version)
 export CHROME_VESION=$(chrome_stable_version)
 export DOSEL_VERSION=$(cat VERSION)
 
+echo "-- INFO: Docker Img. Version: ${DOSEL_VERSION}"
 echo "-- INFO: Chrome..... Version: ${CHROME_VESION}"
 echo "-- INFO: Firefox.... Version: ${FIREFOX_VERSION}"
-echo "-- INFO: Using Selenium.....: ${USE_SELENIUM}"
-echo "-- INFO: Docker Img. Version: ${DOSEL_VERSION}"
+
+if [ "${USE_SELENIUM}" == "2" ]; then
+  # In the future this warning will be changed to an error and exit command
+  echo "-- INFO: Using Selenium.....: ${USE_SELENIUM}"
+  echo -e "\n\n\n\n"
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  echo "!!! WARNING!!! You are using the unmaintained Selenium 2 !!!"
+  echo "!!! to continue using Selenium 2 please use the proper tag:"
+  echo "!!! docker pull elgalu/selenium:2                        !!!"
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  echo -e "\n\n\n\n"
+else
+  echo "-- INFO: Using Selenium.....: ${SEL_VER}"
+fi
 
 # export PATH="${PATH}:${BIN_UTILS}"
 export SUPERVISOR_PIDFILE="${RUN_DIR}/supervisord.pid"
@@ -390,8 +403,8 @@ function get_free_display() {
   local find_display_num=-1
 
   # Get a list of socket DISPLAYs already used
-  netstat -nlp | grep -Po '(?<=\/tmp\/\.X11-unix\/X)([0-9]+)' | sort -u > /tmp/netstatX11.log
-  [ ! -s /tmp/netstatX11.log ] && echo "-- INFO: Emtpy file /tmp/netstatX11.log" 1>&3
+  netstat -nlp 2>/dev/null | grep -Po '(?<=\/tmp\/\.X11-unix\/X)([0-9]+)' | sort -u > /tmp/netstatX11.log
+  # [ ! -s /tmp/netstatX11.log ] && echo "-- INFO: Emtpy file /tmp/netstatX11.log" 1>&3
 
   # important: while loops are executed in a subshell
   #  var assignments will be lost unless using <<<
@@ -441,15 +454,15 @@ function get_free_display() {
       break
     fi
   done
-  [ "${selected_disp_num}" = "-1" ] || echo "-- INFO: Found free DISPLAY=:${selected_disp_num}" 1>&3
+  [ "${selected_disp_num}" = "-1" ] #|| echo "-- INFO: Found free DISPLAY=:${selected_disp_num}" 1>&3
 
   echo ${selected_disp_num}
 }
 
 function start_xvfb() {
   # Start the X server that can run on machines with no real display
   # using Xvfb instead of Xdummy
-  echo "-- INFO: Will try to start Xvfb at DISPLAY=${DISPLAY}" 1>&3
+  # echo "-- INFO: Will try to start Xvfb at DISPLAY=${DISPLAY}" 1>&3
   # if DEBUG = true ...
   # echo "Will use the following values for Xvfb"
   # echo "  screen=${SCREEN_NUM} geometry=${GEOMETRY}"

capabilities.json

@@ -2,7 +2,7 @@
   "caps": [
     {
       "BROWSER_NAME": "chrome",
-      "VERSION": "58.0.3029.81",
+      "VERSION": "58.0.3029.96",
       "PLATFORM": "LINUX"
     },
     {

capabilities3.json

@@ -2,7 +2,7 @@
   "caps": [
     {
       "BROWSER_NAME": "chrome",
-      "VERSION": "58.0.3029.81",
+      "VERSION": "58.0.3029.96",
       "PLATFORM": "LINUX"
     },
     {