From 5fa612cb48341ace010ba132380d97cc2e5d11bc Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 16:36:02 +0100
Subject: [PATCH 01/10] Enabling host and port config for distributor

---
 Distributor/start-selenium-grid-distributor.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh
index adb93dc552..f1f0ed1806 100755
--- a/Distributor/start-selenium-grid-distributor.sh
+++ b/Distributor/start-selenium-grid-distributor.sh
@@ -44,10 +44,23 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "Appending Selenium options: ${SE_OPTS}"
 fi
 
+if [ ! -z "$SE_DISTRIBUTOR_HOST" ]; then
+  echo "Using SE_DISTRIBUTOR_HOST: ${SE_DISTRIBUTOR_HOST}"
+  HOST_CONFIG="--host ${SE_DISTRIBUTOR_HOST}"
+fi
+
+if [ ! -z "$SE_DISTRIBUTOR_PORT" ]; then
+  echo "Using SE_DISTRIBUTOR_PORT: ${SE_DISTRIBUTOR_PORT}"
+  PORT_CONFIG="--host ${SE_DISTRIBUTOR_PORT}"
+fi
+
+
 java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar distributor \
   --sessions-host "${SE_SESSIONS_MAP_HOST}" --sessions-port "${SE_SESSIONS_MAP_PORT}" \
   --sessionqueuer-host "${SE_SESSION_QUEUER_HOST}" --sessionqueuer-port "${SE_SESSION_QUEUER_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 \
+  ${HOST_CONFIG} \
+  ${PORT_CONFIG} \
   ${SE_OPTS}

From 031c234a96af2b3bccf25e6acd9bf387eef1d54c Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 16:43:07 +0100
Subject: [PATCH 02/10] Enabling host and port config for the event bus

---
 EventBus/start-selenium-grid-eventbus.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/EventBus/start-selenium-grid-eventbus.sh b/EventBus/start-selenium-grid-eventbus.sh
index e82d2e3106..0153dddf80 100755
--- a/EventBus/start-selenium-grid-eventbus.sh
+++ b/EventBus/start-selenium-grid-eventbus.sh
@@ -5,4 +5,17 @@ set -e
 
 echo "Starting Selenium Grid EventBus..."
 
-java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar event-bus ${SE_OPTS}
+if [ ! -z "$SE_EVENT_BUS_HOST" ]; then
+  echo "Using SE_EVENT_BUS_HOST: ${SE_EVENT_BUS_HOST}"
+  HOST_CONFIG="--host ${SE_EVENT_BUS_HOST}"
+fi
+
+if [ ! -z "$SE_EVENT_BUS_PORT" ]; then
+  echo "Using SE_EVENT_BUS_PORT: ${SE_EVENT_BUS_PORT}"
+  PORT_CONFIG="--host ${SE_EVENT_BUS_PORT}"
+fi
+
+java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar event-bus \
+  ${HOST_CONFIG} \
+  ${PORT_CONFIG} \
+  ${SE_OPTS}

From a84002b1c25c603a62f9bc685fb9bfda2fd1f9a1 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 16:51:41 +0100
Subject: [PATCH 03/10] Correcting command

---
 Distributor/start-selenium-grid-distributor.sh | 2 +-
 EventBus/start-selenium-grid-eventbus.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh
index f1f0ed1806..1e61d1583a 100755
--- a/Distributor/start-selenium-grid-distributor.sh
+++ b/Distributor/start-selenium-grid-distributor.sh
@@ -51,7 +51,7 @@ fi
 
 if [ ! -z "$SE_DISTRIBUTOR_PORT" ]; then
   echo "Using SE_DISTRIBUTOR_PORT: ${SE_DISTRIBUTOR_PORT}"
-  PORT_CONFIG="--host ${SE_DISTRIBUTOR_PORT}"
+  PORT_CONFIG="--port ${SE_DISTRIBUTOR_PORT}"
 fi
 
 
