Fix travis-ci build and show Travis CI badges

Upgrade Ubuntu xenial-20160331.1 date + other fix

Only docker login when needed + Upgrade Chrome

Author: elgalu

.gitignore

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

.travis.yml

@@ -3,6 +3,12 @@ sudo: required
 services:
   - docker
 
+# Even though we run everything inside docker Travis require us to pick a
+# language else it will pick Ruby by default
+language: python
+python:
+  - "2.7"
+
 env:
   - TEST_SLEEPS="0.7"
 
@@ -12,25 +18,22 @@ env:
 #   -p tcp -d 172.17.0.1 --dport 24444 -j ACCEPT:
 #   iptables: No chain/target/match by that name. (exit status 1)
 before_install:
-  - docker build -t selenium .
+  - ./test/before_install_setup
+  - travis_retry ./test/before_install_build
 
 install:
-  - docker run --name=grid -d -e VIDEO=true -v /dev/shm:/dev/shm selenium
-  - docker exec -ti grid wait_all_done 40s
-  - docker exec grid versions
-  - docker exec grid errors || true
-  - docker logs grid
+  - ./test/install
 
 # Note: If we try to use `--net` Travis fails with System error: permission denied
 # Note: If we try to use `--link` Selenium fails with ConnectionRefusedError after
 #  connect to selenium at http://172.17.0.4:24444/wd/hub
 # Unless, we use `--privileged` trick by Hiro Asari from Travis Corp.
 script:
-  - docker exec -ti grid test
-  - docker cp grid:/test/console.png images/grid_console.png
+  - ./test/script_scenario_1
+  - ./test/script_scenario_2
+  - ./test/script_archive
+  - ./test/script_push
 
 # cleanup though doesn't seem to be necessary in Travis infra
 after_script:
-  - docker exec grid stop || true
-  - docker stop grid || true
-  - docker rm grid || true
+  - ./test/after_script

CHANGELOG.md

@@ -7,6 +7,32 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## 2.53.0f
+ + Date: 2016-04-07
+ + Fix & chores to travis-ci build. Show Travis CI badges
+ + Fixing clear_x_locks.sh
+ + Upgrade Ubuntu xenial to 20160331.1
+ + Upgrade Java 9 build 9-ea+112 patch level
+ + Upgrade BrowserStack local to 5.2
+ + Upgrade Chrome patch to 49.0.2623.112
+ + Image tag details:
+  + Selenium: v2.53.0 (35ae25b)
+  + Chrome stable:  49.0.2623.112
+  + Firefox stable: 45.0.1
+  + Chromedriver: 2.21.371461 (633e689b520b25f3e264a2ede6b74ccc23cb636a)
+  + Java: Oracle Java 9 build 9-ea+112
+  + Timezone: Europe/Berlin
+  + FROM ubuntu:xenial-20160331.1
+  + Python: 2.7.11
+  + Sauce Connect 4.3.14, build 2010 d6099dc
+  + BrowserStack Local version 5.2
+  + Tested on kernel dev host..: 4.2.0-35-generic x86_64
+  + Tested on kernel CI host...: TBD_HOST_UNAME
+  + Built with: TBD_BUILT_WITH
+  + Image size: TBD_IMAGE_SIZE
+  + Digest: TBD_DIGEST
+  + Image ID: TBD_IMAGE_ID
+
 ## 2.53.0e
  + Date: 2016-03-30
  + Upgrade Chrome to 49.0.2623.110

CONTRIBUTING.md

@@ -0,0 +1,29 @@
+# Contributing
+
+## Local
+    ./test/before_install_build && ./test/install
+    ./test/script_scenario_1 && ./test/script_scenario_2
+    ./test/script_archive && ./test/script_push && ./test/after_script
+    open ./videos/chrome/test.mkv
+    travis lint
+    git checkout -b tmp-2.53.0f
+    git commit -m "Only docker login when needed in travis-ci"
+    git tag 2.53.0f && git push origin tmp-2.53.0f && git push --tags
+    #if Travis passes OK and changes got merged into master by elgalubot
+    git push origin --delete tmp-2.53.0f
+
+## 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.
+
+### Requirements
+
+* Ruby
+* `gem install travis --no-rdoc --no-ri`
+* `travis login --user elgalu`
+* Encrypt environment variables with travis cli
+
+### Encrypt
+    travis env set DOCKER_EMAIL [email protected]
+    travis env set DOCKER_USERNAME elgalubot
+     travis env set DOCKER_PASSWORD secretsecret #1st space in purpose
+     travis env set GH_TOKEN secretsecret

Dockerfile

@@ -3,8 +3,7 @@
 ###################################################
 #== Ubuntu xenial is 16.04, i.e. FROM ubuntu:16.04
 # search for more at https://registry.hub.docker.com/_/ubuntu/tags/manage/
-# next:     xenial-TBD
-FROM ubuntu:xenial-20160317
+FROM ubuntu:xenial-20160331.1
 ENV UBUNTU_FLAVOR xenial
 
 #== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
@@ -602,6 +601,16 @@ RUN SHA="e4a37c6f8d1cb68f3813c7fdbcfee9a929788a75" \
 #       && rm firefox-${FF_VER}.${FF_LANG}.linux64.tar.bz2 \
 #      ;done
 
