Add Selenium 3.0.0-beta4 via docker run -e USE_SELENIUM=3

Author: elgalu

.travis.yml

@@ -19,15 +19,15 @@ services:
   - docker
 
 matrix:
-  allow_failures:
-    # Currently erroring in Mac (OSX):
-    #  https://travis-ci.org/elgalu/docker-selenium/jobs/143553463#L636
-    #   com.docker.docker Incompatible CPU detected
-    #   Docker requires a processor with virtualization capabilities
-    - env:
-        - DOCKER_VERSION="1.12.1"
-          DOCKER_COMPOSE_VERSION="1.8.1"
-          OPERATING_SYSTEM="osx"
+  # allow_failures:
+  #   # Currently erroring in Mac (OSX):
+  #   #  https://travis-ci.org/elgalu/docker-selenium/jobs/143553463#L636
+  #   #   com.docker.docker Incompatible CPU detected
+  #   #   Docker requires a processor with virtualization capabilities
+  #   - env:
+  #       - DOCKER_VERSION="1.12.1"
+  #         DOCKER_COMPOSE_VERSION="1.8.1"
+  #         OPERATING_SYSTEM="osx"
   include:
     # Linux with docker:stable compose:stable
     # Use DOCKER_PUSH_LATEST=false to debug
@@ -40,7 +40,7 @@ matrix:
         - DOCKER_VERSION="stable"
           DOCKER_COMPOSE_VERSION="1.8.1"
           DOCKER_PUSH=true
-          DOCKER_PUSH_LATEST=true
+          DOCKER_PUSH_LATEST=false
     # Linux with docker:beta/older compose:beta/older
     - os: linux
       sudo: required

CHANGELOG.md

@@ -7,6 +7,39 @@ 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
+ + Date: TBD_DATE
+ + Include Selenium 3 (3.0.0-beta4) and enable via `-e USE_SELENIUM=3`
+ + Allow to choose Selenium 2 or Selenium 3 via `USE_SELENIUM=2` (default) or `USE_SELENIUM=3`
+ + Provide Firefox 49.0.1 for Selenium 3
+ + Provide Firefox 47.0.1 for Selenium 2
+ + Upgrade Chrome patch to 53.0.2785.143
+ + Bug: Removed config option that didn't belong to the hub (is node-only) `-nodePolling`
+ + Bug: Java CLI required all system `-D` args to be before the `-jar` argument
+ + Removed future supported option `-trustAllSSLCertificates`
+ + Add `--disable-gpu` to CHROME_ARGS to avoid the single GPU thread error message
+ + Re-add geckodriver 0.10.0
+ + Image tag details:
+  + Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
+  + Chrome stable:  TBD_CHROME_STABLE
+  + Firefox stable: TBD_FIREFOX_STABLE
+  + 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
+  + Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
+  + BrowserStack Local version TBD_BROWSER_STACK_VERSION
+  + Tested on kernel dev host: 4.4.0-38-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.12.1, build 23cf638
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+  + Built at dev host with: Docker Compose version 1.8.0, build f3628c7
+  + 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
+
 ## 2.53.1z
  + Date: 2016-09-29
  + Remove geckodriver as is not being used yet
@@ -25,7 +58,7 @@ Note image ids also change after scm-source.json has being updated which trigger
   + Tested on kernel CI  host: 3.19.0-66-generic x86_64
   + Built at dev host with: Docker version 1.12.1, build 23cf638
   + Built at CI  host with: Docker version 1.12.1, build 23cf638
-  + Built at dev host with: Docker Compose version 1.8.1, build 878cff1
+  + Built at dev host with: Docker Compose version 1.8.0, build f3628c7
   + Built at CI  host with: Docker Compose version 1.8.1, build 878cff1
   + Image size: 2.576 GB
   + Digest: sha256:6c4bdb751fe15ebcec8b5a6dc120dd9ccee7f0883fcd24c82e187320e57beda6

CONTRIBUTING.md

