Upgrade Firefox 46 & Ubuntu 20160422. Fixes #83

Author: elgalu

.travis.yml

@@ -20,10 +20,7 @@ install:
   - ./test/install
 
 script:
-  - travis_retry ./test/script_scenario_1
-  - ./test/script_scenario_2
-  - ./test/script_archive
-  - ./test/script_push
+  - ./test/script
 
 # cleanup though doesn't seem to be necessary in Travis infra
 after_script:

CHANGELOG.md

@@ -9,7 +9,10 @@ Note image ids also change after scm-source.json has being updated which trigger
 
 ## TBD_DOCKER_TAG
  + Date: TBD_DATE
- + TBD_COMMIT_MSG
+ + Upgrade Firefox major to 46.0
+ + Upgrade Ubuntu xenial date to 20160422
+ + Fix bug #83 on `docker restart`
+ + Bump supervisor commit
  + Image tag details:
   + Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
   + Chrome stable:  TBD_CHROME_STABLE
@@ -21,7 +24,7 @@ Note image ids also change after scm-source.json has being updated which trigger
   + 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-21-generic x86_64
+  + 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.0, build 4dc5990
   + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

CONTRIBUTING.md

@@ -3,26 +3,28 @@
 ## Local
 For pull requests:
 
-    ./test/before_install_build && ./test/install && ./test/script_scenario_1
-    ./test/script_scenario_2 && ./test/script_archive && ./test/script_push
-     ./test/after_script
+    ./test/before_install_build && ./test/install
+    #or: ./test/script
+     ./test/script_scenario_1 && ./test/script_scenario_2
+     ./test/script_archive && ./test/script_push
+    ./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.0i #name your branch according to your changes
+    git checkout -b tmp-2.53.0j #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.86"
+    git commit -m "Upgrade Firefox 46 & Ubuntu 20160422. Fixes #83"
     git tag -d latest #tag latest will be updated from TravisCI
-    git tag 2.53.0i && git push origin tmp-2.53.0i && git push --tags
+    git tag 2.53.0j && git push origin tmp-2.53.0j && git push --tags
 
 -- Wait for Travis to pass OK
--- Make shure changes got merged into master by elgalubot
+-- Make sure changes got merged into master by elgalubot
 -- Duplicate section in CHANGELOG.md starting with TBD_DOCKER_TAG
 
-    git checkout master && git pull && git branch -d tmp-2.53.0i && git push origin --delete tmp-2.53.0i
+    git checkout master && git pull && git branch -d tmp-2.53.0j && git push origin --delete tmp-2.53.0j
 
 -- Upgrade release tag in github.com with latest CHANGELOG.md
 -- If Chrome version changed upload:
@@ -38,9 +40,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 2.53.0i && git push origin :2.53.0i
+    git tag -d 2.53.0j && git push origin :2.53.0j
     #git add ...
-    git commit --amend && git tag 2.53.0i && git push --force origin tmp-2.53.0i && git push --tags
+    git commit --amend && git tag 2.53.0j && git push --force origin tmp-2.53.0j && 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-20160331.1
+FROM ubuntu:xenial-20160422
 ENV UBUNTU_FLAVOR="xenial" \
-    UBUNTU_DATE="20160331.1"
+    UBUNTU_DATE="20160422"
 
 #== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
 # FROM ubuntu:wily-20151208
@@ -498,12 +498,13 @@ ENV SEL_HOME ${NORMAL_USER_HOME}/selenium
 # RUN apt-get update -qqy \
 #   && apt-get -qqy install \
 #     supervisor \
+# 2016-04-11 commit: 3e541a34a4ab74, version: supervisor-4.0.0.dev0
 # 2016-03-06 commit: e4a37c6f8d1cb6, version: supervisor-4.0.0.dev0
 # 2016-02-01 commit: eb904ccdb3573e, version: supervisor-4.0.0.dev0
 # 2015-06-24 commit: b3ad59703b554f, version: supervisor-4.0.0.dev0
 # 2015-08-24 commit: 304b4f388d3e3f, supervisor/version.txt: 4.0.0.dev0
 # TODO: Upgrade to supervisor stable 4.0 as soon as is released