diff --git a/EventBus/start-selenium-grid-eventbus.sh b/EventBus/start-selenium-grid-eventbus.sh
index 0153dddf80..167da8be18 100755
--- a/EventBus/start-selenium-grid-eventbus.sh
+++ b/EventBus/start-selenium-grid-eventbus.sh
@@ -12,7 +12,7 @@ fi
 
 if [ ! -z "$SE_EVENT_BUS_PORT" ]; then
   echo "Using SE_EVENT_BUS_PORT: ${SE_EVENT_BUS_PORT}"
-  PORT_CONFIG="--host ${SE_EVENT_BUS_PORT}"
+  PORT_CONFIG="--port ${SE_EVENT_BUS_PORT}"
 fi
 
 java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar event-bus \

From 5a98568bffd2cb5d6061f8db112f4a1269e9abd3 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 16:54:11 +0100
Subject: [PATCH 04/10] Enabling host and port config for the Hub

---
 Hub/generate_config            | 16 ----------------
 Hub/start-selenium-grid-hub.sh | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100755 Hub/generate_config

diff --git a/Hub/generate_config b/Hub/generate_config
deleted file mode 100755
index d548bd289b..0000000000
--- a/Hub/generate_config
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-cat <<_EOF
-[network]
-relax-checks = ${SE_RELAX_CHECKS}
-
-[sessionqueue]
-session-request-timeout = ${SE_SESSION_REQUEST_TIMEOUT}
-session-retry-interval = ${SE_SESSION_RETRY_INTERVAL}
-
-[server]
-hostname = "${SE_HUB_HOST}"
-port = ${SE_HUB_PORT}
-allow-cors = ${SE_ALLOW_CORS}
-
-_EOF
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
index 86f240af78..8da0697142 100755
--- a/Hub/start-selenium-grid-hub.sh
+++ b/Hub/start-selenium-grid-hub.sh
@@ -14,6 +14,22 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "Appending Selenium options: ${SE_OPTS}"
 fi
 
+if [ ! -z "$SE_HUB_HOST" ]; then
+  echo "Using SE_HUB_HOST: ${SE_HUB_HOST}"
+  HOST_CONFIG="--host ${SE_HUB_HOST}"
+fi
+
+if [ ! -z "$SE_HUB_PORT" ]; then
+  echo "Using SE_HUB_PORT: ${SE_HUB_PORT}"
+  PORT_CONFIG="--port ${SE_HUB_PORT}"
+fi
+
+
 java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar hub \
-  --config ${CONFIG_TOML_FILE} \
+  --session-request-timeout ${SE_SESSION_REQUEST_TIMEOUT} \
+  --session-retry-interval ${SE_SESSION_RETRY_INTERVAL} \
+  --allow-cors ${SE_ALLOW_CORS} \
+  --relax-checks ${SE_RELAX_CHECKS} \
+  ${HOST_CONFIG} \
+  ${PORT_CONFIG} \
   ${SE_OPTS}

From 58a5df1e0a60795f434a348c09f8653b3b4e17cd Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 16:57:54 +0100
Subject: [PATCH 05/10] Fixing dockerfile Hub

---
 Hub/Dockerfile.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Hub/Dockerfile.txt b/Hub/Dockerfile.txt
index 24e08ff113..d35e9df397 100644
--- a/Hub/Dockerfile.txt
+++ b/Hub/Dockerfile.txt
@@ -21,10 +21,7 @@ ENV SE_HUB_HOST "0.0.0.0"
 # As string, maps to "allow-cors"
 ENV SE_ALLOW_CORS false
 
-COPY generate_config \
-    start-selenium-grid-hub.sh \
+COPY start-selenium-grid-hub.sh \
     /opt/bin/
 
 COPY selenium-grid-hub.conf /etc/supervisor/conf.d/
-
-RUN /opt/bin/generate_config > /opt/selenium/config.toml

From 46fd8fec2d680209751a2062cd17121bdd918bfe Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 16:59:39 +0100
Subject: [PATCH 06/10] Enabling host and port config for the Router

