Enable deployment of selenium docker images to restrictive Kubernetes (SeleniumHQ#1414)

* Enable deployment of selenium docker images to restrictive Kubernetes contexts

* Remove Directory creation after merge request feedback

Co-authored-by: Diego Molina <[email protected]>

Author: ptriller1und1

NodeBase/Dockerfile.txt

@@ -162,6 +162,9 @@ ENV DISPLAY :99.0
 ENV DISPLAY_NUM 99
 ENV START_XVFB true
 ENV START_NO_VNC true
+# Path to the Configfile
+ENV CONFIG_FILE=/opt/selenium/config.toml
+ENV GENERATE_CONFIG true
 
 #========================
 # Selenium Configuration

NodeBase/generate_config

@@ -6,41 +6,48 @@ function short_version() {
     echo "${__version_split[0]}.${__version_split[1]}"
 }
 
+
+if [[ -z "$CONFIG_FILE" ]]; then
+FILENAME="/opt/selenium/config.toml"
+else
+FILENAME="$CONFIG_FILE"
+fi
+
 echo "[events]
 publish = \"tcp://${SE_EVENT_BUS_HOST}:${SE_EVENT_BUS_PUBLISH_PORT}\"
 subscribe = \"tcp://${SE_EVENT_BUS_HOST}:${SE_EVENT_BUS_SUBSCRIBE_PORT}\"
-" > /opt/selenium/config.toml
+" > "$FILENAME"
 
 if [[ -z "${SE_NODE_HOST}" ]] && [[ -z "${SE_NODE_PORT}" ]]; then
   echo "Configuring server..."
 else
-  echo "[server]" >> /opt/selenium/config.toml
+  echo "[server]" >> "$FILENAME"
 fi
 
 if [[ -z "${SE_NODE_HOST}" ]]; then
   echo "Setting up SE_NODE_HOST..."
 else
-  echo "host = \"${SE_NODE_HOST}\"" >> /opt/selenium/config.toml
+  echo "host = \"${SE_NODE_HOST}\"" >> "$FILENAME"
 fi
 
 if [[ -z "${SE_NODE_PORT}" ]]; then
   echo "Setting up SE_NODE_PORT..."
 else
-  echo "port = \"${SE_NODE_PORT}\"" >> /opt/selenium/config.toml
+  echo "port = \"${SE_NODE_PORT}\"" >> "$FILENAME"
 fi
 
-echo "[node]" >> /opt/selenium/config.toml
+echo "[node]" >> "$FILENAME"
 # String, Url where the Grid can be reached
 if [[ -z "${SE_NODE_GRID_URL}" ]]; then
   echo "Setting up SE_NODE_GRID_URL..."
 else
-  echo "grid-url = \"${SE_NODE_GRID_URL}\"" >> /opt/selenium/config.toml
+  echo "grid-url = \"${SE_NODE_GRID_URL}\"" >> "$FILENAME"
 fi
-echo "session-timeout = \"${SE_NODE_SESSION_TIMEOUT}\"" >> /opt/selenium/config.toml
-echo "override-max-sessions = ${SE_NODE_OVERRIDE_MAX_SESSIONS}" >> /opt/selenium/config.toml
-echo "detect-drivers = false" >> /opt/selenium/config.toml
+echo "session-timeout = \"${SE_NODE_SESSION_TIMEOUT}\"" >> "$FILENAME"
+echo "override-max-sessions = ${SE_NODE_OVERRIDE_MAX_SESSIONS}" >> "$FILENAME"
+echo "detect-drivers = false" >> "$FILENAME"
 echo "max-sessions = ${SE_NODE_MAX_SESSIONS}
-" >> /opt/selenium/config.toml
+" >> "$FILENAME"
 
 SE_NODE_BROWSER_NAME=$(cat /opt/selenium/browser_name)
 if [[ "${SE_NODE_BROWSER_NAME}" == "chrome" ]]; then
@@ -52,11 +59,11 @@ elif [[ "${SE_NODE_BROWSER_NAME}" == "MicrosoftEdge" ]]; then
 fi
 
 SE_NODE_STEREOTYPE="{\"browserName\": \"${SE_NODE_BROWSER_NAME}\", \"browserVersion\": \"${SE_NODE_BROWSER_VERSION}\", \"platformName\": \"Linux\"}"
-echo "[[node.driver-configuration]]" >> /opt/selenium/config.toml
-echo "display-name = \"${SE_NODE_BROWSER_NAME}\"" >> /opt/selenium/config.toml
-echo "stereotype = '${SE_NODE_STEREOTYPE}'" >> /opt/selenium/config.toml
+echo "[[node.driver-configuration]]" >> "$FILENAME"
+echo "display-name = \"${SE_NODE_BROWSER_NAME}\"" >> "$FILENAME"
+echo "stereotype = '${SE_NODE_STEREOTYPE}'" >> "$FILENAME"
 echo "max-sessions = ${SE_NODE_MAX_SESSIONS}
-" >> /opt/selenium/config.toml
+" >> "$FILENAME"
 
 
 

NodeBase/start-selenium-node.sh

@@ -31,11 +31,13 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "Appending Selenium options: ${SE_OPTS}"
 fi
 
-/opt/bin/generate_config
-
+if [ "$GENERATE_CONFIG" = true ]; then
+  echo "Generating Selenium Config"
+  /opt/bin/generate_config
+fi
 echo "Selenium Grid Node configuration: "
-cat /opt/selenium/config.toml
+cat "$CONFIG_FILE"
 echo "Starting Selenium Grid Node..."
 java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar node \
-  --config /opt/selenium/config.toml \
+  --config "$CONFIG_FILE" \
   ${SE_OPTS}

Standalone/generate_config

@@ -6,22 +6,28 @@ function short_version() {
     echo "${__version_split[0]}.${__version_split[1]}"
 }
 
+if [[ -z "$CONFIG_FILE" ]]; then
+FILENAME="/opt/selenium/config.toml"
+else
+FILENAME="$CONFIG_FILE"
+fi
+
 echo "[network]
 relax-checks = ${SE_RELAX_CHECKS}
-" > /opt/selenium/config.toml
+" > "$FILENAME"
 
-echo "[node]" >> /opt/selenium/config.toml
+echo "[node]" >> "$FILENAME"
 # String, Url where the Grid can be reached
 if [[ -z "${SE_NODE_GRID_URL}" ]]; then
   echo "Setting up SE_NODE_GRID_URL..."
 else
-  echo "grid-url = \"${SE_NODE_GRID_URL}\"" >> /opt/selenium/config.toml
+  echo "grid-url = \"${SE_NODE_GRID_URL}\"" >> "$FILENAME"
 fi
-echo "session-timeout = \"${SE_NODE_SESSION_TIMEOUT}\"" >> /opt/selenium/config.toml
-echo "override-max-sessions = ${SE_NODE_OVERRIDE_MAX_SESSIONS}" >> /opt/selenium/config.toml
-echo "detect-drivers = false" >> /opt/selenium/config.toml
+echo "session-timeout = \"${SE_NODE_SESSION_TIMEOUT}\"" >> "$FILENAME"
+echo "override-max-sessions = ${SE_NODE_OVERRIDE_MAX_SESSIONS}" >> "$FILENAME"
+echo "detect-drivers = false" >> "$FILENAME"
 echo "max-sessions = ${SE_NODE_MAX_SESSIONS}
-" >> /opt/selenium/config.toml
+" >> "$FILENAME"
 
 SE_NODE_BROWSER_NAME=$(cat /opt/selenium/browser_name)
 if [[ "${SE_NODE_BROWSER_NAME}" == "chrome" ]]; then
@@ -33,11 +39,11 @@ elif [[ "${SE_NODE_BROWSER_NAME}" == "MicrosoftEdge" ]]; then
 fi
 
 SE_NODE_STEREOTYPE="{\"browserName\": \"${SE_NODE_BROWSER_NAME}\", \"browserVersion\": \"${SE_NODE_BROWSER_VERSION}\", \"platformName\": \"Linux\"}"
-echo "[[node.driver-configuration]]" >> /opt/selenium/config.toml
-echo "display-name = \"${SE_NODE_BROWSER_NAME}\"" >> /opt/selenium/config.toml
-echo "stereotype = '${SE_NODE_STEREOTYPE}'" >> /opt/selenium/config.toml
+echo "[[node.driver-configuration]]" >> "$FILENAME"
+echo "display-name = \"${SE_NODE_BROWSER_NAME}\"" >> "$FILENAME"
+echo "stereotype = '${SE_NODE_STEREOTYPE}'" >> "$FILENAME"
 echo "max-sessions = ${SE_NODE_MAX_SESSIONS}
-" >> /opt/selenium/config.toml
+" >> "$FILENAME"