+#-----------#
+# dumb-init #
+#-----------#
+# Use dumb-init to allow `docker stop` to end gracefully
+#  result: it didn't help
+# RUN export DUMB_VERS="1.0.1" \
+#   && wget -nv -O /tmp/dumb-init.deb \
+#      "https://github.com/Yelp/dumb-init/releases/download/v${DUMB_VERS}/dumb-init_${DUMB_VERS}_amd64.deb" \
+#   && dpkg -i /tmp/dumb-init.deb
+
 # ------------------------#
 # Sauce Connect Tunneling #
 # ------------------------#
@@ -1074,8 +1083,9 @@ ADD utils/bin/selenium-grep.sh /usr/bin/errors
 ADD xterm/bin/timeout-wait-xterm.sh /usr/bin/wait_all_done
 ADD host-scripts/* /host-scripts/
 ADD test/* /test/
-ADD test/hola.py /usr/bin/hola
-ADD test/test.sh /usr/bin/test
+ADD test/run_test.sh /usr/bin/run_test
+ADD test/selenium_test.sh /usr/bin/selenium_test
+ADD test/python_test.py /usr/bin/python_test
 
 #==================
 # Fix dirs (again)

README.md

@@ -1,4 +1,5 @@
 # Selenium in Docker with Chrome and Firefox
+[![Build Status](https://travis-ci.org/elgalu/docker-selenium.svg?branch=master)](https://travis-ci.org/elgalu/docker-selenium)
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/elgalu/docker-selenium?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 * selenium server grid with 2 nodes (chrome & firefox)
@@ -13,7 +14,7 @@
 
 ![docker-selenium-grid](./images/grid_console.png)
 
-## Note this repo evolved into SeleniumHQ/docker-selenium
+## Notes on similar repo: SeleniumHQ/docker-selenium
 See: https://github.com/SeleniumHQ/docker-selenium
 
 Note SeleniumHQ/docker-selenium project is more useful for building selenium grids while this one focuses on building disposable standalone seleniums with [video recording support](./docs/videos.md) and both browsers on the same container. It also adds some other features like [customizing the screen size](#screen-size) and [ssh access](#ssh) that can be particularly useful for tunneling support.
@@ -22,10 +23,10 @@ Note SeleniumHQ/docker-selenium project is more useful for building selenium gri
 
 In general add `sudo` only if needed in your environment and `--privileged` or `-v /dev/shm:/dev/shm` if you really need it like when [Chrome crashes](https://github.com/elgalu/docker-selenium/issues/20) during your high gpu intensive tests.
 
-    docker pull elgalu/selenium:2.53.0e
+    docker pull elgalu/selenium:2.53.0f
 
     docker run --rm -ti --name=grid -p 4444:24444 -p 5920:25900 \
-      -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.53.0e
+      -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.53.0f
 
 Make sure `docker run` finishes via active wait with below command. This is **mandatory** before start running your tests! Note `grid` is the name of the container:
 
@@ -55,7 +56,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=5920: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.0e
+      -v /dev/shm:/dev/shm elgalu/selenium:2.53.0f
 
 Then
 
@@ -66,7 +67,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=5920: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.0e
+      -v /dev/shm:/dev/shm elgalu/selenium:2.53.0f
 
 Then
 
@@ -84,12 +85,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.0e
+    docker pull elgalu/selenium:2.53.0f
 
     docker run -d --name=grid -p 4444:24444 -p 5920:25900 \
       -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola \
       -e SCREEN_WIDTH=1920 -e SCREEN_HEIGHT=1480 \
-      elgalu/selenium:2.53.0e
+      elgalu/selenium:2.53.0f
 
     docker exec grid wait_all_done 10s
 
@@ -142,7 +143,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 5920:25900 \
       -v /dev/shm:/dev/shm -p 6080:26080 -e NOVNC=true \
-      elgalu/selenium:2.53.0e
+      elgalu/selenium:2.53.0f
 
 If the VNC password was randomly generated find out with
 
@@ -211,9 +212,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.0e
+    # e.g. full image id for tag 2.53.0f
     export IMGID="<<Please see CHANGELOG.md>>"
-    if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0e |grep ${IMGID} &> /dev/null; then
+    if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0f |grep ${IMGID} &> /dev/null; then
         echo "Image ID tested ok"
     else
         echo "Image ID doesn't match"
@@ -223,7 +224,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.0e
+    # e.g. sha256 for tag 2.53.0f
     export SHA=<<Please see CHANGELOG.md>>
     docker pull elgalu/selenium@sha256:${SHA}
 
@@ -250,7 +251,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.0e
+      elgalu/selenium:2.53.0f
 
 Now when you run your tests instead of connecting. If docker run fails try `xhost +`
 
@@ -272,7 +273,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.0e
+    -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.53.0f
 
 # -- 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
@@ -282,7 +283,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.0e
+    elgalu/selenium:2.53.0f
 
 # -- Common: Wait for the container to start
 ./host-scripts/wait-docker-selenium.sh grid 7s
@@ -353,7 +354,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.0e
+    docker pull elgalu/selenium:2.53.0f
 
 #### 2. Use this image