---
 Router/start-selenium-grid-router.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Router/start-selenium-grid-router.sh b/Router/start-selenium-grid-router.sh
index 13b2f7bbab..ebd4c76638 100755
--- a/Router/start-selenium-grid-router.sh
+++ b/Router/start-selenium-grid-router.sh
@@ -39,8 +39,21 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "Appending Selenium options: ${SE_OPTS}"
 fi
 
+if [ ! -z "$SE_ROUTER_HOST" ]; then
+  echo "Using SE_ROUTER_HOST: ${SE_ROUTER_HOST}"
+  HOST_CONFIG="--host ${SE_ROUTER_HOST}"
+fi
+
+if [ ! -z "$SE_ROUTER_PORT" ]; then
+  echo "Using SE_ROUTER_PORT: ${SE_ROUTER_PORT}"
+  PORT_CONFIG="--port ${SE_ROUTER_PORT}"
+fi
+
 java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar router \
   --sessions-host "${SE_SESSIONS_MAP_HOST}" --sessions-port "${SE_SESSIONS_MAP_PORT}" \
   --distributor-host "${SE_DISTRIBUTOR_HOST}" --distributor-port "${SE_DISTRIBUTOR_PORT}" \
   --sessionqueuer-host "${SE_SESSION_QUEUER_HOST}" --sessionqueuer-port "${SE_SESSION_QUEUER_PORT}" \
-  --relax-checks true ${SE_OPTS}
+  --relax-checks true \
+  ${HOST_CONFIG} \
+  ${PORT_CONFIG} \
+  ${SE_OPTS}

From 06885038029602f14cf2534acef412d192874095 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 17:04:22 +0100
Subject: [PATCH 07/10] Removing default env vars from Hub

---
 Hub/Dockerfile.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Hub/Dockerfile.txt b/Hub/Dockerfile.txt
index d35e9df397..c6bd938a82 100644
--- a/Hub/Dockerfile.txt
+++ b/Hub/Dockerfile.txt
@@ -14,10 +14,6 @@ ENV SE_SESSION_REQUEST_TIMEOUT 300
 ENV SE_SESSION_RETRY_INTERVAL 5
 # Boolean value, maps "--relax-checks"
 ENV SE_RELAX_CHECKS true
-# As integer, maps to "port"
-ENV SE_HUB_PORT 4444
-# As string, maps to "host"
-ENV SE_HUB_HOST "0.0.0.0"
 # As string, maps to "allow-cors"
 ENV SE_ALLOW_CORS false
 

From e55228b0b2e188c1a58dfd8a9087f337aa8905c0 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 17:07:50 +0100
Subject: [PATCH 08/10] Fixing Hub startup

---
 Hub/start-selenium-grid-hub.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
index 8da0697142..efb166d42d 100755
--- a/Hub/start-selenium-grid-hub.sh
+++ b/Hub/start-selenium-grid-hub.sh
@@ -3,13 +3,6 @@
 # set -e: exit asap if a command exits with a non-zero status
 set -e
 
-CONFIG_TOML_FILE=/opt/selenium/config.toml
-
-/opt/bin/generate_config >${CONFIG_TOML_FILE}
-
-echo "Starting Selenium Grid Hub with configuration: "
-cat ${CONFIG_TOML_FILE}
-
 if [ ! -z "$SE_OPTS" ]; then
   echo "Appending Selenium options: ${SE_OPTS}"
 fi

From a44eff24ae00391616323ff68c459a0d63f8b324 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 19:22:59 +0100
Subject: [PATCH 09/10] Removed allow cors flag

---
 Hub/Dockerfile.txt             | 2 --
 Hub/start-selenium-grid-hub.sh | 7 ++-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Hub/Dockerfile.txt b/Hub/Dockerfile.txt
index c6bd938a82..e3eec22cd8 100644
--- a/Hub/Dockerfile.txt
+++ b/Hub/Dockerfile.txt
@@ -14,8 +14,6 @@ ENV SE_SESSION_REQUEST_TIMEOUT 300
 ENV SE_SESSION_RETRY_INTERVAL 5
 # Boolean value, maps "--relax-checks"
 ENV SE_RELAX_CHECKS true
