Set --user-data-dir using CHROME_ADDITIONAL_ARGS when -e ZALENIUM=true

Author: elgalu

CONTRIBUTING.md

@@ -12,7 +12,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Fix tzdata not installed credits @dubner @tnguyen14 @eitany https://goo.gl/n84gJl"
+    git commit -m "Set --user-data-dir using CHROME_ADDITIONAL_ARGS when -e ZALENIUM=true"
     git tag -d latest; git tag -d `cat VERSION`; git push origin :`cat VERSION`; git tag `cat VERSION` && git push --force origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -828,6 +828,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   SELENIUM_NODE_PARAMS="" \
   SELENIUM_NODE_PROXY_PARAMS="" \
   CHROME_ARGS="--no-sandbox --disable-gpu" \
+  CHROME_ADDITIONAL_ARGS="" \
   CHROME_VERBOSELOGGING="true" \
   MAX_INSTANCES=1 \
   MAX_SESSIONS=1 \
@@ -909,6 +910,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   VIDEO_REC_STOP_SIGNAL="INT" \
   DOCKER_SOCK="/var/run/docker.sock" \
   TEST_SLEEPS="0.5" \
+  ZALENIUM="false" \
   SEND_ANONYMOUS_USAGE_INFO="true" \
   GA_TRACKING_ID="UA-18144954-9" \
   GA_ENDPOINT=https://www.google-analytics.com/collect \

bin/entry.sh

@@ -173,6 +173,11 @@ fi
 # Fix extra quotes in Time zone $TZ env var
 export TZ=$(echo ${TZ} | sed "s/^\([\"']\)\(.*\)\1\$/\2/g")
 
+# When running for Zalenium prepare certain customizations
+if [ "${ZALENIUM}" == "true" ]; then
+  export CHROME_ADDITIONAL_ARGS="--user-data-dir=/home/seluser/chrome-user-data-dir"
+fi
+
 # TODO: Remove this duplicated logic
 if [ "${SELENIUM_HUB_PORT}" = "0" ]; then
   export SELENIUM_HUB_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})

selenium-node-chrome/bin/transfer-logs.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-# Try to retrieve Browser console logs
-cp /tmp/.*/chrome_debug.log "/var/log/cont/chrome_browser.log"
+# Try to retrieve Chrome Browser console logs when using this image through Zalenium
+cp /home/seluser/chrome-user-data-dir/chrome_debug.log /var/log/cont/chrome_browser.log

selenium-node-chrome/opt/google/chrome/google-chrome

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-exec /opt/google/chrome/google-chrome-base "$@" ${CHROME_ARGS}
+exec /opt/google/chrome/google-chrome-base "$@" ${CHROME_ARGS} ${CHROME_ADDITIONAL_ARGS}
 
 # See: On How To Turn Chrome or Firefox Into A Single-Site Browser
 # Google Chrome users can make use of the --host-rules parameter to block all domain connections except the ones they whitelist. The general parameter looks like this: