Drop support for Selenium 2

Author: elgalu

Dockerfile

@@ -224,24 +224,9 @@ RUN apt-get -qqy update \
 USER seluser
 WORKDIR /home/seluser
 
-#========================
-# Selenium 2 (deprecated)
-#========================
-# Layer size: medium: 21.23 MB
-ENV SEL_MAJOR_VER="2.53" \
-    SEL_PATCH_LEVEL_VER="1"
-ENV SEL_VER="${SEL_MAJOR_VER}.${SEL_PATCH_LEVEL_VER}"
-RUN  export SELBASE="https://selenium-release.storage.googleapis.com" \
-  && export SELPATH="${SEL_MAJOR_VER}/selenium-server-standalone-${SEL_VER}.jar" \
-  && wget -nv ${SELBASE}/${SELPATH} \
-  && ln -s "selenium-server-standalone-${SEL_VER}.jar" \
-           "selenium-server-standalone-2.jar" \
-  && ln -s "selenium-server-standalone-${SEL_VER}.jar" \
-           "selenium-server-standalone.jar"
-
-#============
-# Selenium 3
-#============
+#=================
+# Selenium latest
+#=================
 # Layer size: medium ~22 MB
 ENV SEL_DIRECTORY="3.3" \
     SEL_VER="3.3.1"
@@ -572,20 +557,6 @@ RUN  wget -nv "${FF_URL}" -O "firefox.tar.bz2" \
   && mv firefox firefox-for-sel-3 \
   && sudo ln -fs /home/seluser/firefox-for-sel-3/firefox /usr/bin/firefox
 
-#--- Stable for Selenium 2
-# Layer size: big: 107 MB
-ENV FF_VER="47.0.1"
-ENV FF_COMP="firefox-${FF_VER}.tar.bz2"
-ENV FF_URL="${FF_BASE_URL}/${FF_INNER_PATH}/${FF_VER}/${FF_PLATFORM}/${FF_LANG}/${FF_COMP}"
-RUN  wget -nv "${FF_URL}" -O "firefox.tar.bz2" \
-  && bzip2 -d "firefox.tar.bz2" \
-  && tar xf "firefox.tar" \
-  && rm "firefox.tar" \
-  && mv firefox firefox-for-sel-2 \
-  && sudo ln -fs /home/seluser/firefox-for-sel-2/firefox /usr/bin/firefox
-
-LABEL selenium2_firefox_version "47.0.1"
-LABEL selenium3_firefox_version "52.0.2"
 LABEL selenium_firefox_version "52.0.2"
 
 #=============================
@@ -616,8 +587,6 @@ ENV CHROME_VERSION_TRIGGER="58.0.3029.110" \
     CHROME_BASE_DEB_PATH="/home/seluser/chrome-deb/google-chrome" \
     GREP_ONLY_NUMS_VER="[0-9.]{2,20}"
 
-LABEL selenium2_chrome_version "58.0.3029.110"
-LABEL selenium3_chrome_version "58.0.3029.110"
 LABEL selenium_chrome_version "58.0.3029.110"
 
 # Layer size: huge: 196.3 MB
@@ -688,8 +657,6 @@ ENV DEFAULT_SELENIUM_HUB_PORT="24444" \
 
 # Commented for now; all these versions are still available at
 #   https://github.com/elgalu/docker-selenium/releases/tag/2.47.1m
-# USE_SELENIUM "2" / "3"
-#   Selenium 2 or 3
 # CHROME_FLAVOR "stable"
 #   Default chrome flavor, options no longer available: beta|unstable
 # PICK_ALL_RANDOM_PORTS "true" / "false"

README.md

@@ -21,7 +21,6 @@ Selenium 3  `docker run ... elgalu/selenium:latest`
 ![docker-selenium-grid](./images/grid3_console.png)
 
 Selenium 2  `docker run ... elgalu/selenium:2` **no longer maintained**
-![docker-selenium-grid](./images/grid2_console.png)
 
 ### Purpose
 The purpose of this project is to have [Selenium][] running as simple and as fast as possible.

bin/entry.sh

@@ -47,8 +47,8 @@ sudo cp /capabilities3.json /home/seluser/caps.json
 #---------------------
 # Fix/extend ENV vars
 #---------------------
-export SELENIUM_JAR_PATH="/home/seluser/selenium-server-standalone-${USE_SELENIUM}.jar"
-export FIREFOX_DEST_BIN="/home/seluser/firefox-for-sel-${USE_SELENIUM}/firefox"
+export SELENIUM_JAR_PATH="/home/seluser/selenium-server-standalone-3.jar"
+export FIREFOX_DEST_BIN="/home/seluser/firefox-for-sel-3/firefox"
 sudo ln -fs ${FIREFOX_DEST_BIN} /usr/bin/firefox
 export DOSEL_VERSION=$(cat VERSION)
 export FIREFOX_VERSION=$(firefox_version)
@@ -61,19 +61,19 @@ echo "-- INFO: Chrome..... Version: ${CHROME_VERSION}"
 echo "-- INFO: Firefox.... Version: ${FIREFOX_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 "!!! Will start with Selenium 3 anyway                    !!!"
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
   echo -e "\n\n\n\n"
-else
-  echo "-- INFO: Using Selenium.....: ${SEL_VER}"
 fi
 
+echo "-- INFO: Using Selenium.....: ${SEL_VER}"
+
 # export PATH="${PATH}:${BIN_UTILS}"
 export SUPERVISOR_PIDFILE="${RUN_DIR}/supervisord.pid"
 export DOCKER_SELENIUM_STATUS="${LOGS_DIR}/docker-selenium-status.log"

bin/geckodriver_version

@@ -9,7 +9,6 @@ set -e
 # Example:
 #=> 0.10.0
 CMD="geckodriver"
-[ "${USE_SELENIUM}" == "2" ] && CMD="/opt/geckodriver"
 if ${CMD} --version >/dev/null 2>&1; then
   ${CMD} --version 2>&1 | grep -Po '(?<=geckodriver )([a-z0-9\.]+)'
 else

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

@@ -26,10 +26,7 @@ timeout --foreground ${WAIT_TIMEOUT} wait-xvfb.sh
 timeout --foreground ${WAIT_TIMEOUT} wait-xmanager.sh
 timeout --foreground ${WAIT_TIMEOUT} wait-selenium-hub.sh
 
-if [ "${USE_SELENIUM}" == "3" ]; then
-  JAVA_OPTS="-Dwebdriver.gecko.driver=/usr/bin/geckodriver ${JAVA_OPTS}"
-fi
-
+JAVA_OPTS="-Dwebdriver.gecko.driver=/usr/bin/geckodriver ${JAVA_OPTS}"
 JAVA_OPTS="$(java-dynamic-memory-opts.sh) ${JAVA_OPTS}"
 echo "INFO: JAVA_OPTS are '${JAVA_OPTS}'"
 

test/python_test.py

@@ -18,8 +18,6 @@
                     help='in which browser to test')
 args = parser.parse_args()
 
-current_selenium = os.environ.get('USE_SELENIUM', '3')
-
 # http://selenium-python.readthedocs.org/en/latest/api.html
 if args.browser == 'chrome':
     caps = DesiredCapabilities.CHROME