Adjusting images to Selenium Grid 4 Alpha

Using temporal jar for CI testing

Author: diemol

Base/Dockerfile

@@ -67,8 +67,8 @@ COPY supervisord.conf /etc
 RUN  mkdir -p /opt/selenium /var/run/supervisor /var/log/supervisor \
   && touch /opt/selenium/config.json \
   && chmod -R 777 /opt/selenium /var/run/supervisor /var/log/supervisor /etc/passwd \
-  && wget --no-verbose https://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar \
-    -O /opt/selenium/selenium-server-standalone.jar \
+  && wget --no-verbose https://github.com/diemol/demos/releases/download/test/selenium_server_deploy.jar \
+    -O /opt/selenium/selenium-server.jar \
   && chgrp -R 0 /opt/selenium ${HOME} /var/run/supervisor /var/log/supervisor \
   && chmod -R g=u /opt/selenium ${HOME} /var/run/supervisor /var/log/supervisor
 

Hub/Dockerfile.txt

@@ -4,6 +4,8 @@ USER seluser
 # Selenium Configuration
 #========================
 
+EXPOSE 4442
+EXPOSE 4443
 EXPOSE 4444
 
 # As integer, maps to "maxSession"
@@ -26,7 +28,7 @@ ENV GRID_DEBUG false
 ENV GRID_HUB_PORT 4444
 # As string, maps to "host"
 ENV GRID_HUB_HOST "0.0.0.0"
- 
+
 COPY generate_config \
     start-selenium-hub.sh \
     /opt/bin/

Hub/start-selenium-hub.sh

@@ -3,19 +3,6 @@
 # set -e: exit asap if a command exits with a non-zero status
 set -e
 
-ROOT=/opt/selenium
-CONF=${ROOT}/config.json
+echo "Starting Selenium Hub..."
 
-/opt/bin/generate_config >${CONF}
-
-echo "Starting Selenium Hub with configuration:"
-cat ${CONF}
-
-if [ ! -z "$SE_OPTS" ]; then
-  echo "Appending Selenium options: ${SE_OPTS}"
-fi
-
-java ${JAVA_OPTS} -cp ${JAVA_CLASSPATH:-"/opt/selenium/*:."} org.openqa.grid.selenium.GridLauncherV3 \
-  -role hub \
-  -hubConfig ${CONF} \
-  ${SE_OPTS}
+java -jar /opt/selenium/selenium-server.jar hub

Makefile

@@ -184,9 +184,6 @@ test: test_chrome \
 test_chrome:
 	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChrome
 
-test_chrome_debug:
-	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChromeDebug
-
 test_chrome_standalone:
 	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChrome
 

NodeBase/start-selenium-node.sh

@@ -2,11 +2,6 @@
 
 /opt/bin/generate_config > /opt/selenium/config.json
 
-if [ ! -e /opt/selenium/config.json ]; then
-  echo No Selenium Node configuration file, the node-base image is not intended to be run directly. 1>&2
-  exit 1
-fi
-
 # Start the pulseaudio server
 pulseaudio -D --exit-idle-time=-1
 
@@ -17,38 +12,7 @@ pacmd set-default-sink v1
 # set the monitor of v1 sink to be the default source
 pacmd set-default-source v1.monitor
 
-# In the long term the idea is to remove $HUB_PORT_4444_TCP_ADDR and $HUB_PORT_4444_TCP_PORT and only work with
-# $HUB_HOST and $HUB_PORT
-if [ ! -z "$HUB_HOST" ]; then
-  HUB_PORT_PARAM=4444
-  if [ ! -z "$HUB_PORT" ]; then
-      HUB_PORT_PARAM=${HUB_PORT}
-  fi
-  echo "Connecting to the Hub using the host ${HUB_HOST} and port ${HUB_PORT_PARAM}"
-  HUB_PORT_4444_TCP_ADDR=${HUB_HOST}
-  HUB_PORT_4444_TCP_PORT=${HUB_PORT_PARAM}
-fi
-
-if [ -z "$HUB_PORT_4444_TCP_ADDR" ]; then
-  echo "Not linked with a running Hub container" 1>&2
-  exit 1
-fi
-
-REMOTE_HOST_PARAM=""
-if [ ! -z "$REMOTE_HOST" ]; then
-  echo "REMOTE_HOST variable is set, appending -remoteHost"
-  REMOTE_HOST_PARAM="-remoteHost $REMOTE_HOST"
-fi
-
-if [ ! -z "$SE_OPTS" ]; then
-  echo "appending selenium options: ${SE_OPTS}"
-fi
-
 rm -f /tmp/.X*lock
 
