Readme improvements

.gitignore

@@ -8,12 +8,12 @@ node_modules/
 *.swp
 
 # Ignoring generated files during the build process
-Node*Debug/selenium-debug.conf
-Node*Debug/start-*.sh
 StandaloneC*/selenium.conf
 StandaloneF*/selenium.conf
+StandaloneO*/selenium.conf
 StandaloneC*/start-*.sh
 StandaloneF*/start-*.sh
+StandaloneO*/start-*.sh
 
 # Created by https://www.gitignore.io/api/virtualenv
 

Base/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200630
+FROM ubuntu:bionic-20200807
 LABEL authors="Selenium <[email protected]>"
 
 #================================================
@@ -71,8 +71,10 @@ 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/4.0-alpha-6/selenium-server-4.0.0-alpha-6.jar \
+  && wget --no-verbose https://github.com/SeleniumHQ/docker-selenium/raw/alpha-jars/selenium-server-4.0.0-alpha-7.jar \
     -O /opt/selenium/selenium-server.jar \
+#  && wget --no-verbose https://selenium-release.storage.googleapis.com/4.0-alpha-6/selenium-server-4.0.0-alpha-6.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
 

Distributor/Dockerfile

@@ -8,38 +8,12 @@ LABEL authors=SeleniumHQ
 USER 1200
 
 #========================
-# Selenium Configuration
+# Selenium Distributor Configuration
 #========================
 
-EXPOSE 4442
-EXPOSE 4443
-EXPOSE 4444
+EXPOSE 5553
 
-# As integer, maps to "maxSession"
-ENV GRID_MAX_SESSION 5
-# In milliseconds, maps to "newSessionWaitTimeout"
-ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1
-# As a boolean, maps to "throwOnCapabilityNotPresent"
-ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true
-# As an integer
-ENV GRID_JETTY_MAX_THREADS -1
-# In milliseconds, maps to "cleanUpCycle"
-ENV GRID_CLEAN_UP_CYCLE 5000
-# In seconds, maps to "browserTimeout"
-ENV GRID_BROWSER_TIMEOUT 0
-# In seconds, maps to "timeout"
-ENV GRID_TIMEOUT 1800
-# Debug
-ENV GRID_DEBUG false
-# As integer, maps to "port"
-ENV GRID_HUB_PORT 4444
-# As string, maps to "host"
-ENV GRID_HUB_HOST "0.0.0.0"
-
-COPY generate_config \
-    start-selenium-grid-distributor.sh \
+COPY start-selenium-grid-distributor.sh \
     /opt/bin/
 
 COPY selenium-grid-distributor.conf /etc/supervisor/conf.d/
-
-RUN /opt/bin/generate_config > /opt/selenium/config.json

Distributor/Dockerfile.txt

@@ -1,38 +1,12 @@
 USER 1200
 
 #========================
-# Selenium Configuration
+# Selenium Distributor Configuration
 #========================
 
-EXPOSE 4442
-EXPOSE 4443
-EXPOSE 4444
+EXPOSE 5553
 
-# As integer, maps to "maxSession"
-ENV GRID_MAX_SESSION 5
-# In milliseconds, maps to "newSessionWaitTimeout"
-ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1
-# As a boolean, maps to "throwOnCapabilityNotPresent"
-ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true
-# As an integer
-ENV GRID_JETTY_MAX_THREADS -1
-# In milliseconds, maps to "cleanUpCycle"
-ENV GRID_CLEAN_UP_CYCLE 5000
-# In seconds, maps to "browserTimeout"
-ENV GRID_BROWSER_TIMEOUT 0
-# In seconds, maps to "timeout"
-ENV GRID_TIMEOUT 1800
-# Debug
-ENV GRID_DEBUG false
-# As integer, maps to "port"
-ENV GRID_HUB_PORT 4444
-# As string, maps to "host"
-ENV GRID_HUB_HOST "0.0.0.0"
-
-COPY generate_config \
-    start-selenium-grid-distributor.sh \
+COPY start-selenium-grid-distributor.sh \
     /opt/bin/
 
 COPY selenium-grid-distributor.conf /etc/supervisor/conf.d/
-
-RUN /opt/bin/generate_config > /opt/selenium/config.json

Distributor/start-selenium-grid-distributor.sh

@@ -5,4 +5,38 @@ set -e
 
 echo "Starting Selenium Grid Distributor..."
 
