use ff version 52.0.2; install dbus to fix dbus issues; correct containers; update to cesium; add debug to hub config; add role to hub config; fix comma-separated json values

Author: ddavison

Hub/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:3.3.1-bohrium
+FROM selenium/base:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 #========================
@@ -25,6 +25,8 @@ ENV GRID_CLEAN_UP_CYCLE 5000
 ENV GRID_BROWSER_TIMEOUT 0
 # In seconds, maps to "timeout"
 ENV GRID_TIMEOUT 30
+# Debug
+ENV GRID_DEBUG false
 
 COPY generate_config /opt/selenium/generate_config
 COPY entry_point.sh /opt/bin/entry_point.sh
@@ -33,4 +35,4 @@ RUN chown -R seluser /opt/selenium
 
 USER seluser
 
-CMD ["/opt/bin/entry_point.sh"]
+CMD ["/opt/bin/entry_point.sh"]

Hub/Dockerfile.txt

@@ -20,6 +20,8 @@ ENV GRID_CLEAN_UP_CYCLE 5000
 ENV GRID_BROWSER_TIMEOUT 0
 # In seconds, maps to "timeout"
 ENV GRID_TIMEOUT 30
+# Debug
+ENV GRID_DEBUG false
 
 COPY generate_config /opt/selenium/generate_config
 COPY entry_point.sh /opt/bin/entry_point.sh
@@ -28,4 +30,4 @@ RUN chown -R seluser /opt/selenium
 
 USER seluser
 
-CMD ["/opt/bin/entry_point.sh"]
+CMD ["/opt/bin/entry_point.sh"]

Hub/generate_config

@@ -4,6 +4,7 @@ echo "
 {
   \"host\": null,
   \"port\": 4444,
+  \"role\": \"hub\",
   \"maxSession\": $GRID_MAX_SESSION,
   \"newSessionWaitTimeout\": $GRID_NEW_SESSION_WAIT_TIMEOUT,
   \"capabilityMatcher\": \"org.openqa.grid.internal.utils.DefaultCapabilityMatcher\",
@@ -12,5 +13,5 @@ echo "
   \"cleanUpCycle\": $GRID_CLEAN_UP_CYCLE,
   \"browserTimeout\": $GRID_BROWSER_TIMEOUT,
   \"timeout\": $GRID_TIMEOUT,
-  \"prioritizer\": null,
-}"
+  \"debug\": $GRID_DEBUG
+}"

Makefile

@@ -1,5 +1,5 @@
 NAME := selenium
-VERSION := $(or $(VERSION),$(VERSION),3.3.1-bohrium)
+VERSION := $(or $(VERSION),$(VERSION),3.3.1-cesium)
 PLATFORM := $(shell uname -s)
 BUILD_ARGS := $(BUILD_ARGS)
 MAJOR := $(word 1,$(subst ., ,$(VERSION)))

NodeBase/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:3.3.1-bohrium
+FROM selenium/base:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -15,6 +15,7 @@ RUN apt-get update -qqy \
   && apt-get -qqy install \
     locales \
     xvfb \
+    dbus \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #==============================
@@ -36,4 +37,4 @@ ENV DISPLAY :99.0
 
 USER seluser
 
-CMD ["/opt/bin/entry_point.sh"]
+CMD ["/opt/bin/entry_point.sh"]

NodeBase/Dockerfile.txt

@@ -10,6 +10,7 @@ RUN apt-get update -qqy \
   && apt-get -qqy install \
     locales \
     xvfb \
+    dbus \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #==============================
@@ -31,4 +32,4 @@ ENV DISPLAY :99.0
 
 USER seluser
 
-CMD ["/opt/bin/entry_point.sh"]
+CMD ["/opt/bin/entry_point.sh"]

NodeChrome/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-base:3.3.1-bohrium
+FROM selenium/node-base:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 USER root

NodeChrome/generate_config

@@ -17,8 +17,8 @@ echo "
   \"maxSession\": $NODE_MAX_SESSION,
   \"port\": $NODE_PORT,
   \"register\": true,
-  \"registerCycle\": $NODE_REGISTER_CYCLE
+  \"registerCycle\": $NODE_REGISTER_CYCLE,
   \"nodePolling\": $NODE_POLLING,
   \"unregisterIfStillDownAfter\": $NODE_UNREGISTER_IF_STILL_DOWN_AFTER,
   \"downPollingLimit\": $NODE_DOWN_POLLING_LIMIT
-}"
+}"

NodeChromeDebug/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-chrome:3.3.1-bohrium
+FROM selenium/node-chrome:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 USER root

NodeChromeDebug/README.md

