Upgrade Selenium minor to from 3.2.0 to 3.3.1

Author: elgalu

CHANGELOG.md

@@ -7,6 +7,35 @@ 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/326af92110685041616f79b4...TBD_CUR_COMM (TBD_DATE)
+    + Upgrade Selenium minor to from 3.2.0 to 3.3.1
+    + Upgrade Firefox major from 51.0.1 to 52.0.2
+    + Upgrade GeckoDriver from 0.14.0 to 0.15.0
+    + Chore: Grab Selenium 3 version using `--version`
+    + Docker push major tags: e.g. 3, 3.2, 3.2.0 and of course the specific one
+ + **Image tag details:**
+    + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+    + Selenium 3: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
+    + Chrome stable:  TBD_CHROME_STABLE
+    + Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
+    + Firefox for Selenium 3: 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-70-generic x86_64
+    + Tested on kernel CI  host: TBD_HOST_UNAME
+    + Built at dev host with: Docker version 17.03.1-ce, build c6d412e
+    + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+    + Built at dev host with: Docker Compose version 1.11.2, build dfed245
+    + 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.2.0-p4
  + **Changes:** https://github.com/elgalu/docker-selenium/compare/b2f04d2c7a4c109413...326af92110685041616f79b4 (2017-03-29)
     + Improve stop-video functionality via VIDEO_TMP_FILE_EXTENSION & others

CONTRIBUTING.md

@@ -12,7 +12,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Video stopping resilience from Zalenium side"
+    git commit -m "Upgrade Selenium minor to from 3.2.0 to 3.3.1"
     git tag -d latest && git tag `cat VERSION` && git push origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -236,15 +236,15 @@ RUN  export SELBASE="https://selenium-release.storage.googleapis.com" \
 # Selenium 3
 #============
 # Layer size: medium ~22 MB
-ENV SEL_DIRECTORY="3.2" \
-    SEL_VER="3.2.0"
+ENV SEL_DIRECTORY="3.3" \
+    SEL_VER="3.3.1"
 RUN  export SELBASE="https://selenium-release.storage.googleapis.com" \
   && export SELPATH="${SEL_DIRECTORY}/selenium-server-standalone-${SEL_VER}.jar" \
   && wget -nv ${SELBASE}/${SELPATH} \
   && ln -s "selenium-server-standalone-${SEL_VER}.jar" \
            "selenium-server-standalone-3.jar"
 
-LABEL selenium_version "3.2.0"
+LABEL selenium_version "3.3.1"
 
 #=============================
 # sudo by default from now on

TBD_DOCKER_TAG.md

@@ -3,7 +3,7 @@
     + TBD_COMMIT_MSG
  + **Image tag details:**
     + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
-    + Selenium 3: 3.2.0 (8c03df6)
+    + Selenium 3: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
     + Chrome stable:  TBD_CHROME_STABLE
     + Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
     + Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3

VERSION

@@ -1 +1 @@
-3.2.0-p4
+3.3.1-p0

bin/selenium_2_revision_version

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+
+# 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)"
+
+# --version not supported here so hard-coding
+echo "a36b8b1"

bin/selenium_2_version

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+
+# 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)"
+
+# --version not supported here so hard-coding
+echo "2.53.1"

bin/selenium_revision_version

@@ -15,19 +15,10 @@ set -e
 [ -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 \
+# Selenium 3 - Example:
+#=> 5234b32
+if [ "${USE_SELENIUM}" == "3" ]; then
+  java -jar ${SELENIUM_JAR_PATH} --version \
     | 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"
+    | grep -Po '(?<=revision: )([a-z0-9\.]+)'
 fi

bin/selenium_version

@@ -15,20 +15,11 @@ set -e
 [ -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:
-  #=> 2.53.1
-  java -jar ${SELENIUM_JAR_PATH} -port ${SELENIUM_HUB_PORT} 2>&1 \
-    | grep revision \
-    | grep -Po '(?<=Core v)([a-z0-9\.]+)' \
+# Selenium 3 - Example:
+#=> 3.3.1
+if [ "${USE_SELENIUM}" == "3" ]; then
+  java -jar ${SELENIUM_JAR_PATH} --version \
+    | grep version \
+    | grep -Po '(?<=version: )([a-z0-9\.]+)' \
     | sed 's/\.$//'
-else
-  # Selenium 3 - Example:
-  #=> 3.0.0-beta4
-  log_file="${LOGS_DIR}/selenium-hub-stderr.log"
-  cat ${log_file} \
-    | grep revision \
-    | grep -Po "(?<=version:\s).*([a-z0-9\.\-]+)'," \
-    | sed "s/'//g" \
-    | sed "s/,//g"
 fi

bin/versions

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-echo "selenium_version=$(selenium_version) selenium_revision_version=$(selenium_revision_version)"
+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