-# As string, maps to "allow-cors"
-ENV SE_ALLOW_CORS false
 
 COPY start-selenium-grid-hub.sh \
     /opt/bin/
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
index efb166d42d..b2ca2ee1fa 100755
--- a/Hub/start-selenium-grid-hub.sh
+++ b/Hub/start-selenium-grid-hub.sh
@@ -21,8 +21,5 @@ fi
 java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar hub \
   --session-request-timeout ${SE_SESSION_REQUEST_TIMEOUT} \
   --session-retry-interval ${SE_SESSION_RETRY_INTERVAL} \
-  --allow-cors ${SE_ALLOW_CORS} \
-  --relax-checks ${SE_RELAX_CHECKS} \
-  ${HOST_CONFIG} \
-  ${PORT_CONFIG} \
-  ${SE_OPTS}
+  --relax-checks \
+  ${SE_RELAX_CHECKS} ${HOST_CONFIG} ${PORT_CONFIG} ${SE_OPTS}

From bc41006d03ae0e5ce384ea7741b848af5b70d43b Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 30 Nov 2020 19:56:47 +0100
Subject: [PATCH 10/10] Enabling host and port config for the Queuer and
 Sessions

---
 SessionQueuer/start-selenium-grid-session-queuer.sh | 12 ++++++++++++
 Sessions/start-selenium-grid-sessions.sh            | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/SessionQueuer/start-selenium-grid-session-queuer.sh b/SessionQueuer/start-selenium-grid-session-queuer.sh
index d8d5574dc8..de706faf03 100755
--- a/SessionQueuer/start-selenium-grid-session-queuer.sh
+++ b/SessionQueuer/start-selenium-grid-session-queuer.sh
@@ -24,7 +24,19 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "Appending Selenium options: ${SE_OPTS}"
 fi
 
+if [ ! -z "$SE_SESSION_QUEUER_HOST" ]; then
+  echo "Using SE_SESSION_QUEUER_HOST: ${SE_SESSION_QUEUER_HOST}"
+  HOST_CONFIG="--host ${SE_SESSION_QUEUER_HOST}"
+fi
+
+if [ ! -z "$SE_SESSION_QUEUER_PORT" ]; then
+  echo "Using SE_SESSION_QUEUER_PORT: ${SE_SESSION_QUEUER_PORT}"
+  PORT_CONFIG="--port ${SE_SESSION_QUEUER_PORT}"
+fi
+
 java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar sessionqueuer \
   --publish-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_PUBLISH_PORT} \
   --subscribe-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_SUBSCRIBE_PORT} \
+  ${HOST_CONFIG} \
+  ${PORT_CONFIG} \
   ${SE_OPTS}
diff --git a/Sessions/start-selenium-grid-sessions.sh b/Sessions/start-selenium-grid-sessions.sh
index fe119afc61..82f75bc778 100755
--- a/Sessions/start-selenium-grid-sessions.sh
+++ b/Sessions/start-selenium-grid-sessions.sh
@@ -24,7 +24,19 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "Appending Selenium options: ${SE_OPTS}"
 fi
 
+if [ ! -z "$SE_SESSIONS_HOST" ]; then
+  echo "Using SE_SESSIONS_HOST: ${SE_SESSIONS_HOST}"
+  HOST_CONFIG="--host ${SE_SESSIONS_HOST}"
+fi
+
+if [ ! -z "$SE_SESSIONS_PORT" ]; then
+  echo "Using SE_SESSIONS_PORT: ${SE_SESSIONS_PORT}"
+  PORT_CONFIG="--port ${SE_SESSIONS_PORT}"
+fi
+
 java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar sessions \
   --publish-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_PUBLISH_PORT} \
   --subscribe-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_SUBSCRIBE_PORT} \
+  ${HOST_CONFIG} \
+  ${PORT_CONFIG} \
   ${SE_OPTS}