@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-FROM selenium/node-chrome-debug:3.3.1-bohrium
+FROM selenium/node-chrome-debug:3.3.1-cesium
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```

NodeDebug/README.template.md

@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-FROM selenium/##BASE##-debug:3.3.1-bohrium
+FROM selenium/##BASE##-debug:3.3.1-cesium
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```

NodeFirefox/Dockerfile

@@ -2,15 +2,15 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-base:3.3.1-bohrium
+FROM selenium/node-base:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 USER root
 
 #=========
 # Firefox
 #=========
-ARG FIREFOX_VERSION=52.0
+ARG FIREFOX_VERSION=52.0.2
 RUN apt-get update -qqy \
   && apt-get -qqy --no-install-recommends install firefox \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
@@ -58,4 +58,8 @@ COPY generate_config /opt/selenium/generate_config
 RUN chmod +x /opt/selenium/generate_config \
   && chown -R seluser:seluser /opt/selenium
 
+# Following line fixes
+# https://github.com/SeleniumHQ/docker-selenium/issues/87
+RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
+
 USER seluser

NodeFirefox/Dockerfile.txt

@@ -5,7 +5,7 @@ USER root
 #=========
 # Firefox
 #=========
-ARG FIREFOX_VERSION=52.0
+ARG FIREFOX_VERSION=52.0.2
 RUN apt-get update -qqy \
   && apt-get -qqy --no-install-recommends install firefox \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
@@ -53,4 +53,8 @@ COPY generate_config /opt/selenium/generate_config
 RUN chmod +x /opt/selenium/generate_config \
   && chown -R seluser:seluser /opt/selenium
 
+# Following line fixes
+# https://github.com/SeleniumHQ/docker-selenium/issues/87
+RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
+
 USER seluser

NodeFirefox/generate_config

@@ -17,7 +17,7 @@ echo "
   \"maxSession\": $NODE_MAX_SESSION,
   \"port\": $NODE_PORT,
   \"register\": true,
-  \"registerCycle\": $NODE_REGISTER_CYCLE
+  \"registerCycle\": $NODE_REGISTER_CYCLE,
   \"nodePolling\": $NODE_POLLING,
   \"unregisterIfStillDownAfter\": $NODE_UNREGISTER_IF_STILL_DOWN_AFTER,
   \"downPollingLimit\": $NODE_DOWN_POLLING_LIMIT

NodeFirefoxDebug/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-firefox:3.3.1-bohrium
+FROM selenium/node-firefox:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 USER root

NodeFirefoxDebug/Dockerfile.txt

@@ -1,4 +1,4 @@
-FROM selenium/node-firefox:3.3.1-bohrium
+FROM selenium/node-firefox:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 USER root

NodeFirefoxDebug/README.md

@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-FROM selenium/node-firefox-debug:3.3.1-bohrium
+FROM selenium/node-firefox-debug:3.3.1-cesium
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```

NodePhantomJS/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-base:3.3.1-bohrium
+FROM selenium/node-base:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 USER root

README.md

@@ -32,7 +32,7 @@ Images included:
 When executing docker run for an image with chrome browser please add volume mount `-v /dev/shm:/dev/shm` to use the host's shared memory.
 
 ``` bash
-$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.3.1-bohrium
+$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.3.1-cesium
 ```
 
 This is a workaround to node-chrome crash in docker container issue: https://code.google.com/p/chromium/issues/detail?id=519952
@@ -41,9 +41,9 @@ This is a workaround to node-chrome crash in docker container issue: https://cod
 ### Standalone Chrome and Firefox
 
 ``` bash
-$ docker run -d -p 4444:4444 selenium/standalone-chrome:3.3.1-bohrium
+$ docker run -d -p 4444:4444 selenium/standalone-chrome:3.3.1-cesium
 # OR
-$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.3.1-bohrium
+$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.3.1-cesium
 ```
 
 _Note: Only one standalone image can run on port_ `4444` _at a time._
@@ -53,9 +53,9 @@ To inspect visually what the browser is doing use the `standalone-chrome-debug`
 ### Selenium Grid Hub and Nodes
 
 ``` bash
-$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.3.1-bohrium
-$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.3.1-bohrium
-$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.3.1-bohrium
+$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.3.1-cesium
+$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.3.1-cesium
+$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.3.1-cesium
 ```
 
 ## Configuring the containers
@@ -65,7 +65,7 @@ $ docker run -d --link selenium-hub:hub selenium/node-firefox:3.3.1-bohrium
 You can pass `JAVA_OPTS` environment variable to java process.
 
 ``` bash
-$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.3.1-bohrium
+$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.3.1-cesium
 ```
 
 ### SE_OPTS Selenium Configuration Options
@@ -79,7 +79,7 @@ $ docker run -d -p 4444:4444 -e SE_OPTS="-debug true" --name selenium-hub seleni
 ### PHANTOMJS_OPTS PhantomJS Configuration Options
 
 ``` bash