-java ${JAVA_OPTS} -cp ${JAVA_CLASSPATH:-"/opt/selenium/*:."} org.openqa.grid.selenium.GridLauncherV3 \
-  -role node \
-  -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
-  ${REMOTE_HOST_PARAM} \
-  -nodeConfig /opt/selenium/config.json \
-  ${SE_OPTS}
+java -jar /opt/selenium/selenium-server.jar node --publish-events tcp://"$HUB_HOST":4442 \
+  --subscribe-events tcp://"$HUB_HOST":4443

README.md

@@ -8,8 +8,8 @@ The project is made possible by volunteer contributors who have put in thousands
 
 ### IRC (#selenium at Freenode)
 
-## Docker images for Selenium Standalone Server Hub and Node configurations with Chrome and Firefox
-[Travis CI](https://travis-ci.org/SeleniumHQ/docker-selenium)
+## Docker images for Selenium Grid with Chrome, Firefox and Opera
+[![Travis Status](https://travis-ci.com/SeleniumHQ/docker-selenium.svg?branch=master)](//travis-ci.com/SeleniumHQ/docker-selenium/builds)
 
 Images included:
 - __selenium/base__: Base image which includes Java runtime and Selenium Server JAR file
@@ -18,41 +18,38 @@ Images included:
 - __selenium/node-chrome__: Grid Node with Chrome installed, needs to be connected to a Grid Hub
 - __selenium/node-firefox__: Grid Node with Firefox installed, needs to be connected to a Grid Hub
 - __selenium/node-opera__: Grid Node with Opera installed, needs to be connected to a Grid Hub
-- __selenium/node-chrome-debug__: Grid Node with Chrome installed and runs a VNC server, needs to be connected to a Grid Hub
-- __selenium/node-firefox-debug__: Grid Node with Firefox installed and runs a VNC server, needs to be connected to a Grid Hub
-- __selenium/node-opera-debug__: Grid Node with Opera installed and runs a VNC server, needs to be connected to a Grid Hub
 - __selenium/standalone-chrome__: Selenium Standalone with Chrome installed
 - __selenium/standalone-firefox__: Selenium Standalone with Firefox installed
 - __selenium/standalone-opera__: Selenium Standalone with Opera installed
-- __selenium/standalone-chrome-debug__: Selenium Standalone with Chrome installed and runs a VNC server
-- __selenium/standalone-firefox-debug__: Selenium Standalone with Firefox installed and runs a VNC server
-- __selenium/standalone-opera-debug__: Selenium Standalone with Opera installed and runs a VNC server
 
 ##
 
 ## Running the images
-:exclamation: When executing `docker run` for an image with Chrome or Firefox please either mount `-v /dev/shm:/dev/shm` or use the flag `--shm-size=2g` to use the host's shared memory.
+:exclamation: When executing `docker run` for an image that contains a browser please either mount `-v /dev/shm:/dev/shm` or use the
+flag `--shm-size=2g` to use the host's shared memory.
 
-:exclamation: In general, use a tag with an element suffix to pin a specific browser version. See [Tagging Conventions](https://github.com/SeleniumHQ/docker-selenium/wiki/Tagging-Convention) for details.
+:exclamation: Always use a tag with an element suffix to pin a specific browser version.
+See [Tagging Conventions](https://github.com/SeleniumHQ/docker-selenium/wiki/Tagging-Convention) for details.
 
 Chrome
 ``` bash
 $ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.141.59-zirconium
-#OR
+# OR
 $ docker run -d -p 4444:4444 --shm-size=2g selenium/standalone-chrome:3.141.59-zirconium
 ```
 Firefox
 ``` bash
 $ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:3.141.59-zirconium
-#OR
+# OR
 $ docker run -d -p 4444:4444 --shm-size 2g selenium/standalone-firefox:3.141.59-zirconium
 ```
 Opera
 ``` bash
 $ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-opera:3.141.59-zirconium
-#OR
+# OR
 $ docker run -d -p 4444:4444 --shm-size=2g selenium/standalone-opera:3.141.59-zirconium
 ```
+
 This is a known workaround to avoid the browser crashing inside a docker container, here are the documented issues for
 [Chrome](https://code.google.com/p/chromium/issues/detail?id=519952) and [Firefox](https://bugzilla.mozilla.org/show_bug.cgi?id=1338771#c10).
 The shm size of 2gb is arbitrary but known to work well, your specific use case might need a different value, it is recommended
@@ -69,9 +66,9 @@ $ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-firefox:3.
 $ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-opera:3.141.59-zirconium
 ```
 
-_Note: Only one standalone image can run on port_ `4444` _at a time._
+_Note: Only one Standalone container can run on port_ `4444` _at a time._
 
-To inspect visually what the browser is doing use the `standalone-chrome-debug`, `standalone-firefox-debug` or `standalone-opera-debug` images. See [Debugging](#debugging) section for details.
+To inspect visually what the browser is doing, see the [Debugging](#debugging) section for details.
 
 ### Selenium Grid Hub and Nodes
 There are different ways to run the images and create a grid, check the following options.
@@ -113,7 +110,7 @@ services:
     volumes:
       - /dev/shm:/dev/shm
     depends_on:
-      - hub
+      - selenium-hub
     environment:
       HUB_HOST: hub
 
@@ -122,7 +119,7 @@ services:
     volumes:
       - /dev/shm:/dev/shm
     depends_on:
-      - hub
+      - selenium-hub
     environment:
       HUB_HOST: hub
 
@@ -131,11 +128,11 @@ services:
     volumes:
       - /dev/shm:/dev/shm
     depends_on:
-      - hub
+      - selenium-hub
     environment:
       HUB_HOST: hub
 
-  hub:
+  selenium-hub:
     image: selenium/hub:3.141.59-zirconium
     ports:
       - "4444:4444"
@@ -161,7 +158,6 @@ services:
       - selenium-hub
     environment:
       - HUB_HOST=selenium-hub
-      - HUB_PORT=4444
 
   firefox:
     image: selenium/node-firefox:3.141.59-zirconium
@@ -171,7 +167,6 @@ services:
       - selenium-hub
     environment:
       - HUB_HOST=selenium-hub
-      - HUB_PORT=4444
 
   opera:
     image: selenium/node-opera:3.141.59-zirconium
@@ -181,7 +176,6 @@ services:
       - selenium-hub
     environment:
       - HUB_HOST=selenium-hub
-      - HUB_PORT=4444
 ```
 
 To stop the grid and cleanup the created containers, run `docker-compose down`.
@@ -195,7 +189,7 @@ To stop the grid and cleanup the created containers, run `docker-compose down`.
 version: '3.7'
 
 services:
-  hub:
+  selenium-hub:
    image: selenium/hub:3.141.59-zirconium
    ports:
      - "4444:4444"
@@ -205,8 +199,7 @@ services:
     volumes:
       - /dev/shm:/dev/shm
     environment:
-      HUB_HOST: hub
-      HUB_PORT: 4444
+      HUB_HOST: selenium-hub
     deploy:
         replicas: 1
     entrypoint: bash -c 'SE_OPTS="-host $$HOSTNAME" /opt/bin/entry_point.sh'
@@ -216,8 +209,7 @@ services:
     volumes:
       - /dev/shm:/dev/shm
     environment:
-      HUB_HOST: hub
-      HUB_PORT: 4444
+      HUB_HOST: selenium-hub
     deploy:
         replicas: 1
     entrypoint: bash -c 'SE_OPTS="-host $$HOSTNAME" /opt/bin/entry_point.sh'
@@ -227,25 +219,12 @@ services:
     volumes:
       - /dev/shm:/dev/shm
     environment:
-      HUB_HOST: hub
-      HUB_PORT: 4444
+      HUB_HOST: selenium-hub
     deploy:
         replicas: 1
     entrypoint: bash -c 'SE_OPTS="-host $$HOSTNAME" /opt/bin/entry_point.sh'
 ```
 
-#### Using `--link`
-This option can be used for a single host scenario (hub and nodes running in a single machine), but it is not recommended
-for longer term usage since this is a docker [legacy feature](https://docs.docker.com/compose/compose-file/#links).
-It could serve you as an option for a proof of concept, and for simplicity it is used in the examples shown from now on.
-
-``` bash
-$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.141.59-zirconium
-$ docker run -d --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-chrome:3.141.59-zirconium
-$ docker run -d --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-firefox:3.141.59-zirconium
-$ docker run -d --link selenium-hub:hub -v /dev/shm:/dev/shm selenium/node-opera:3.141.59-zirconium
-```
-
 ### Deploying to Kubernetes
 
 Check out [the Kubernetes examples](https://github.com/kubernetes/examples/tree/master/staging/selenium)

Standalone/start-selenium-standalone.sh

@@ -2,5 +2,4 @@
 #
 # IMPORTANT: Change this file only in directory Standalone!
 
-java ${JAVA_OPTS} -cp ${JAVA_CLASSPATH:-"/opt/selenium/*:."} org.openqa.grid.selenium.GridLauncherV3 \
-    ${SE_OPTS}
+java -jar /opt/selenium/selenium-server.jar standalone

StandaloneOpera/selenium.conf

@@ -1,6 +1,6 @@
 ; Documentation of this file format -> http://supervisord.org/configuration.html
 
-; Priority 0 - xvfb, 5 - fluxbox (debug images), 10 - x11vnc (debug images), 15 - selenium-node
+; Priority 0 - xvfb, 5 - fluxbox, 10 - x11vnc, 15 - selenium-node
 
 [program:xvfb]
 priority=0
@@ -21,6 +21,43 @@ stderr_logfile_backups=5
 stdout_capture_maxbytes=50MB
 stderr_capture_maxbytes=50MB
 
+[program:fluxbox]
+priority=5
+command=/opt/bin/start-fluxbox.sh
+autostart=true
+autorestart=unexpected
+startsecs=0
+startretries=0
+
+;Logs
+redirect_stderr=false
+stdout_logfile=/var/log/supervisor/fluxbox-stdout.log
+stderr_logfile=/var/log/supervisor/fluxbox-stderr.log
+stdout_logfile_maxbytes=50MB
+stderr_logfile_maxbytes=50MB
+stdout_logfile_backups=5
+stderr_logfile_backups=5
+stdout_capture_maxbytes=50MB
+stderr_capture_maxbytes=50MB
+
+[program:vnc]
+priority=10
+command=/opt/bin/start-vnc.sh
+autostart=true
+autorestart=false
+startsecs=0
+startretries=0
+
+;Logs
+redirect_stderr=false
+stdout_logfile=/var/log/supervisor/vnc-stdout.log
+stderr_logfile=/var/log/supervisor/vnc-stderr.log
+stdout_logfile_maxbytes=50MB
+stderr_logfile_maxbytes=50MB
+stdout_logfile_backups=5
+stderr_logfile_backups=5
+stdout_capture_maxbytes=50MB
+stderr_capture_maxbytes=50MB
 
 [program:selenium-standalone]
 priority=15

tests/SeleniumTests/__init__.py

@@ -63,14 +63,16 @@ def tearDown(self):
 class ChromeTests(SeleniumGenericTests):
     def setUp(self):
         self.driver = webdriver.Remote(
-            desired_capabilities=DesiredCapabilities.CHROME
+            desired_capabilities=DesiredCapabilities.CHROME,
+            command_executor='http://localhost:4444'
         )
 
 
 class FirefoxTests(SeleniumGenericTests):
     def setUp(self):
         self.driver = webdriver.Remote(
-            desired_capabilities=DesiredCapabilities.FIREFOX
+            desired_capabilities=DesiredCapabilities.FIREFOX,
+            command_executor='http://localhost:4444'
         )
 
     def test_title_and_maximize_window(self):
@@ -84,5 +86,6 @@ def setUp(self):
         capabilities = DesiredCapabilities.CHROME
         capabilities['browserName'] = 'operablink'
         self.driver = webdriver.Remote(
-            desired_capabilities=capabilities
+            desired_capabilities=capabilities,
+            command_executor='http://localhost:4444'
         )