-RUN SHA="e4a37c6f8d1cb68f3813c7fdbcfee9a929788a75" \
+RUN SHA="3e541a34a4ab741e67ff4406eb2727599903c6e3" \
   && pip install --upgrade \
       "https://github.com/Supervisor/supervisor/zipball/${SHA}" \
   && rm -rf /var/lib/apt/lists/*
@@ -677,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="45.0.2" \
+ENV FF_VER="46.0" \
     FF_LANG="en-US" \
     FF_PLATFORM="linux-x86_64" \
     FF_BASE_URL="https://archive.mozilla.org/pub" \

README.md

@@ -19,20 +19,24 @@
 
 Note [SeleniumHQ/docker-selenium](https://github.com/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.
 
+### Purpose
+
+The purpose of this project is to have [Selenium][] running as simple and as fast as possible.
+
 ### Run
 
 1. Pull the image and run the container
 
-        docker pull elgalu/selenium:2.53.0i
+        docker pull elgalu/selenium:2.53.0j
 
         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.0i
+            -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.53.0j
 
 2. Wait until the grid starts properly before starting the tests _(Optional but recommended)_
 
         docker exec grid wait_all_done 30s
 
-After this, Selenium should be up and running at `http://localhost:4444/wd/hub`. Open the url in your browser to confirm it is running.
+After this, [Selenium][] should be up and running at `http://localhost:4444/wd/hub`. Open the url in your browser to confirm it is running.
 If you are using Mac (OSX) or [Microsoft Windows](https://docs.docker.com/engine/installation/windows/) `localhost` won't work! Find out the correct IP through `boot2docker ip` or `docker-machine ip default`.
 
 **Notes:**
@@ -61,7 +65,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.0i
+      -v /dev/shm:/dev/shm elgalu/selenium:2.53.0j
 
 Then
 
@@ -72,7 +76,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.0i
+      -v /dev/shm:/dev/shm elgalu/selenium:2.53.0j
 
 Then
 
@@ -90,12 +94,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.0i
+    docker pull elgalu/selenium:2.53.0j
 
     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.0i
+      elgalu/selenium:2.53.0j
 
     docker exec grid wait_all_done 10s
 
@@ -153,7 +157,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.0i
+      elgalu/selenium:2.53.0j
 
 If the VNC password was randomly generated find out with
 
@@ -226,9 +230,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.0i
+    # e.g. full image id for tag 2.53.0j
     export IMGID="<<Please see CHANGELOG.md>>"
-    if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0i |grep ${IMGID} &> /dev/null; then
+    if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0j |grep ${IMGID} &> /dev/null; then
         echo "Image ID tested ok"
     else
         echo "Image ID doesn't match"
@@ -238,7 +242,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.0i
+    # e.g. sha256 for tag 2.53.0j
     export SHA=<<Please see CHANGELOG.md>>
     docker pull elgalu/selenium@sha256:${SHA}
 
@@ -270,7 +274,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.0i
+      elgalu/selenium:2.53.0j
 
 Now when you run your tests instead of connecting. If docker run fails try `xhost +`
 
@@ -292,7 +296,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.0i
+    -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.53.0j
 
 # -- 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
@@ -302,7 +306,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.0i
+    elgalu/selenium:2.53.0j
 
 # -- Common: Wait for the container to start
 ./host-scripts/wait-docker-selenium.sh grid 7s
@@ -373,7 +377,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.0i
+    docker pull elgalu/selenium:2.53.0j
 
 ### 2. Use this image
 
@@ -482,3 +486,4 @@ Powered by Supervisor, the container leaves many logs;
 
 
 [2.47.1m]: https://github.com/elgalu/docker-selenium/releases/tag/2.47.1m
+[Selenium]: https://github.com/SeleniumHQ/selenium

READMELeo.md

@@ -1,13 +1,13 @@
 ## Build
 
     time (docker build -t="elgalu/selenium:local" . ;echo $?;beep)
-    docker run --rm -ti -m 3000M --name=grid -p=4444:24444 -p=5920:25900 -e VIDEO=true -v /dev/shm:/dev/shm elgalu/selenium:local
+    docker run --rm -ti -m 3000M --name=local -p=4444:24444 -p=5900:25900 -e VIDEO=true -v /dev/shm:/dev/shm elgalu/selenium:local
 
 ### Wait
 Wait and get versions
 
-    docker exec grid wait_all_done 30s
-    docker exec grid versions
+    docker exec local wait_all_done 30s
+    docker exec local versions
 
 ### Tests
 See [CONTRIBUTING](./CONTRIBUTING.md)
@@ -23,13 +23,13 @@ Push setup, first time only:
 
 Build a grid with extra nodes
 
-    docker run --rm --name=grid -p 4444:24444 -p 5920:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:local
+    docker run --rm --name=local -p 4444:24444 -p 5900:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:local
 
-    docker run --rm --name=node -e DISP_N=13 -e SSHD_PORT=22223 -e SUPERVISOR_HTTP_PORT=29003 -e VNC_PORT=25903 -e SELENIUM_NODE_CH_PORT=25330 -e SELENIUM_NODE_FF_PORT=25331 -e GRID=false -e CHROME=true -e FIREFOX=true --net=container:grid elgalu/selenium:local
+    docker run --rm --name=node -e DISP_N=13 -e SSHD_PORT=22223 -e SUPERVISOR_HTTP_PORT=29003 -e VNC_PORT=25903 -e SELENIUM_NODE_CH_PORT=25330 -e SELENIUM_NODE_FF_PORT=25331 -e GRID=false -e CHROME=true -e FIREFOX=true --net=container:local elgalu/selenium:local
 
 See logs
 
-    docker exec -ti grid bash -c "ls -lah /var/log/cont/"
+    docker exec -ti local bash -c "ls -lah /var/log/cont/"
 
 ## Transfer used browser source artifacts to keep them in the cloud
 
@@ -39,11 +39,11 @@ See logs
 
 List chrome versions via docker exec
 
-    docker exec -ti grid bash -c "ls -lah /home/application/chrome-deb/"
+    docker exec -ti local bash -c "ls -lah /home/application/chrome-deb/"
 
 List firefox versions via docker exe
 
-    docker exec -ti grid bash -c "ls -lah /home/application/firefox-src/ && ls -lah /home/application/selenium/firefox**/firefox/firefox"
+    docker exec -ti local bash -c "ls -lah /home/application/firefox-src/ && ls -lah /home/application/selenium/firefox**/firefox/firefox"
 
 ## Transfer the other way around
 