@@ -6,18 +6,18 @@ For pull requests or local commits:
     time (./test/bef && ./test/install && ./test/script_start && ./test/script_end) ; beep
     docker exec grid versions && ./test/after_script && travis lint
     open ./images/grid_console.png && open ./videos/chrome/*.mkv
-    git checkout -b tmp-2.53.1z && git checkout ./images/grid_console.png
+    git checkout -b tmp-3.0.0b4 && git checkout ./images/grid_console.png
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Remove geckodriver as is not being used yet"
-    git tag -d latest && git tag 2.53.1z && git push origin tmp-2.53.1z && git push --tags
+    git commit -m "Add Selenium 3.0.0-beta4 via docker run -e USE_SELENIUM=3"
+    git tag -d latest && git tag 3.0.0b4 && git push origin tmp-3.0.0b4 && git push --tags
 
 -- Wait for Travis to pass OK
 -- Make sure changes got merged into master by elgalubot
 
-    git checkout master && git pull && git branch -d tmp-2.53.1z && git push origin --delete tmp-2.53.1z
+    git checkout master && git pull && git branch -d tmp-3.0.0b4 && git push origin --delete tmp-3.0.0b4
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- If Chrome version changed upload:
@@ -35,9 +35,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 2.53.1z && git push origin :2.53.1z
+    git tag -d 3.0.0b4 && git push origin :3.0.0b4
     #git add ...
-    git commit --amend && git tag 2.53.1z && git push --force origin tmp-2.53.1z && git push --tags
+    git commit --amend && git tag 3.0.0b4 && git push --force origin tmp-3.0.0b4 && git push --tags
 
 ## Docker push from Travis CI
 Travis [steps](https://docs.travis-ci.com/user/docker/#Pushing-a-Docker-Image-to-a-Registry) involve `docker login` and docker credentials encryptions.

Dockerfile

@@ -680,8 +680,7 @@ RUN cd /tmp \
 #   && rm -rf /var/lib/apt/lists/*
 # ENV FF_VER="latest" \
 #     FF_LANG="en-US" \
-#     FF_DEST="/usr/lib/firefox"
-# ENV FIREFOX_DEST_BIN="${FF_DEST}/firefox"
+#     FIREFOX_DEST_BIN="/usr/lib/firefox/firefox"
 # RUN ln -fs ${FIREFOX_DEST_BIN} /usr/bin/firefox
 
 #-------------------------#
@@ -709,39 +708,49 @@ RUN cd /tmp \
 
 ENV FF_LANG="en-US" \
     FF_BASE_URL="https://archive.mozilla.org/pub" \
-    FF_DEST="${SEL_HOME}/firefox"
-ENV FIREFOX_DEST_BIN="${FF_DEST}/firefox"
-
-#--- Stable
-ENV FF_VER="47.0.1" \
     FF_PLATFORM="linux-x86_64" \
     FF_INNER_PATH="firefox/releases"
+
+#--- For Selenium 3
+ENV FF_VER="49.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 mkdir -p ${SEL_HOME} && cd ${SEL_HOME} \
+  && 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-3 \
+  && sudo ln -fs ${SEL_HOME}/firefox-for-sel-3/firefox /usr/bin/firefox
 
+#--- Stable for Selenium 2
+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 mkdir -p ${SEL_HOME} && cd ${SEL_HOME} \
   && wget -nv "${FF_URL}" -O "firefox.tar.bz2" \
   && bzip2 -d "firefox.tar.bz2" \
   && tar xf "firefox.tar" \
   && rm "firefox.tar" \
-  && sudo ln -fs ${FIREFOX_DEST_BIN} /usr/bin/firefox
+  && mv firefox firefox-for-sel-2 \
+  && sudo ln -fs ${SEL_HOME}/firefox-for-sel-2/firefox /usr/bin/firefox
 
 #============
 # GeckoDriver
 #============
-# ENV GECKOD_VER="0.10.0" \
-#     GECKOD_URL="https://github.com/mozilla/geckodriver/releases/download"
-# RUN wget --no-verbose -O /tmp/geckodriver.tar.gz \
-#      "${GECKOD_URL}/v${GECKOD_VER}/geckodriver-v${GECKOD_VER}-linux64.tar.gz" \
-#   && rm -rf /opt/geckodriver* \
-#   && tar -C /opt -xvzf /tmp/geckodriver.tar.gz \
-#   && mv /opt/geckodriver /usr/bin/geckodriver \
-#   && chmod +x /usr/bin/geckodriver \
-#   && ln -fs /usr/bin/geckodriver /opt/geckodriver \
-#   && ln -fs /usr/bin/geckodriver /usr/bin/wires \
-#   && ln -fs /usr/bin/geckodriver ${FF_DEST}/geckodriver \
-#   && ln -fs /usr/bin/geckodriver ${FF_DEST}/wires \
-#   && rm /tmp/geckodriver.tar.gz
+ENV GECKOD_VER="0.10.0" \
+    GECKOD_URL="https://github.com/mozilla/geckodriver/releases/download"
+RUN wget --no-verbose -O /tmp/geckodriver.tar.gz \
+     "${GECKOD_URL}/v${GECKOD_VER}/geckodriver-v${GECKOD_VER}-linux64.tar.gz" \
+  && rm -rf /opt/geckodriver* \
+  && tar -C /opt -xvzf /tmp/geckodriver.tar.gz \
+  && mv /opt/geckodriver /usr/bin/geckodriver \
+  && chmod +x /usr/bin/geckodriver \
+  && ln -fs /usr/bin/geckodriver /opt/geckodriver \
+  && ln -fs /usr/bin/geckodriver /usr/bin/wires \
+  && rm /tmp/geckodriver.tar.gz
+  # && ln -fs /usr/bin/geckodriver ${FF_DEST}/geckodriver \
+  # && ln -fs /usr/bin/geckodriver ${FF_DEST}/wires \
 
   # && rm -rf ${NORMAL_USER_HOME}/firefox-src
 # RUN mkdir -p ${NORMAL_USER_HOME}/firefox-src \
@@ -774,13 +783,22 @@ USER ${NORMAL_USER}
 #==========
 # Selenium
 #==========
-ENV SEL_MAJOR_MINOR_VER 2.53
-ENV SEL_PATCH_LEVEL_VER 1
+# Selenium 3
+ENV SEL_DIRECTORY="3.0-beta4" \
+    SEL_VERSION="3.0.0-beta4"
+RUN  mkdir -p ${SEL_HOME} \
+  && export SELBASE="https://selenium-release.storage.googleapis.com" \
+  && export SELPATH="${SEL_DIRECTORY}/selenium-server-standalone-${SEL_VERSION}.jar" \
+  && wget -nv ${SELBASE}/${SELPATH} \
+      -O ${SEL_HOME}/selenium-server-standalone-3.jar
+# Selenium 2
+ENV SEL_MAJOR_MINOR_VER="2.53" \
+    SEL_PATCH_LEVEL_VER="1"
 RUN  mkdir -p ${SEL_HOME} \
   && export SELBASE="https://selenium-release.storage.googleapis.com" \
   && export SELPATH="${SEL_MAJOR_MINOR_VER}/selenium-server-standalone-${SEL_MAJOR_MINOR_VER}.${SEL_PATCH_LEVEL_VER}.jar" \
   && wget -nv ${SELBASE}/${SELPATH} \
-      -O ${SEL_HOME}/selenium-server-standalone.jar
+      -O ${SEL_HOME}/selenium-server-standalone-2.jar
 
 #==================
 # Chrome webdriver
@@ -816,7 +834,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
 # TODO: Use Google fingerprint to verify downloads
 #  https://www.google.de/linuxrepositories/
 # Also fix .deb file names with correct version
-RUN  latest_chrome_version_trigger="53.0.2785.116" \
+RUN  latest_chrome_version_trigger="53.0.2785.143" \
   && mkdir -p ${NORMAL_USER_HOME}/chrome-deb \
   && export CHROME_URL="https://dl.google.com/linux/direct" \
   && wget -nv -O \
@@ -972,6 +990,8 @@ ENV DEFAULT_SELENIUM_HUB_PORT="24444" \
   # Firefox version to use during run
   # For firefox please pick one of $FIREFOX_VERSIONS, default latest
 ENV FIREFOX_VERSION="${FF_VER}" \
+  # Selenium 2 or 3
+  USE_SELENIUM="2" \
   # Default chrome flavor, options no longer avariable: beta|unstable
   CHROME_FLAVOR="stable" \
   # Randomize all ports, i.e. pick unused unprivileged ones
@@ -1017,7 +1037,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   SELENIUM_NODE_PARAMS="" \
   SELENIUM_NODE_PROXY_PARAMS="" \
   # To taggle issue #58 see https://goo.gl/fz6RTu
-  CHROME_ARGS="--no-sandbox" \
+  CHROME_ARGS="--no-sandbox --disable-gpu" \
   # Will be passed with: -Dwebdriver.chrome.verboseLogging
   CHROME_VERBOSELOGGING="true" \
   # e.g. CHROME_ARGS="--no-sandbox --ignore-certificate-errors" \

README.md

@@ -91,6 +91,11 @@ Shutdown immediately, no mercy
 
     docker rm -vf grid
 
+### Selenium 3
+Is now possible to choose Selenium 2 or Selenium 3 via docker run `-e USE_SELENIUM=2` (default) or `-e USE_SELENIUM=3`
+Be ready for seeing your tests failing in Firefox.
+Please google those errors first before opening an issue in this project.
+
 ### Docker Compose
 See [docker-compose](./docs/docker-compose.md)
 

bin/entry.sh

@@ -27,12 +27,17 @@ stop 2>&1 >/dev/null || true
 rm -f ${LOGS_DIR}/*
 rm -f ${RUN_DIR}/*
 
-echo "-- INFO: Available Google Chrome Version: $(chrome_stable_version)"
-echo "-- INFO: Available Firefox...... Version: ${FIREFOX_VERSION}"
-
 #---------------------
 # Fix/extend ENV vars
 #---------------------
+export SELENIUM_JAR_PATH="${SEL_HOME}/selenium-server-standalone-${USE_SELENIUM}.jar"
+export FIREFOX_DEST_BIN="${SEL_HOME}/firefox-for-sel-${USE_SELENIUM}/firefox"
+sudo ln -fs ${FIREFOX_DEST_BIN} /usr/bin/firefox
+
+echo "-- INFO: Chrome..... Version: $(chrome_stable_version)"
+echo "-- INFO: Firefox.... Version: $(firefox_version)"
+echo "-- INFO: Selenium... Version: ${USE_SELENIUM}"
+
 # export PATH="${PATH}:${BIN_UTILS}"
 export SAUCE_LOG_FILE="${LOGS_DIR}/saucelabs-stdout.log"
 export BSTACK_LOG_FILE="${LOGS_DIR}/browserstack-stdout.log"
@@ -398,6 +403,11 @@ echo "${NOVNC_PORT}" > NOVNC_PORT
 echo "${SSHD_PORT}" > SSHD_PORT
 echo "${SAUCE_LOCAL_SEL_PORT}" > SAUCE_LOCAL_SEL_PORT
 echo "${SUPERVISOR_HTTP_PORT}" > SUPERVISOR_HTTP_PORT
+echo "${FIREFOX_DEST_BIN}" > FIREFOX_DEST_BIN
+echo "${USE_SELENIUM}" > USE_SELENIUM
+echo "${SEL_HOME}" > SEL_HOME
+echo "${SELENIUM_JAR_PATH}" > SELENIUM_JAR_PATH
+echo "${LOGS_DIR}" > LOGS_DIR
 env > env
 
 #------

bin/firefox-for-sel-2_version

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Example:
+#  firefox -version 2>&1
+#=> Mozilla Firefox 47.0.1
+
+[ -z "${SEL_HOME}" ] && export SEL_HOME="$(cat SEL_HOME)"
+
+# Example:
+#=> 47.0.1
+${SEL_HOME}/firefox-for-sel-2/firefox \
+  -version 2>&1 | grep -Po '(?<=Firefox )([a-z0-9\.]+)'

bin/firefox-for-sel-3_version

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Example:
+#  firefox -version 2>&1
+#=> Mozilla Firefox 49.0.1
+
+[ -z "${SEL_HOME}" ] && export SEL_HOME="$(cat SEL_HOME)"
+
+# Example:
+#=> 49.0.1
+${SEL_HOME}/firefox-for-sel-3/firefox \
+  -version 2>&1 | grep -Po '(?<=Firefox )([a-z0-9\.]+)'

bin/firefox_version

@@ -6,4 +6,4 @@
 
 # Example:
 #=> 45.0.2
-${FIREFOX_DEST_BIN} -version 2>&1 | grep -Po '(?<=Firefox )([a-z0-9\.]+)'
+firefox -version 2>&1 | grep -Po '(?<=Firefox )([a-z0-9\.]+)'

bin/selenium_revision_version

@@ -1,7 +1,32 @@
 #!/usr/bin/env bash
 
-# Example:
-#=> 35ae25b
-java -jar ${SEL_HOME}/selenium-server-standalone.jar -port ${SELENIUM_HUB_PORT} 2>&1 \
-  | grep revision \
-  | grep -Po '(?<=revision )([a-z0-9\.]+)'
+# log_file="selenium_version.log"
+# java -jar ${SELENIUM_JAR_PATH} \
+#   -port ${SELENIUM_HUB_PORT} \
+#   -log ${log_file} \
+#   >/dev/null 2>&1 &
+# pid=$!
+# sleep 1 && kill ${pid} || true
+# rm -f ${log_file}
+
+[ -z "${USE_SELENIUM}" ] && export USE_SELENIUM="$(cat USE_SELENIUM)"
+[ -z "${SELENIUM_JAR_PATH}" ] && export SELENIUM_JAR_PATH="$(cat SELENIUM_JAR_PATH)"
+[ -z "${SELENIUM_HUB_PORT}" ] && export SELENIUM_HUB_PORT="$(cat SELENIUM_HUB_PORT)"
+[ -z "${LOGS_DIR}" ] && export LOGS_DIR="$(cat LOGS_DIR)"
+
+if [ "${USE_SELENIUM}" == "2" ]; then
+  # Selenium 2 - Example:
+  #=> 35ae25b
+  java -jar ${SELENIUM_JAR_PATH} -port ${SELENIUM_HUB_PORT} 2>&1 \
+    | grep revision \
+    | grep -Po '(?<=revision )([a-z0-9\.]+)'
+else
+  # Selenium 3 - Example:
+  #=> 3169782
+  log_file="${LOGS_DIR}/selenium-hub-stderr.log"
+  cat ${log_file} \
+    | grep revision \
+    | grep -Po "(?<=revision: ')([a-z0-9\.]+)" \
+    | sed "s/'//g" \
+    | sed "s/,//g"
+fi