Upgrade Firefox 46.0.1 & Ubuntu 20160503

Author: elgalu

.dockerignore

@@ -8,3 +8,4 @@ videos/
 android/
 binaries
 *.md
+bats/

.gitignore

@@ -10,3 +10,4 @@ binaries
 scm-source.json
 TODO.md
 docker_push.log
+bats/

CHANGELOG.md

@@ -7,6 +7,29 @@ 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 Firefox patch to TBD_FIREFOX_STABLE
+ + Upgrade Ubuntu xenial date to UBUNTU_DATE
+ + 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-22-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.11.1, build 5604cbe
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+  + Image size: TBD_IMAGE_SIZE
+  + Digest: TBD_DIGEST
+  + Image ID: TBD_IMAGE_ID
+
 ## 2.53.0k
  + Date: 2016-04-29
  + Upgrade Chrome patch to 50.0.2661.94
@@ -23,7 +46,7 @@ Note image ids also change after scm-source.json has being updated which trigger
   + BrowserStack Local version 5.4
   + Tested on kernel dev host: 4.4.0-22-generic x86_64
   + Tested on kernel CI  host: 3.19.0-30-generic x86_64
-  + Built at dev host with: Docker version 1.11.0, build 4dc5990
+  + Built at dev host with: Docker version 1.11.1, build 5604cbe
   + Built at CI  host with: Docker version 1.11.1, build 5604cbe
   + Image size: 2.814 GB
   + Digest: sha256:de1cf160aff739f189001aa603a5ea3feba0f6672e3ef1fe73222fdae1673789

CONTRIBUTING.md

@@ -4,26 +4,24 @@
 For pull requests:
 
     ./test/before_install_build && ./test/install
-    #or: ./test/script
-     ./test/script_scenario_1 && ./test/script_scenario_2
-     ./test/script_archive && ./test/script_push
+    ./test/script
     ./test/after_script #or: docker exec grid versions
     open ./images/grid_console.png #to verify the versions are correct
     git checkout ./images/grid_console.png && open ./videos/chrome/test.mkv
     travis lint #if you changed .travis.yml
-    git checkout -b tmp-2.53.0k #name your branch according to your changes
+    git checkout -b tmp-2.53.0l #name your branch according to your changes
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Upgrade Chrome patch to 50.0.2661.94"
+    git commit -m "Upgrade Firefox 46.0.1 & Ubuntu 20160503"
     git tag -d latest #tag latest will be updated from TravisCI
-    git tag 2.53.0k && git push origin tmp-2.53.0k && git push --tags
+    git tag 2.53.0l && git push origin tmp-2.53.0l && 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.0k && git push origin --delete tmp-2.53.0k
+    git checkout master && git pull && git branch -d tmp-2.53.0l && git push origin --delete tmp-2.53.0l
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- Upgrade release tag in github.com with latest CHANGELOG.md
@@ -40,9 +38,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 2.53.0k && git push origin :2.53.0k
+    git tag -d 2.53.0l && git push origin :2.53.0l
     #git add ...
-    git commit --amend && git tag 2.53.0k && git push --force origin tmp-2.53.0k && git push --tags
+    git commit --amend && git tag 2.53.0l && git push --force origin tmp-2.53.0l && 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

@@ -3,9 +3,9 @@
 ###################################################
 #== Ubuntu xenial is 16.04, i.e. FROM ubuntu:16.04
 # search for more at https://registry.hub.docker.com/_/ubuntu/tags/manage/
-FROM ubuntu:xenial-20160422
+FROM ubuntu:xenial-20160503
 ENV UBUNTU_FLAVOR="xenial" \
-    UBUNTU_DATE="20160422"
+    UBUNTU_DATE="20160503"
 
 #== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
 # FROM ubuntu:wily-20151208
@@ -678,7 +678,7 @@ RUN cd /tmp \
 # FF_LANG can be either en-US // de // fr and so on
 # Regarding the pip packages, see released versions at:
 #  https://github.com/mozilla/mozdownload/releases
-ENV FF_VER="46.0" \
+ENV FF_VER="46.0.1" \
     FF_LANG="en-US" \
     FF_PLATFORM="linux-x86_64" \
     FF_BASE_URL="https://archive.mozilla.org/pub" \

README.md

@@ -28,10 +28,10 @@ The purpose of this project is to have [Selenium][] running as simple and as fas
 
 1. Pull the image and run the container
 
-        docker pull elgalu/selenium:2.53.0k
+        docker pull elgalu/selenium:2.53.0l
 
         docker run --rm -ti --name=grid -p 4444:24444 -p 5900:25900 \
-            -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.53.0k
+            -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.53.0l
 
 2. Wait until the grid starts properly before starting the tests _(Optional but recommended)_
 
@@ -66,7 +66,7 @@ You can also ssh into the machine as long as `SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa
     docker run --rm -ti --name=grid -p=4444:24444 -p=5900:25900 -p=22222:22222 \
       -e SSHD=true \
       -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" \
-      -v /dev/shm:/dev/shm elgalu/selenium:2.53.0k
+      -v /dev/shm:/dev/shm elgalu/selenium:2.53.0l
 
 Then
 
@@ -77,7 +77,7 @@ Include `-X` in ssh command if you want to redirect the started GUI programs to
     docker run --rm -ti --name=grid -p=4444:24444 -p=5900:25900 -p=22222:22222 \
       -e SSHD=true -e SSHD_X11FORWARDING=yes \
       -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" \
-      -v /dev/shm:/dev/shm elgalu/selenium:2.53.0k
+      -v /dev/shm:/dev/shm elgalu/selenium:2.53.0l
 
 Then
 
@@ -95,12 +95,12 @@ Supervisor exposes an http server but is not enough to bind the ports via `docke
 ### Screen size
 You can set a custom screen size at docker run time by providing `SCREEN_WIDTH` and `SCREEN_HEIGHT` environment variables:
 