-java -jar /opt/selenium/selenium-server.jar distributor
+if [[ -z "${SE_EVENT_BUS_HOST}" ]]; then
+  echo "SE_EVENT_BUS_HOST not set, exiting!" 1>&2
+  exit 1
+fi
+
+if [[ -z "${SE_EVENT_BUS_PUBLISH_PORT}" ]]; then
+  echo "SE_EVENT_BUS_PUBLISH_PORT not set, exiting!" 1>&2
+  exit 1
+fi
+
+if [[ -z "${SE_EVENT_BUS_SUBSCRIBE_PORT}" ]]; then
+  echo "SE_EVENT_BUS_SUBSCRIBE_PORT not set, exiting!" 1>&2
+  exit 1
+fi
+
+if [[ -z "${SE_SESSIONS_MAP_HOST}" ]]; then
+  echo "SE_SESSIONS_MAP_HOST not set, exiting!" 1>&2
+  exit 1
+fi
+
+if [[ -z "${SE_SESSIONS_MAP_PORT}" ]]; then
+  echo "SE_SESSIONS_MAP_PORT not set, exiting!" 1>&2
+  exit 1
+fi
+
+if [ ! -z "$SE_OPTS" ]; then
+  echo "Appending Selenium options: ${SE_OPTS}"
+fi
+
+java -jar /opt/selenium/selenium-server.jar distributor \
+  --sessions-host "${SE_SESSIONS_MAP_HOST}" --sessions-port ${SE_SESSIONS_MAP_PORT} \
+  --publish-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_PUBLISH_PORT} \
+  --subscribe-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_SUBSCRIBE_PORT} \
+  --bind-bus false \
+  ${SE_OPTS}

EventBus/Dockerfile

@@ -0,0 +1,24 @@
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
+# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+FROM selenium/base:4.0.0-alpha-6-20200730
+LABEL authors=SeleniumHQ
+
+USER 1200
+
+#=================================
+# Selenium Event Bus Configuration
+#=================================
+
+# Port where events are published
+EXPOSE 4442
+# Port where to subscribe for events
+EXPOSE 4443
+# Event Bus port
+EXPOSE 5557
+
+COPY start-selenium-grid-eventbus.sh \
+    /opt/bin/
+
+COPY selenium-grid-eventbus.conf /etc/supervisor/conf.d/

EventBus/Dockerfile.txt

@@ -0,0 +1,17 @@
+USER 1200
+
+#=================================
+# Selenium Event Bus Configuration
+#=================================
+
+# Port where events are published
+EXPOSE 4442
+# Port where to subscribe for events
+EXPOSE 4443
+# Event Bus port
+EXPOSE 5557
+
+COPY start-selenium-grid-eventbus.sh \
+    /opt/bin/
+
+COPY selenium-grid-eventbus.conf /etc/supervisor/conf.d/

EventBus/generate.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+VERSION=$1
+NAMESPACE=$2
+AUTHORS=$3
+
+echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
+echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
+echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
+echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
+echo FROM ${NAMESPACE}/base:${VERSION} >> ./Dockerfile
+echo LABEL authors="$AUTHORS" >> ./Dockerfile
+echo "" >> ./Dockerfile
+cat ./Dockerfile.txt >> ./Dockerfile

EventBus/selenium-grid-eventbus.conf

@@ -0,0 +1,15 @@
+; Documentation of this file format -> http://supervisord.org/configuration.html
+
+[program:selenium-grid-eventbus]
+
+priority=0
+command=/opt/bin/start-selenium-grid-eventbus.sh
+autostart=true
+autorestart=false
+startsecs=0
+startretries=0
+
+;Logs (all Hub activity redirected to stdout so it can be seen through "docker logs"
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0

EventBus/start-selenium-grid-eventbus.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# set -e: exit asap if a command exits with a non-zero status
+set -e
+
+echo "Starting Selenium Grid EventBus..."
+
+java -jar /opt/selenium/selenium-server.jar event-bus ${SE_OPTS}

Hub/Dockerfile

@@ -8,7 +8,7 @@ LABEL authors=SeleniumHQ
 USER 1200
 
 #========================
-# Selenium Configuration
+# Selenium Hub Configuration
 #========================
 
 EXPOSE 4442

Hub/Dockerfile.txt

@@ -1,7 +1,7 @@
 USER 1200
 
 #========================
-# Selenium Configuration
+# Selenium Hub Configuration
 #========================
 
 EXPOSE 4442

Hub/start-selenium-grid-hub.sh

@@ -5,4 +5,8 @@ set -e
 
 echo "Starting Selenium Grid Hub..."
 
-java -jar /opt/selenium/selenium-server.jar hub
+if [ ! -z "$SE_OPTS" ]; then
+  echo "Appending Selenium options: ${SE_OPTS}"
+fi
+
+java -jar /opt/selenium/selenium-server.jar hub ${SE_OPTS}