Continue deprecating Selenium 2

Author: elgalu

Dockerfile

@@ -942,23 +942,16 @@ COPY Analytics.md /home/seluser/
 #===================================
 # The .X11-unix stuff is useful when using Xephyr
 RUN mkdir -p /home/seluser/.vnc \
-  && sudo touch /capabilities2.json \
-  && sudo chown seluser:seluser /capabilities2.json \
-  && generate_capabilities2_json > /capabilities2.json \
-  && cp /capabilities2.json /home/seluser/capabilities2.json \
-  && cp /capabilities2.json /home/seluser/capabilities2 \
-  && cp /capabilities2.json /home/seluser/caps2.json \
-  && cp /capabilities2.json /home/seluser/caps2 \
   && sudo touch /capabilities3.json \
   && sudo chown seluser:seluser /capabilities3.json \
   && generate_capabilities3_json > /capabilities3.json \
   && cp /capabilities3.json /home/seluser/capabilities3.json \
   && cp /capabilities3.json /home/seluser/capabilities3 \
   && cp /capabilities3.json /home/seluser/caps3.json \
   && cp /capabilities3.json /home/seluser/caps3 \
-  && sudo cp /capabilities2.json /capabilities.json \
-  && sudo cp /capabilities2.json /home/seluser/capabilities.json \
-  && sudo cp /capabilities2.json /home/seluser/caps.json \
+  && sudo cp /capabilities3.json /capabilities.json \
+  && sudo cp /capabilities3.json /home/seluser/capabilities.json \
+  && sudo cp /capabilities3.json /home/seluser/caps.json \
   && mkdir -p ${VIDEOS_DIR} \
   && sudo ln -s ${VIDEOS_DIR} /videos \
   && sudo chown seluser:seluser /videos \

README.md

@@ -17,10 +17,10 @@
 * firefox stable [last 18 versions can be found here][2.47.1m]
 * fluxbox (openbox window manager can still be found [here](https://github.com/elgalu/docker-selenium/releases/tag/3.0.1c))
 
-Selenium 3  `docker run ... -e USE_SELENIUM=3 elgalu/selenium:latest`
+Selenium 3  `docker run ... elgalu/selenium:latest`
 ![docker-selenium-grid](./images/grid3_console.png)
 
-Selenium 2  `docker run ... -e USE_SELENIUM=2 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

@@ -27,26 +27,17 @@ stop >/dev/null 2>&1 || true
 rm -f ${LOGS_DIR}/*
 rm -f ${RUN_DIR}/*
 
-# Selenium IDE RC (legacy) doesn't seem to keep working on Selenium 3
-if [ "${USE_SELENIUM}" == "3" ]; then
-  export RC_CHROME="false"
-  export RC_FIREFOX="false"
-  # Support restart docker container for selenium 3 @aituganov
-  if [ ! -f /usr/bin/geckodriver ]; then
-    sudo mv /opt/geckodriver /usr/bin/geckodriver
-    sudo ln -fs /usr/bin/geckodriver /opt/geckodriver
-  fi
+export RC_CHROME="false"
+export RC_FIREFOX="false"
+# Support restart docker container for selenium 3 @aituganov
+if [ ! -f /usr/bin/geckodriver ]; then
+  sudo mv /opt/geckodriver /usr/bin/geckodriver
+  sudo ln -fs /usr/bin/geckodriver /opt/geckodriver
 fi
 
-if [ "${USE_SELENIUM}" == "3" ]; then
-  sudo cp /capabilities3.json /capabilities.json
-  sudo cp /capabilities3.json /home/seluser/capabilities.json
-  sudo cp /capabilities3.json /home/seluser/caps.json
-else
-  sudo cp /capabilities2.json /capabilities.json
-  sudo cp /capabilities2.json /home/seluser/capabilities.json
-  sudo cp /capabilities2.json /home/seluser/caps.json
-fi
+sudo cp /capabilities3.json /capabilities.json
+sudo cp /capabilities3.json /home/seluser/capabilities.json
+sudo cp /capabilities3.json /home/seluser/caps.json
 
 # We need larger screens for Selenium IDE RC tests
 # if [ "${RC_CHROME}" = "true" ] || [ "${RC_FIREFOX}" = "true" ]; then

bin/firefox-for-sel-2_version

@@ -1,14 +1,12 @@
 #!/usr/bin/env bash
 
 echo "selenium 3 version=$(selenium_version) revision=$(selenium_revision_version)"
-echo "selenium 2 version=$(selenium_2_version) revision=$(selenium_2_revision_version)"
 
 echo "chrome_stable_version=$(chrome_stable_version)"
 google-chrome-stable --version
 
 echo "firefox_version=$(firefox_version)"
 firefox --version
-echo "firefox-for-sel-2_version=$(firefox-for-sel-2_version)"
 echo "firefox-for-sel-3_version=$(firefox-for-sel-3_version)"
 
 echo "chromedriver_version=$(chromedriver_version)"

bin/selenium_2_revision_version

@@ -131,14 +131,8 @@ update_changelog() {
     || die "while trying to get TBD_GECKO_DRIVER"
   TBD_CHROMEDRIVER_COMMIT=$(docker exec grid chromedriver_commit_version) \
     || die "while trying to get TBD_CHROMEDRIVER_COMMIT"
-  TBD_FIREFOX_FOR_SEL2=$(docker exec grid firefox-for-sel-2_version) \
-    || die "while trying to get TBD_FIREFOX_FOR_SEL2"
   TBD_FIREFOX_FOR_SEL3=$(docker exec grid firefox-for-sel-3_version) \
     || die "while trying to get TBD_FIREFOX_FOR_SEL3"
-  TBD_SELENIUM_2_VERSION=$(docker exec grid selenium_2_version) \
-    || die "while trying to get TBD_SELENIUM_2_VERSION"
-  TBD_SELENIUM_2_REVISION=$(docker exec grid selenium_2_revision_version) \
-    || die "while trying to get TBD_SELENIUM_2_REVISION"
   TBD_SELENIUM_3_VERSION=$(docker exec grid selenium_version) \
     || die "while trying to get TBD_SELENIUM_3_VERSION"
   TBD_SELENIUM_3_REVISION=$(docker exec grid selenium_revision_version) \
@@ -169,10 +163,7 @@ update_changelog() {
   sed -i -- "s/TBD_CHROME_DRIVER/${TBD_CHROME_DRIVER}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_GECKO_DRIVER/${TBD_GECKO_DRIVER}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_CHROMEDRIVER_COMMIT/${TBD_CHROMEDRIVER_COMMIT}/g" CHANGELOG.md || true
-  sed -i -- "s/TBD_FIREFOX_FOR_SEL2/${TBD_FIREFOX_FOR_SEL2}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_FIREFOX_FOR_SEL3/${TBD_FIREFOX_FOR_SEL3}/g" CHANGELOG.md || true
-  sed -i -- "s/TBD_SELENIUM_2_VERSION/${TBD_SELENIUM_2_VERSION}/g" CHANGELOG.md || true
-  sed -i -- "s/TBD_SELENIUM_2_REVISION/${TBD_SELENIUM_2_REVISION}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_SELENIUM_3_VERSION/${TBD_SELENIUM_3_VERSION}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_SELENIUM_3_REVISION/${TBD_SELENIUM_3_REVISION}/g" CHANGELOG.md || true
   sed -i -- "s/TBD_PYTHON_VERSION/${TBD_PYTHON_VERSION}/g" CHANGELOG.md || true