-    docker pull elgalu/selenium:2.53.0k
+    docker pull elgalu/selenium:2.53.0l
 
     docker run -d --name=grid -p 4444:24444 -p 5900:25900 \
       -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola \
       -e SCREEN_WIDTH=1920 -e SCREEN_HEIGHT=1480 \
-      elgalu/selenium:2.53.0k
+      elgalu/selenium:2.53.0l
 
     docker exec grid wait_all_done 10s
 
@@ -158,7 +158,7 @@ You need to pass the environment variable `-e NOVNC=true` in order to start the
 
     docker run --rm -ti --name=grid -p 4444:24444 -p 5900:25900 \
       -v /dev/shm:/dev/shm -p 6080:26080 -e NOVNC=true \
-      elgalu/selenium:2.53.0k
+      elgalu/selenium:2.53.0l
 
 If the VNC password was randomly generated find out with
 
@@ -231,9 +231,9 @@ There are also additional steps you can take to ensure you're using the correct
 
 You can simply verify that image id is indeed the correct one.
 
-    # e.g. full image id for tag 2.53.0k
+    # e.g. full image id for tag 2.53.0l
     export IMGID="<<Please see CHANGELOG.md>>"
-    if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0k |grep ${IMGID} &> /dev/null; then
+    if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0l |grep ${IMGID} &> /dev/null; then
         echo "Image ID tested ok"
     else
         echo "Image ID doesn't match"
@@ -243,7 +243,7 @@ You can simply verify that image id is indeed the correct one.
 
 Given docker.io currently allows to push the same tag image twice this represent a security concern but since docker >= 1.6.2 is possible to fetch the digest sha256 instead of the tag so you can be sure you're using the exact same docker image every time:
 
-    # e.g. sha256 for tag 2.53.0k
+    # e.g. sha256 for tag 2.53.0l
     export SHA=<<Please see CHANGELOG.md>>
     docker pull elgalu/selenium@sha256:${SHA}
 
@@ -275,7 +275,7 @@ Host machine, terminal 2:
       -v /dev/shm:/dev/shm \
       -e SCREEN_WIDTH -e SCREEN_HEIGHT -e XE_DISP_NUM \
       -v /tmp/.X11-unix/X${XE_DISP_NUM}:/tmp/.X11-unix/X${XE_DISP_NUM} \
-      elgalu/selenium:2.53.0k
+      elgalu/selenium:2.53.0l
 
 Now when you run your tests instead of connecting. If docker run fails try `xhost +`
 
@@ -297,7 +297,7 @@ ANYPORT=0
 REMOTE_DOCKER_SRV=localhost
 CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -p=0.0.0.0:${ANYPORT}:24444 \
     -p=0.0.0.0:${ANYPORT}:25900 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola \
-    -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.53.0k
+    -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.53.0l
 
 # -- Option 2.docker run- Running docker on remote docker server like in the cloud
 # Useful if the docker server is running in the cloud. Establish free local ports
@@ -307,7 +307,7 @@ ssh ${REMOTE_DOCKER_SRV} #get into the remote docker provider somehow
 # it acts as a jump host so my public key is already on that server
 CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -e SCREEN_HEIGHT=1110 \
     -e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/authorized_keys)" \
-    elgalu/selenium:2.53.0k
+    elgalu/selenium:2.53.0l
 
 # -- Common: Wait for the container to start
 ./host-scripts/wait-docker-selenium.sh grid 7s
@@ -378,7 +378,7 @@ If you git clone this repo locally, i.e. cd into where the Dockerfile is, you ca
 
 If you prefer to download the final built image from docker you can pull it, personally I always prefer to build them manually except for the base images like Ubuntu 14.04.2:
 
-    docker pull elgalu/selenium:2.53.0k
+    docker pull elgalu/selenium:2.53.0l
 
 ### 2. Use this image
 

bin/entry.sh

@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-# Exit immediately if a command exits with a non-zero status
-# set -e
-
 #-----------------------------------------------
 # Perform cleanup to support `docker restart`
 stop 2>&1 >/dev/null || true

bin/functions.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# https://github.com/SeleniumHQ/docker-selenium/issues/184
+function get_server_num() {
+  echo $(echo $DISPLAY | sed -r -e 's/([^:]+)?:([0-9]+)(\.[0-9]+)?/\2/')
+}

browserstack/bin/start-browserstack.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Exit immediately if a command exits with a non-zero status
+# set -e: exit asap if a command exits with a non-zero status
 set -e
 
 # echo fn that outputs to stderr http://stackoverflow.com/a/2990533/511069

browserstack/bin/wait-browserstack.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Exit immediately if a command exits with a non-zero status
+# set -e: exit asap if a command exits with a non-zero status
 set -e
 
 # echo fn that outputs to stderr http://stackoverflow.com/a/2990533/511069