@@ -57,17 +57,17 @@ List firefox versions via docker exe
 
 ## Run with shared dir
 
-    docker run --rm --name=grid -p=127.0.0.1:4460:24444 -p=127.0.0.1:5910:25900 \
+    docker run --rm --name=local -p=127.0.0.1:4460:24444 -p=127.0.0.1:5910:25900 \
       -v /e2e/uploads:/e2e/uploads elgalu/selenium:local
-    docker run --rm --name=grid -p=4460:24444 -p=5910:25900 \
+    docker run --rm --name=local -p=4460:24444 -p=5910:25900 \
       -v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium:local
 
 
     docker run --rm --name=ff -p=127.0.0.1:4461:24444 -p=127.0.0.1:5911:25900 -v /e2e/uploads:/e2e/uploads elgalu/selenium:local
 
 ## Run without shared dir and bind ports to all network interfaces
 
-    docker run -d --name=grid -p=0.0.0.0:4444:24444 -p=0.0.0.0:5900:25900 elgalu/selenium:0.1
+    docker run -d --name=local -p=0.0.0.0:4444:24444 -p=0.0.0.0:5900:25900 elgalu/selenium:0.1
 
 ## Opening tunnels
 
@@ -86,18 +86,18 @@ List firefox versions via docker exe
 ## Run without dir and bind to all interfaces
 Note anything after the image will be taken as arguments for the cmd/entrypoint
 
-    docker run --rm --name=grid -p=0.0.0.0:8813:8484 -p=0.0.0.0:2222:2222 -p=0.0.0.0:4470:24444 -p=0.0.0.0:5920:25900 -e SCREEN_WIDTH=1800 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:local
+    docker run --rm --name=local -p=0.0.0.0:8813:8484 -p=0.0.0.0:2222:2222 -p=0.0.0.0:4470:24444 -p=0.0.0.0:5900:25900 -e SCREEN_WIDTH=1800 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:local
 
-    docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola elgalu/selenium:local
-    docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:local
-    docker run --rm --name=grid -p=0.0.0.0:4470:24444 -p=0.0.0.0:5920:25900 --add-host myserver.dev:172.17.42.1 elgalu/selenium:local
+    docker run --rm --name=local -p=4470:24444 -p=5900:25900 -e VNC_PASSWORD=hola elgalu/selenium:local
+    docker run --rm --name=local -p=4470:24444 -p=5900:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:local
+    docker run --rm --name=local -p=0.0.0.0:4470:24444 -p=0.0.0.0:5900:25900 --add-host myserver.dev:172.17.42.1 elgalu/selenium:local
 
 However adding a custom host IP to server-selenium.local (e.g. bsele ssh config) is more work:
 
     ssh bsele
     sudo sh -c 'echo "10.161.128.36  myserver.dev" >> /etc/hosts'
 
-    vncv localhost:5920 -Scaling=60%  &
+    vncv localhost:5900 -Scaling=60%  &
 
     docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium:local
 

bin/entry.sh

@@ -3,6 +3,12 @@
 # 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
+rm -f ${LOGS_DIR}/*
+rm -f ${RUN_DIR}/*
+
 # echo "-- INFO: Available Firefox Versions: ${FIREFOX_VERSIONS}"
 echo "-- INFO: Available Firefox Versions: ${FIREFOX_VERSION}"
 
@@ -80,7 +86,6 @@ if [ "${BSTACK_TUNNEL}" = "true" ]; then
   export SUPERVISOR_REQUIRED_SRV_LIST="${SUPERVISOR_REQUIRED_SRV_LIST}|browserstack"
 fi
 
-
 #----------------------------------------
 # Remove lock files, thanks @garagepoort
 clear_x_locks.sh

docs/videos.md

@@ -5,14 +5,14 @@
 ### Pull
 Pull image
 
-    docker pull elgalu/selenium:2.53.0i
+    docker pull elgalu/selenium:2.53.0j
 
 ### Run
 Run a new grid
 
     docker run --rm --name=grid -p 4444:24444 -p 5920:25900 \
       -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola \
-      -e VIDEO=true elgalu/selenium:2.53.0i
+      -e VIDEO=true elgalu/selenium:2.53.0j
 
 ### Wait
 Wait for the grid to start

test/before_install_setup

@@ -3,8 +3,8 @@
 # Exit immediately if a command exits with a non-zero status
 set -e
 
-docker --version
+docker --version || echo "INFO: No docker installed yet"
 
 sudo ./test/install_docker
 
-docker --version
+docker --version || (echo "FATAL: No docker installed" && exit 1)