diff --git a/selenium/base/base_6/Dockerfile b/selenium/base/base_6/Dockerfile index 55ea53111..ba9d5675c 100644 --- a/selenium/base/base_6/Dockerfile +++ b/selenium/base/base_6/Dockerfile @@ -44,6 +44,7 @@ RUN \ libfreetype6 \ libxfont2 \ libxft2 \ + libnss3-tools \ xfonts-base \ xfonts-encodings \ xfonts-utils \ diff --git a/selenium/base/java/Dockerfile b/selenium/base/java/Dockerfile index 071ef8c54..b6a4cf993 100644 --- a/selenium/base/java/Dockerfile +++ b/selenium/base/java/Dockerfile @@ -1,7 +1,7 @@ -FROM selenoid/base:5.0 +FROM selenoid/base:6.0 RUN \ apt-get update && \ apt-get install -y openjdk-8-jre-headless && \ apt-get clean && \ - rm -Rf /tmp/* \ No newline at end of file + rm -Rf /tmp/* diff --git a/selenium/chrome/apt/Dockerfile b/selenium/chrome/apt/Dockerfile index 115da5e26..8219fa8cc 100644 --- a/selenium/chrome/apt/Dockerfile +++ b/selenium/chrome/apt/Dockerfile @@ -1,4 +1,4 @@ -FROM selenoid/base:5.0 +FROM selenoid/base:6.0 ARG VERSION ARG CLEANUP diff --git a/selenium/chrome/entrypoint.sh b/selenium/chrome/entrypoint.sh index 9c74ad2ef..07cf28fca 100755 --- a/selenium/chrome/entrypoint.sh +++ b/selenium/chrome/entrypoint.sh @@ -10,6 +10,20 @@ if [ -z "$QUIET" ]; then DRIVER_ARGS="--verbose" fi +ROOT_CA_PATH=${ROOT_CA_PATH:-""} +if [ -r "$ROOT_CA_PATH" ]; then + ROOT_CA=$(<"$ROOT_CA_PATH") + ROOT_CA_NAME=$(basename "$ROOT_CA_PATH" | sed -e 's|.crt||g') +fi + +ROOT_CA=${ROOT_CA:-""} +if [ -n "$ROOT_CA" ]; then + ROOT_CA_NAME=${ROOT_CA_NAME:-"UserRootCA"} + mkdir -p ~/.pki/nssdb + certutil -d "sql:$HOME/.pki/nssdb" -N --empty-password + echo "$ROOT_CA" | certutil -d "sql:$HOME/.pki/nssdb" -A -t TC -n "$ROOT_CA_NAME" +fi + clean() { if [ -n "$FILESERVER_PID" ]; then kill -TERM "$FILESERVER_PID" diff --git a/selenium/chrome/local/Dockerfile b/selenium/chrome/local/Dockerfile index ba17f0a9a..9b1a3172b 100644 --- a/selenium/chrome/local/Dockerfile +++ b/selenium/chrome/local/Dockerfile @@ -1,4 +1,4 @@ -FROM selenoid/base:5.0 +FROM selenoid/base:6.0 ARG VERSION=noop ARG CLEANUP=noop diff --git a/selenium/firefox/apt/Dockerfile.tmpl b/selenium/firefox/apt/Dockerfile.tmpl index 528fc8c51..f8f19773e 100644 --- a/selenium/firefox/apt/Dockerfile.tmpl +++ b/selenium/firefox/apt/Dockerfile.tmpl @@ -1,4 +1,4 @@ -FROM selenoid/base:5.0@@REQUIRES_JAVA@@ +FROM selenoid/base:6.0@@REQUIRES_JAVA@@ ARG VERSION ARG CLEANUP diff --git a/selenium/firefox/local/Dockerfile.tmpl b/selenium/firefox/local/Dockerfile.tmpl index b17b8b0e4..c505d372c 100644 --- a/selenium/firefox/local/Dockerfile.tmpl +++ b/selenium/firefox/local/Dockerfile.tmpl @@ -1,4 +1,4 @@ -FROM selenoid/base:5.0@@REQUIRES_JAVA@@ +FROM selenoid/base:6.0@@REQUIRES_JAVA@@ ARG VERSION=noop ARG CLEANUP diff --git a/selenium/opera/blink/apt/Dockerfile b/selenium/opera/blink/apt/Dockerfile index adea5a22b..51dc2caa8 100644 --- a/selenium/opera/blink/apt/Dockerfile +++ b/selenium/opera/blink/apt/Dockerfile @@ -1,4 +1,4 @@ -FROM selenoid/base:5.0 +FROM selenoid/base:6.0 ARG VERSION ARG CLEANUP diff --git a/selenium/opera/blink/entrypoint.sh b/selenium/opera/blink/entrypoint.sh index af21c896f..e1d027e64 100755 --- a/selenium/opera/blink/entrypoint.sh +++ b/selenium/opera/blink/entrypoint.sh @@ -10,13 +10,27 @@ if [ -z "$QUIET" ]; then DRIVER_ARGS="--verbose" fi +ROOT_CA_PATH=${ROOT_CA_PATH:-""} +if [ -r "$ROOT_CA_PATH" ]; then + ROOT_CA=$(<"$ROOT_CA_PATH") + ROOT_CA_NAME=$(basename "$ROOT_CA_PATH" | sed -e 's|.crt||g') +fi + +ROOT_CA=${ROOT_CA:-""} +if [ -n "$ROOT_CA" ]; then + ROOT_CA_NAME=${ROOT_CA_NAME:-"UserRootCA"} + mkdir -p ~/.pki/nssdb + certutil -d "sql:$HOME/.pki/nssdb" -N --empty-password + echo "$ROOT_CA" | certutil -d "sql:$HOME/.pki/nssdb" -A -t TC -n "$ROOT_CA_NAME" +fi + clean() { if [ -n "$FILESERVER_PID" ]; then kill -TERM "$FILESERVER_PID" fi if [ -n "$XSELD_PID" ]; then kill -TERM "$XSELD_PID" - fi + fi if [ -n "$XVFB_PID" ]; then kill -TERM "$XVFB_PID" fi diff --git a/selenium/opera/blink/local/Dockerfile b/selenium/opera/blink/local/Dockerfile index bf8e41c8d..b0fb6a6ee 100644 --- a/selenium/opera/blink/local/Dockerfile +++ b/selenium/opera/blink/local/Dockerfile @@ -1,4 +1,4 @@ -FROM selenoid/base:5.0 +FROM selenoid/base:6.0 ARG VERSION=noop ARG CLEANUP=noop diff --git a/selenium/opera/presto/Dockerfile b/selenium/opera/presto/Dockerfile index 2be565a12..974c29441 100644 --- a/selenium/opera/presto/Dockerfile +++ b/selenium/opera/presto/Dockerfile @@ -1,4 +1,4 @@ -FROM selenoid/base:5.0_java +FROM selenoid/base:6.0_java ARG VERSION=12.16.1860 ARG CLEANUP diff --git a/selenium/yandex/apt/Dockerfile b/selenium/yandex/apt/Dockerfile index 299720e73..41649c016 100644 --- a/selenium/yandex/apt/Dockerfile +++ b/selenium/yandex/apt/Dockerfile @@ -1,4 +1,4 @@ -FROM selenoid/base:5.0 +FROM selenoid/base:6.0 ARG VERSION=19.4.2.698-1 ARG CLEANUP diff --git a/selenium/yandex/entrypoint.sh b/selenium/yandex/entrypoint.sh index 3bf21a747..39f3a3dbe 100755 --- a/selenium/yandex/entrypoint.sh +++ b/selenium/yandex/entrypoint.sh @@ -10,6 +10,20 @@ if [ -z "$QUIET" ]; then DRIVER_ARGS="--verbose" fi +ROOT_CA_PATH=${ROOT_CA_PATH:-""} +if [ -r "$ROOT_CA_PATH" ]; then + ROOT_CA=$(<"$ROOT_CA_PATH") + ROOT_CA_NAME=$(basename "$ROOT_CA_PATH" | sed -e 's|.crt||g') +fi + +ROOT_CA=${ROOT_CA:-""} +if [ -n "$ROOT_CA" ]; then + ROOT_CA_NAME=${ROOT_CA_NAME:-"UserRootCA"} + mkdir -p ~/.pki/nssdb + certutil -d "sql:$HOME/.pki/nssdb" -N --empty-password + echo "$ROOT_CA" | certutil -d "sql:$HOME/.pki/nssdb" -A -t TC -n "$ROOT_CA_NAME" +fi + clean() { if [ -n "$FILESERVER_PID" ]; then kill -TERM "$FILESERVER_PID" diff --git a/selenium/yandex/local/Dockerfile b/selenium/yandex/local/Dockerfile index aca23aaf4..c0db1f115 100644 --- a/selenium/yandex/local/Dockerfile +++ b/selenium/yandex/local/Dockerfile @@ -1,4 +1,4 @@ -FROM selenoid/base:5.0 +FROM selenoid/base:6.0 ARG VERSION=noop ARG CLEANUP=noop