Merge pull request #361 from vania-pooh/master

Ability to pass DRIVER_ARGS to images from the outside (fixes #360)
aerokube · Mar 8, 2021 · 5d1e1fa · 5d1e1fa
2 parents 9e5acdc + e2d72ed
commit 5d1e1fa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/static/chrome/entrypoint.sh b/static/chrome/entrypoint.sh
@@ -4,9 +4,9 @@ DISPLAY_NUM=99
 export DISPLAY=":$DISPLAY_NUM"
 
 VERBOSE=${VERBOSE:-""}
-DRIVER_ARGS=""
+DRIVER_ARGS=${DRIVER_ARGS:-""}
 if [ -n "$VERBOSE" ]; then
-    DRIVER_ARGS="--verbose"
+    DRIVER_ARGS="$DRIVER_ARGS --verbose"
 fi
 
 clean() {

diff --git a/static/edge/entrypoint.sh b/static/edge/entrypoint.sh
@@ -4,9 +4,9 @@ DISPLAY_NUM=99
 export DISPLAY=":$DISPLAY_NUM"
 
 VERBOSE=${VERBOSE:-""}
-DRIVER_ARGS=""
+DRIVER_ARGS=${DRIVER_ARGS:-""}
 if [ -n "$VERBOSE" ]; then
-    DRIVER_ARGS="--verbose"
+    DRIVER_ARGS="$DRIVER_ARGS --verbose"
 fi
 
 clean() {

diff --git a/static/firefox/selenoid/entrypoint.sh b/static/firefox/selenoid/entrypoint.sh
@@ -6,11 +6,11 @@ export DISPLAY=":$DISPLAY_NUM"
 cp /home/selenium/browsers.json /tmp
 
 VERBOSE=${VERBOSE:-""}
+DRIVER_ARGS=${DRIVER_ARGS:-""}
 if [ -n "$VERBOSE" ]; then
-    sed -i 's|@@DRIVER_ARGS@@|, "--log", "debug"|g' /tmp/browsers.json
-else
-    sed -i 's|@@DRIVER_ARGS@@||g' /tmp/browsers.json
+    DRIVER_ARGS="$DRIVER_ARGS, \"--log\", \"debug\""
 fi
+sed -i "s|@@DRIVER_ARGS@@|$DRIVER_ARGS|g" /tmp/browsers.json
 
 clean() {
   if [ -n "$FILESERVER_PID" ]; then

diff --git a/static/opera/entrypoint.sh b/static/opera/entrypoint.sh
@@ -4,9 +4,9 @@ DISPLAY_NUM=99
 export DISPLAY=":$DISPLAY_NUM"
 
 VERBOSE=${VERBOSE:-""}
-DRIVER_ARGS=""
+DRIVER_ARGS=${DRIVER_ARGS:-""}
 if [ -n "$VERBOSE" ]; then
-    DRIVER_ARGS="--verbose"
+    DRIVER_ARGS="$DRIVER_ARGS --verbose"
 fi
 
 clean() {

diff --git a/static/yandex/entrypoint.sh b/static/yandex/entrypoint.sh
@@ -4,9 +4,9 @@ DISPLAY_NUM=99
 export DISPLAY=":$DISPLAY_NUM"
 
 VERBOSE=${VERBOSE:-""}
-DRIVER_ARGS=""
+DRIVER_ARGS=${DRIVER_ARGS:-""}
 if [ -n "$VERBOSE" ]; then
-    DRIVER_ARGS="--verbose"
+    DRIVER_ARGS="$DRIVER_ARGS --verbose"
 fi
 
 clean() {