Enabling host and port config for other components (#1153)

SeleniumHQ · Nov 30, 2020 · 1828120 · 1828120
1 parent 78db9cf
commit 1828120
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 37 deletions.
diff --git 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="--port ${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}
diff --git 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="--port ${SE_EVENT_BUS_PORT}"
+fi
+
+java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar event-bus \
+  ${HOST_CONFIG} \
+  ${PORT_CONFIG} \
+  ${SE_OPTS}
diff --git a/Hub/Dockerfile.txt b/Hub/Dockerfile.txt
@@ -14,17 +14,8 @@ 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
 
-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
diff --git a/Hub/generate_config b/Hub/generate_config
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
@@ -3,17 +3,23 @@
 # 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
 
+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} \
-  ${SE_OPTS}
+  --session-request-timeout ${SE_SESSION_REQUEST_TIMEOUT} \
+  --session-retry-interval ${SE_SESSION_RETRY_INTERVAL} \
+  --relax-checks \
+  ${SE_RELAX_CHECKS} ${HOST_CONFIG} ${PORT_CONFIG} ${SE_OPTS}
diff --git 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}
diff --git 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
@@ -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}