Upgrade Chromedriver to 2.25 (was 2.24)

Author: elgalu

.travis.yml

@@ -59,7 +59,7 @@ matrix:
         - docker
       env:
         - DOCKER_VERSION="stable"
-          DOCKER_COMPOSE_VERSION="1.9.0-rc1"
+          DOCKER_COMPOSE_VERSION="1.9.0-rc2"
     # Linux with docker:beta/older compose:stable
     - os: linux
       language: c
@@ -69,7 +69,7 @@ matrix:
         - docker
       env:
         - DOCKER_VERSION="1.12.2-rc2"
-          DOCKER_COMPOSE_VERSION="1.9.0-rc1"
+          DOCKER_COMPOSE_VERSION="1.9.0-rc2"
     # Mac OSX: only test native docker version
     - os: osx
       osx_image: xcode8

CHANGELOG.md

@@ -7,12 +7,42 @@ 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
+ + Upgrade Chromedriver to 2.25 (was 2.24)
+ + Move back from Java 9 to Java 8 to save space
+ + Added option -e VIDEO_STOP_SLEEP_SECS="1"
+ + Image tag details:
+  + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+  + Selenium 3: 3.0.1 (1969d75)
+  + 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
+  + 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-45-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.12.3, build 6b644ec
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+  + Built at dev host with: Docker Compose version 1.8.1, build 878cff1
+  + 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.0.1a
  + Date: 2016-10-24
  + Upgrade Selenium 3 patch 3.0.1 (was 3.0.0)
  + Upgrade Chrome patch to 54.0.2840.71
  + Upgrade Firefox patch to 49.0.2
  + Upgrade Sauce Connect patch to 4.4.1 (was 4.4.0)
+ + Upgrade BrowserStack minor to 6.4 (was 6.3)
  + Image tag details:
   + Selenium 2: 2.53.1 (a36b8b1)
   + Selenium 3: 3.0.1 (1969d75)

CONTRIBUTING.md