-$ docker run -d -e PHANTOMJS_OPTS="--ignore-ssl-errors=true" --link selenium-hub:hub selenium/node-phantomjs:3.3.1-bohrium
+$ docker run -d -e PHANTOMJS_OPTS="--ignore-ssl-errors=true" --link selenium-hub:hub selenium/node-phantomjs:3.3.1-cesium
 ```
 
 You can pass `SE_OPTS` variable with additional commandline parameters for starting a PhantomJS node.
@@ -105,10 +105,10 @@ _Note: Omitting_ `VERSION=local` _will build the images with the current version
 ##### Example: Spawn a container for testing in Chrome:
 
 ``` bash
-$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.3.1-bohrium
+$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.3.1-cesium
 $ CH=$(docker run --rm --name=ch \
     --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
-    selenium/node-chrome:3.3.1-bohrium)
+    selenium/node-chrome:3.3.1-cesium)
 ```
 
 _Note:_ `-v /e2e/uploads:/e2e/uploads` _is optional in case you are testing browser uploads on your web app you will probably need to share a directory for this._
@@ -118,10 +118,10 @@ _Note:_ `-v /e2e/uploads:/e2e/uploads` _is optional in case you are testing brow
 This command line is the same as for Chrome. Remember that the Selenium running container is able to launch either Chrome or Firefox, the idea around having 2 separate containers, one for each browser is for convenience plus avoiding certain `:focus` issues your web app may encounter during end-to-end test automation.
 
 ``` bash
-$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.3.1-bohrium
+$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.3.1-cesium
 $ FF=$(docker run --rm --name=fx \
     --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
-    selenium/node-firefox:3.3.1-bohrium)
+    selenium/node-firefox:3.3.1-cesium)
 ```
 
 _Note: Since a Docker container is not meant to preserve state and spawning a new one takes less than 3 seconds you will likely want to remove containers after each end-to-end test with_ `--rm` _command. You need to think of your Docker containers as single processes, not as running virtual machines, in case you are familiar with [Vagrant](https://www.vagrantup.com/)._
@@ -130,28 +130,28 @@ _Note: Since a Docker container is not meant to preserve state and spawning a ne
 
 In the event you wish to visually see what the browser is doing you will want to run the `debug` variant of node or standalone images. A VNC server will run on port 5900. You are free to map that to any free external port that you wish.  Example: <port4VNC>: 5900) you will only be able to run 1 node per port so if you wish to include a second node, or more, you will have to use different ports, the 5900 as the internal port will have to remain the same though as thats the VNC service on the node. The second example below shows how to run multiple nodes and with different VNC ports open:
 ``` bash
-$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.3.1-bohrium
-$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.3.1-bohrium
+$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.3.1-cesium
+$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.3.1-cesium
 ```
 e.g.:
 ``` bash
-$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.3.1-bohrium
-$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.3.1-bohrium
+$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.3.1-cesium
+$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.3.1-cesium
 ```
 
 to connect to the Chrome node on 5900 and the Firefox node on 5901 (assuming those node are free, and reachable).
 
 And for standalone:
 ``` bash
-$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-chrome-debug:3.3.1-bohrium
+$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-chrome-debug:3.3.1-cesium
 # OR
-$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-firefox-debug:3.3.1-bohrium
+$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-firefox-debug:3.3.1-cesium
 ```
 or
 ``` bash
-$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.3.1-bohrium
+$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.3.1-cesium
 # OR
-$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.3.1-bohrium
+$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.3.1-cesium
 ```
 
 You can acquire the port that the VNC server is exposed to by running:
@@ -170,8 +170,8 @@ If you are running [Boot2Docker](https://docs.docker.com/installation/mac/) on O
 
 When you are prompted for the password it is `secret`. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a Docker image that derives from the posted ones which reconfigures it:
 ``` dockerfile
-#FROM selenium/node-chrome-debug:3.3.1-bohrium
-#FROM selenium/node-firefox-debug:3.3.1-bohrium
+#FROM selenium/node-chrome-debug:3.3.1-cesium
+#FROM selenium/node-firefox-debug:3.3.1-cesium
 #Choose the FROM statement that works for you.
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd

StandaloneChrome/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-chrome:3.3.1-bohrium
+FROM selenium/node-chrome:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 USER root

StandaloneChromeDebug/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/standalone-chrome:3.3.1-bohrium
+FROM selenium/standalone-chrome:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 USER root

StandaloneFirefox/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-firefox:3.3.1-bohrium
+FROM selenium/node-firefox:3.3.1-cesium
 MAINTAINER Selenium <[email protected]>
 
 USER root