From f6df534cf8c45b991c81026a62b7da569f30d702 Mon Sep 17 00:00:00 2001 From: abdallah ghdiri Date: Sat, 1 Feb 2025 14:26:52 +0100 Subject: [PATCH 1/2] add optional environment variable for configuring additional browser CLI flags --- karate-docker/karate-chrome/entrypoint.sh | 1 + karate-docker/karate-chrome/supervisord.conf | 1 + karate-docker/karate-chromium/entrypoint.sh | 1 + karate-docker/karate-chromium/supervisord.conf | 1 + karate-docker/karate-firefox/entrypoint.sh | 1 + karate-docker/karate-firefox/supervisord.conf | 1 + 6 files changed, 6 insertions(+) diff --git a/karate-docker/karate-chrome/entrypoint.sh b/karate-docker/karate-chrome/entrypoint.sh index 3df51f8cd..fbf20c54b 100644 --- a/karate-docker/karate-chrome/entrypoint.sh +++ b/karate-docker/karate-chrome/entrypoint.sh @@ -16,6 +16,7 @@ if [ -z "$KARATE_SOCAT_START" ] export KARATE_SOCAT_START="true" export KARATE_CHROME_PORT="9223" fi +[ -z "$KARATE_BROWSER_ADDITIONAL_FLAGS" ] && export KARATE_BROWSER_ADDITIONAL_FLAGS="" [ -z "$KARATE_WIDTH" ] && export KARATE_WIDTH="1280" [ -z "$KARATE_HEIGHT" ] && export KARATE_HEIGHT="720" exec /usr/bin/supervisord -c /etc/supervisord.conf diff --git a/karate-docker/karate-chrome/supervisord.conf b/karate-docker/karate-chrome/supervisord.conf index 52c145a5c..c1ec1330a 100644 --- a/karate-docker/karate-chrome/supervisord.conf +++ b/karate-docker/karate-chrome/supervisord.conf @@ -52,6 +52,7 @@ command=/usr/bin/google-chrome --force-device-scale-factor=1 --remote-allow-origins=* --remote-debugging-port=%(ENV_KARATE_CHROME_PORT)s + %(ENV_KARATE_BROWSER_ADDITIONAL_FLAGS)s autorestart=true priority=400 diff --git a/karate-docker/karate-chromium/entrypoint.sh b/karate-docker/karate-chromium/entrypoint.sh index 3df51f8cd..fbf20c54b 100644 --- a/karate-docker/karate-chromium/entrypoint.sh +++ b/karate-docker/karate-chromium/entrypoint.sh @@ -16,6 +16,7 @@ if [ -z "$KARATE_SOCAT_START" ] export KARATE_SOCAT_START="true" export KARATE_CHROME_PORT="9223" fi +[ -z "$KARATE_BROWSER_ADDITIONAL_FLAGS" ] && export KARATE_BROWSER_ADDITIONAL_FLAGS="" [ -z "$KARATE_WIDTH" ] && export KARATE_WIDTH="1280" [ -z "$KARATE_HEIGHT" ] && export KARATE_HEIGHT="720" exec /usr/bin/supervisord -c /etc/supervisord.conf diff --git a/karate-docker/karate-chromium/supervisord.conf b/karate-docker/karate-chromium/supervisord.conf index bb700fd05..10d187e9b 100644 --- a/karate-docker/karate-chromium/supervisord.conf +++ b/karate-docker/karate-chromium/supervisord.conf @@ -52,6 +52,7 @@ command=/usr/bin/chromium --force-device-scale-factor=1 --remote-allow-origins=* --remote-debugging-port=%(ENV_KARATE_CHROME_PORT)s + %(ENV_KARATE_BROWSER_ADDITIONAL_FLAGS)s autorestart=true priority=400 diff --git a/karate-docker/karate-firefox/entrypoint.sh b/karate-docker/karate-firefox/entrypoint.sh index 6136f8def..01c38e8ae 100644 --- a/karate-docker/karate-firefox/entrypoint.sh +++ b/karate-docker/karate-firefox/entrypoint.sh @@ -16,6 +16,7 @@ if [ -z "$KARATE_SOCAT_START" ] export KARATE_SOCAT_START="true" export KARATE_CHROME_PORT="9223" fi +[ -z "$KARATE_BROWSER_ADDITIONAL_FLAGS" ] && export KARATE_BROWSER_ADDITIONAL_FLAGS="" [ -z "$KARATE_WIDTH" ] && export KARATE_WIDTH="1280" [ -z "$KARATE_HEIGHT" ] && export KARATE_HEIGHT="720" exec /usr/bin/supervisord diff --git a/karate-docker/karate-firefox/supervisord.conf b/karate-docker/karate-firefox/supervisord.conf index 9704a1e20..c7f688b8c 100644 --- a/karate-docker/karate-firefox/supervisord.conf +++ b/karate-docker/karate-firefox/supervisord.conf @@ -45,6 +45,7 @@ command=/usr/bin/firefox --window-size=%(ENV_KARATE_WIDTH)s,%(ENV_KARATE_HEIGHT)s --force-device-scale-factor=1 --remote-debugging-port=%(ENV_KARATE_CHROME_PORT)s + %(ENV_KARATE_BROWSER_ADDITIONAL_FLAGS)s autorestart=true priority=400 From b3e6897dff950b2ad8ba8ab54f308debe195ff9d Mon Sep 17 00:00:00 2001 From: abdallah ghdiri Date: Fri, 7 Feb 2025 21:22:35 +0100 Subject: [PATCH 2/2] change var name to KARATE_CHROME_ADD_OPTIONS --- karate-docker/karate-chrome/entrypoint.sh | 2 +- karate-docker/karate-chrome/supervisord.conf | 2 +- karate-docker/karate-chromium/entrypoint.sh | 2 +- karate-docker/karate-chromium/supervisord.conf | 2 +- karate-docker/karate-firefox/entrypoint.sh | 2 +- karate-docker/karate-firefox/supervisord.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/karate-docker/karate-chrome/entrypoint.sh b/karate-docker/karate-chrome/entrypoint.sh index fbf20c54b..700a4f1ef 100644 --- a/karate-docker/karate-chrome/entrypoint.sh +++ b/karate-docker/karate-chrome/entrypoint.sh @@ -16,7 +16,7 @@ if [ -z "$KARATE_SOCAT_START" ] export KARATE_SOCAT_START="true" export KARATE_CHROME_PORT="9223" fi -[ -z "$KARATE_BROWSER_ADDITIONAL_FLAGS" ] && export KARATE_BROWSER_ADDITIONAL_FLAGS="" +[ -z "$KARATE_CHROME_ADD_OPTIONS" ] && export KARATE_CHROME_ADD_OPTIONS="" [ -z "$KARATE_WIDTH" ] && export KARATE_WIDTH="1280" [ -z "$KARATE_HEIGHT" ] && export KARATE_HEIGHT="720" exec /usr/bin/supervisord -c /etc/supervisord.conf diff --git a/karate-docker/karate-chrome/supervisord.conf b/karate-docker/karate-chrome/supervisord.conf index c1ec1330a..111670440 100644 --- a/karate-docker/karate-chrome/supervisord.conf +++ b/karate-docker/karate-chrome/supervisord.conf @@ -52,7 +52,7 @@ command=/usr/bin/google-chrome --force-device-scale-factor=1 --remote-allow-origins=* --remote-debugging-port=%(ENV_KARATE_CHROME_PORT)s - %(ENV_KARATE_BROWSER_ADDITIONAL_FLAGS)s + %(ENV_KARATE_CHROME_ADD_OPTIONS)s autorestart=true priority=400 diff --git a/karate-docker/karate-chromium/entrypoint.sh b/karate-docker/karate-chromium/entrypoint.sh index fbf20c54b..700a4f1ef 100644 --- a/karate-docker/karate-chromium/entrypoint.sh +++ b/karate-docker/karate-chromium/entrypoint.sh @@ -16,7 +16,7 @@ if [ -z "$KARATE_SOCAT_START" ] export KARATE_SOCAT_START="true" export KARATE_CHROME_PORT="9223" fi -[ -z "$KARATE_BROWSER_ADDITIONAL_FLAGS" ] && export KARATE_BROWSER_ADDITIONAL_FLAGS="" +[ -z "$KARATE_CHROME_ADD_OPTIONS" ] && export KARATE_CHROME_ADD_OPTIONS="" [ -z "$KARATE_WIDTH" ] && export KARATE_WIDTH="1280" [ -z "$KARATE_HEIGHT" ] && export KARATE_HEIGHT="720" exec /usr/bin/supervisord -c /etc/supervisord.conf diff --git a/karate-docker/karate-chromium/supervisord.conf b/karate-docker/karate-chromium/supervisord.conf index 10d187e9b..a4693e534 100644 --- a/karate-docker/karate-chromium/supervisord.conf +++ b/karate-docker/karate-chromium/supervisord.conf @@ -52,7 +52,7 @@ command=/usr/bin/chromium --force-device-scale-factor=1 --remote-allow-origins=* --remote-debugging-port=%(ENV_KARATE_CHROME_PORT)s - %(ENV_KARATE_BROWSER_ADDITIONAL_FLAGS)s + %(ENV_KARATE_CHROME_ADD_OPTIONS)s autorestart=true priority=400 diff --git a/karate-docker/karate-firefox/entrypoint.sh b/karate-docker/karate-firefox/entrypoint.sh index 01c38e8ae..9a47293a2 100644 --- a/karate-docker/karate-firefox/entrypoint.sh +++ b/karate-docker/karate-firefox/entrypoint.sh @@ -16,7 +16,7 @@ if [ -z "$KARATE_SOCAT_START" ] export KARATE_SOCAT_START="true" export KARATE_CHROME_PORT="9223" fi -[ -z "$KARATE_BROWSER_ADDITIONAL_FLAGS" ] && export KARATE_BROWSER_ADDITIONAL_FLAGS="" +[ -z "$KARATE_CHROME_ADD_OPTIONS" ] && export KARATE_CHROME_ADD_OPTIONS="" [ -z "$KARATE_WIDTH" ] && export KARATE_WIDTH="1280" [ -z "$KARATE_HEIGHT" ] && export KARATE_HEIGHT="720" exec /usr/bin/supervisord diff --git a/karate-docker/karate-firefox/supervisord.conf b/karate-docker/karate-firefox/supervisord.conf index c7f688b8c..d0a9e47c8 100644 --- a/karate-docker/karate-firefox/supervisord.conf +++ b/karate-docker/karate-firefox/supervisord.conf @@ -45,7 +45,7 @@ command=/usr/bin/firefox --window-size=%(ENV_KARATE_WIDTH)s,%(ENV_KARATE_HEIGHT)s --force-device-scale-factor=1 --remote-debugging-port=%(ENV_KARATE_CHROME_PORT)s - %(ENV_KARATE_BROWSER_ADDITIONAL_FLAGS)s + %(ENV_KARATE_CHROME_ADD_OPTIONS)s autorestart=true priority=400