@@ -7,18 +7,18 @@ For pull requests or local commits:
     docker exec grid versions && ./test/after_script && travis lint
     open ./images/grid2_console.png && open ./images/grid3_console.png && open ./videos/mobile_emulation/*.mkv
     open test/seleIDE/videos/rc/sele_ide.mkv
-    git checkout -b tmp-3.0.1a && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
+    git checkout -b tmp-3.0.1b && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Upgrade Selenium 3 patch 3.0.1 (was 3.0.0)"
-    git tag -d latest && git tag 3.0.1a && git push origin tmp-3.0.1a && git push --tags
+    git commit -m "Upgrade Chromedriver to 2.25 (was 2.24)"
+    git tag -d latest && git tag 3.0.1b && git push origin tmp-3.0.1b && 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-3.0.1a && git push origin --delete tmp-3.0.1a
+    git checkout master && git pull && git branch -d tmp-3.0.1b && git push origin --delete tmp-3.0.1b
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- If Chrome version changed upload:
@@ -36,9 +36,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 3.0.1a && git push origin :3.0.1a
+    git tag -d 3.0.1b && git push origin :3.0.1b
     #git add ...
-    git commit --amend && git tag 3.0.1a && git push --force origin tmp-3.0.1a && git push --tags
+    git commit --amend && git tag 3.0.1b && git push --force origin tmp-3.0.1b && 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

@@ -1,39 +1,17 @@
-###################################################
-# Selenium standalone docker for Chrome & Firefox #
-###################################################
 #== Ubuntu xenial is 16.04, i.e. FROM ubuntu:16.04
-# search for more at https://registry.hub.docker.com/_/ubuntu/tags/manage/
+# Find latest images at https://hub.docker.com/r/library/ubuntu/
 FROM ubuntu:xenial-20161010
 ENV UBUNTU_FLAVOR="xenial" \
     UBUNTU_DATE="20161010"
 
-#== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
-# FROM ubuntu:wily-20151208
-# ENV UBUNTU_FLAVOR wily
-
-#== Ubuntu vivid is 15.04, i.e. FROM ubuntu:15.04
-#                    https://cloud-images.ubuntu.com/releases/15.04/
-# FROM ubuntu:vivid-20150611
-# ENV UBUNTU_FLAVOR vivid
-
-#== Ubuntu trusty is 14.04, i.e. FROM ubuntu:14.04
-#== Could also use ubuntu:latest but for the sake I replicating an precise env...
-#                    https://cloud-images.ubuntu.com/releases/14.04/
-# FROM ubuntu:trusty-20150630
-# ENV UBUNTU_FLAVOR trusty
-
-#== Ubuntu precise is 12.04, i.e. FROM ubuntu:12.04
-#== Could also use ubuntu:latest but for the sake I replicating an precise env...
-#                    https://cloud-images.ubuntu.com/releases/12.04/
-# FROM ubuntu:precise-20150612
-# ENV UBUNTU_FLAVOR precise
-
 #== Ubuntu flavors - common
 RUN  echo "deb http://archive.ubuntu.com/ubuntu ${UBUNTU_FLAVOR} main universe\n" > /etc/apt/sources.list \
-  && echo "deb http://archive.ubuntu.com/ubuntu ${UBUNTU_FLAVOR}-updates main universe\n" >> /etc/apt/sources.list
+  && echo "deb http://archive.ubuntu.com/ubuntu ${UBUNTU_FLAVOR}-updates main universe\n" >> /etc/apt/sources.list \
+  && echo "deb http://archive.ubuntu.com/ubuntu ${UBUNTU_FLAVOR}-security main universe\n" >> /etc/apt/sources.list
 
-MAINTAINER Leo Gallucci <[email protected]>
+MAINTAINER Leo Gallucci <elgalu3+team-tip@gmail.com>
 
+# No interactive frontend during docker build
 ENV DEBIAN_FRONTEND=noninteractive \
     DEBCONF_NONINTERACTIVE_SEEN=true
 
@@ -172,29 +150,6 @@ RUN echo "Setting time zone to '${TZ}'" \
 # Regarding urandom see
 #  http://stackoverflow.com/q/26021181/511069
 #  https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
-# RUN apt-get -qqy update \
-#   && apt-get -qqy install \
-#     software-properties-common \
-#   && echo debconf shared/accepted-oracle-license-v1-1 \
-#       select true | debconf-set-selections \
-#   && echo debconf shared/accepted-oracle-license-v1-1 \
-#       seen true | debconf-set-selections \
-#   && add-apt-repository ppa:webupd8team/java \
-#   && apt-get -qqy update \
-#   && apt-get -qqy install \
-#     oracle-java8-installer \
-#   && sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
-#        /usr/lib/jvm/java-8-oracle/jre/lib/security/java.security \
-#   && sed -i 's/securerandom.source=file:\/dev\/random/securerandom.source=file:\/dev\/.\/urandom/g' \
-#        /usr/lib/jvm/java-8-oracle/jre/lib/security/java.security \
-#   && rm -rf /var/lib/apt/lists/*
-
-#==================
-# Java9 - Oracle
-#==================
-# Regarding urandom see
-#  http://stackoverflow.com/q/26021181/511069
-#  https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
 RUN apt-get -qqy update \
   && apt-get -qqy install \
     software-properties-common \
@@ -205,13 +160,36 @@ RUN apt-get -qqy update \
   && add-apt-repository ppa:webupd8team/java \
   && apt-get -qqy update \
   && apt-get -qqy install \
-    oracle-java9-installer \
+    oracle-java8-installer \
   && sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
-       /usr/lib/jvm/java-9-oracle/conf/security/java.security \
+       /usr/lib/jvm/java-8-oracle/jre/lib/security/java.security \
   && sed -i 's/securerandom.source=file:\/dev\/random/securerandom.source=file:\/dev\/.\/urandom/g' \
-       /usr/lib/jvm/java-9-oracle/conf/security/java.security \
+       /usr/lib/jvm/java-8-oracle/jre/lib/security/java.security \
   && rm -rf /var/lib/apt/lists/*
 
+#================
+# Java9 - Oracle
+#================
+# Regarding urandom see
+#  http://stackoverflow.com/q/26021181/511069
+#  https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
+# RUN apt-get -qqy update \
+#   && apt-get -qqy install \
+#     software-properties-common \
+#   && echo debconf shared/accepted-oracle-license-v1-1 \
+#       select true | debconf-set-selections \
+#   && echo debconf shared/accepted-oracle-license-v1-1 \
+#       seen true | debconf-set-selections \
+#   && add-apt-repository ppa:webupd8team/java \
+#   && apt-get -qqy update \
+#   && apt-get -qqy install \
+#     oracle-java9-installer \
+#   && sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
+#        /usr/lib/jvm/java-9-oracle/conf/security/java.security \
+#   && sed -i 's/securerandom.source=file:\/dev\/random/securerandom.source=file:\/dev\/.\/urandom/g' \
+#        /usr/lib/jvm/java-9-oracle/conf/security/java.security \
+#   && rm -rf /var/lib/apt/lists/*
+
 #=========================
 # Fonts & video libraries
 #=========================
@@ -353,9 +331,9 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
   && mv websockify-${WEBSOCKIFY_SHA} \
        ${NORMAL_USER_HOME}/noVNC/utils/websockify
 
-#===============================
-# ffmpeg/libav and video codecs
-#===============================
+#======================================
+# ffmpeg/libav/avconv and video codecs
+#======================================
 # ffmpeg (ffmpeg): Is a better alternative to Pyvnc2swf
 #   (use in Ubuntu >= 15) packages: ffmpeg
 # RUN apt-get -qqy update \
@@ -366,9 +344,9 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
 #     ffmpeg \
 #   && rm -rf /var/lib/apt/lists/*
 
-#===============================
-# ffmpeg/libav and video codecs
-#===============================
+#======================================
+# ffmpeg/libav/avconv and video codecs
+#======================================
 # libav-tools (avconv): Is a fork of ffmpeg
 #   (use in Ubuntu <= 14) packages: libav-tools libx264-142
 RUN apt-get -qqy update \
@@ -800,7 +778,7 @@ ENV CHROME_DRIVER_FILE "chromedriver_linux${CPU_ARCH}.zip"
 ENV CHROME_DRIVER_BASE "chromedriver.storage.googleapis.com"
 # Gets latest chrome driver version. Or you can hard-code it, e.g. 2.15
 RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
-  && CHROME_DRIVER_VERSION="2.24" \
+  && CHROME_DRIVER_VERSION="2.25" \
   && CHROME_DRIVER_URL="https://${CHROME_DRIVER_BASE}/${CHROME_DRIVER_VERSION}/${CHROME_DRIVER_FILE}" \
   && wget -nv -O chromedriver_linux${CPU_ARCH}.zip ${CHROME_DRIVER_URL} \
   && cd ${SEL_HOME} \
@@ -1113,7 +1091,6 @@ ENV DEFAULT_SELENIUM_HUB_PORT="24444" \
 #   Run docker from inside docker
 #   Usage: docker run -v /var/run/docker.sock:/var/run/docker.sock
 #                     -v $(which docker):$(which docker)
-
 ENV FIREFOX_VERSION="${FF_VER}" \
   USE_SELENIUM="2" \
   CHROME_FLAVOR="stable" \
@@ -1205,6 +1182,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   VIDEO_FLUSH_SECS="0.5" \
   VIDEO_CHUNK_SECS="00:05:00" \
   VIDEO_CHUNKS_MAX=999 \
+  VIDEO_STOP_SLEEP_SECS="1" \
   VIDEOS_DIR="${NORMAL_USER_HOME}/videos" \
   XMANAGER="fluxbox" \
   SAUCE_TUNNEL="false" \
@@ -1316,6 +1294,7 @@ WORKDIR ${NORMAL_USER_HOME}
 # ENTRYPOINT ["entry.sh"]
 # CMD ["supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 
-# Using the string form `CMD "entry.sh"` causes Docker to run your process
-# using bash which doesn’t handle signals properly
+# IMPORTANT: Using the string form `CMD "entry.sh"` without
+# brackets [] causes Docker to run your process
+# And using `bash` which doesn’t handle signals properly
 CMD ["entry.sh"]

TBD_DOCKER_TAG.md

@@ -17,7 +17,7 @@
   + BrowserStack Local version TBD_BROWSER_STACK_VERSION
   + Tested on kernel dev host: 4.4.0-45-generic x86_64
   + Tested on kernel CI  host: TBD_HOST_UNAME
-  + Built at dev host with: Docker version 1.12.2, build bb80604
+  + Built at dev host with: Docker version 1.12.3, build 6b644ec
   + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
   + Built at dev host with: Docker Compose version 1.8.1, build 878cff1
   + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD

browserstack/bin/start-browserstack.sh

@@ -40,7 +40,7 @@ function shutdown {
 # Now wait for the tunnel to be ready
 timeout --foreground ${BSTACK_WAIT_TIMEOUT} wait-browserstack.sh
 
-# Run function shutdown() when this process a killer signal
+# Run function shutdown() when this process receives a killing signal
 trap shutdown SIGTERM SIGINT SIGKILL
 
 # tells bash to wait until child processes have exited

host-scripts/expose_ports.sh

@@ -45,7 +45,7 @@ for i in "${MYAPP_PORTS[@]}"; do
   ssh ${BASE_SSH_CMD} -R localhost:${i}:localhost:${i} &
 done
 
-# Run function shutdown() when this process a killer signal
+# Run function shutdown() when this process receives a killing signal
 trap shutdown SIGTERM SIGINT SIGKILL
 
 # tells bash to wait until child processes have exited

saucelabs/bin/start-saucelabs.sh

@@ -76,7 +76,7 @@ while ! ls -l "${SAUCE_TUNNEL_READY_FILE}" >/dev/null 2>&1; do sleep 0.1; done
 # Now wait for the tunnel to be ready
 timeout --foreground ${SAUCE_WAIT_TIMEOUT} wait-saucelabs.sh
 
-# Run function shutdown() when this process a killer signal
+# Run function shutdown() when this process receives a killing signal
 trap shutdown SIGTERM SIGINT SIGKILL
 
 # tells bash to wait until child processes have exited

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

@@ -59,7 +59,7 @@ function trappedFn {
   echo "-- INFO: Trapped SIGTERM/SIGINT on Chrome NODE"
   shutdown
 }
-# Run function shutdown() when this process a killer signal
+# Run function shutdown() when this process receives a killing signal
 trap trappedFn SIGTERM SIGINT SIGKILL
 
 # tells bash to wait until child processes have exited

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

@@ -61,7 +61,7 @@ function trappedFn {
   echo "-- INFO: Trapped SIGTERM/SIGINT on Firefox NODE"
   shutdown
 }
-# Run function shutdown() when this process a killer signal
+# Run function shutdown() when this process receives a killing signal
 trap trappedFn SIGTERM SIGINT SIGKILL
 
 # tells bash to wait until child processes have exited