Merge pull request #64 from seleniumhq-community/4.17.0

Sync from upstream for 4.17.0
[deploy]

Author: VietND96

.github/workflows/helm-chart-test.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Setup Kubernetes environment
         run: make chart_setup_env
       - name: Build Docker images
-        run: NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build_multi
+        run: BUILD_ARGS="--build-arg TARGETARCH=amd64" NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
       - name: Build and lint charts
         run: |
           BUILD_DATE=${BUILD_DATE} make chart_build

.github/workflows/scan-dockerfile.yml

@@ -36,7 +36,7 @@ jobs:
           format: 'sarif'
           output: 'source-results.sarif'
           scanners: 'vuln,secret,misconfig'
-          skip-dirs: 'tests,Video'
+          skip-dirs: 'tests,Video,NodeChromium,NodeFirefox'
           exit-code: '${{ env.EXIT_CODE }}'
           severity: '${{ env.SEVERITY }}'
           limit-severities-for-sarif: true

Base/Dockerfile

@@ -135,15 +135,14 @@ RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/sup
 # so that the container can skip downloading them everytime it comes up
 #=====
 #RUN curl -fLo /tmp/cs https://github.com/coursier/launchers/raw/master/coursier \
-# RUN if [ `arch` = "aarch64" ] || [ `arch` = "x86_64" ]; then \
-RUN if [ `arch` = "aarch64" ]; then \
+RUN if [ `arch` = "aarch64" ] || [ `arch` = "x86_64" ]; then \
     curl -fL https://github.com/coursier/launchers/raw/master/cs-`arch`-pc-linux.gz | gzip -d > /tmp/cs \
-  && chmod +x /tmp/cs \
-  && mkdir -p /external_jars \
-  && chmod -R 775 /external_jars ; \
+    && chmod +x /tmp/cs \
+    && mkdir -p /external_jars \
+    && chmod -R 775 /external_jars ; \
     fi
 
-RUN if [ -f "/tmp/cs" ]; then \ 
+RUN if [ -f "/tmp/cs" ]; then \
     /tmp/cs fetch --classpath --cache /external_jars \
     io.opentelemetry:opentelemetry-exporter-otlp:${OPENTELEMETRY_VERSION} \
     io.opentelemetry:opentelemetry-exporter-jaeger:${OPENTELEMETRY_VERSION} \

NodeBase/Dockerfile

@@ -45,7 +45,7 @@ RUN apt-get -qqy update \
 #=====
 RUN apt-get update -qqy \
   && apt-get -qqy --no-install-recommends install \
-  x11vnc \
+  x11vnc x11-utils fluxbox \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #=========

NodeFirefox/Dockerfile.multi-arch

@@ -7,7 +7,7 @@ LABEL authors=${AUTHORS}
 ARG TARGETARCH
 ARG TARGETVARIANT
 
-ARG GECKODRIVER_VERSION=0.33.0
+ARG GECKODRIVER_VERSION=0.34.0
 
 USER root
 

charts/selenium-grid/README.md

@@ -464,7 +464,7 @@ By default, the uploader uses [RCLONE](https://rclone.org/) to upload the video
 
 The uploader requires `destinationPrefix` to be set. It is used to instruct the uploader where to upload the video. The format of destinationPrefix is `remote-name://bucket-name/path`. The `remote-name` is configured in RCLONE. The `bucket-name` is the name of the bucket in the remote location. The `path` is the path to the folder in the bucket.
 
-By default, the config file is loaded from file [configs/uploader/rclone/config.conf](configs/uploader/rclone/config.conf) to the Secret. You can override the config file via `--set-file uploaderConfigMap.secretFiles.config.conf=/path/to/your_config.conf` or set via YAML values.
+By default, the config file is loaded from file [configs/uploader/rclone/config.conf](configs/uploader/rclone/config.conf) to the Secret. You can override the config file via `--set-file uploaderConfigMap.secretFiles.config\.conf=/path/to/your_config.conf` or set via YAML values.
 
 For example, to configure an S3 remote hosted on AWS with named `mys3` and the bucket name is `mybucket`, you can set the following values:
 
@@ -511,7 +511,7 @@ videoRecorder:
 
 Those 2 ways are equivalent. You can choose one of them or combine them together. When both config file and ENV vars are set, value in `config.conf` will take precedence.
 
-Beside the configuration, the script for entry point of uploader container also needed. By default, it is loaded from file [configs/uploader/rclone/entry_point.sh](configs/uploader/rclone/entry_point.sh) to the ConfigMap. You can override the script via `--set-file uploaderConfigMap.extraScripts.entry_point.sh=/path/to/your_script.sh` or set via YAML values. For example:
+Beside the configuration, the script for entry point of uploader container also needed. By default, it is loaded from file [configs/uploader/rclone/entry_point.sh](configs/uploader/rclone/entry_point.sh) to the ConfigMap. You can override the script via `--set-file uploaderConfigMap.extraScripts.entry_point\.sh=/path/to/your_script.sh` or set via YAML values. For example:
 
 ```yaml
 uploaderConfigMap:
@@ -563,9 +563,9 @@ There are multiple ways to configure your certificate, private key, truststore t
     ```bash
     helm upgrade -i test selenium-grid \
     --set tls.enabled=true \
-    --set-file tls.certificate=/path/to/your_cert.pem \
-    --set-file tls.privateKey=/path/to/your_private_key.pkcs8 \
-    --set-file tls.trustStore=/path/to/your_truststore.jks \
+    --set-file tls.certificate=/path/to/your_cert\.pem \
+    --set-file tls.privateKey=/path/to/your_private_key\.pkcs8 \
+    --set-file tls.trustStore=/path/to/your_truststore\.jks \
     --set-string tls.trustStorePassword=your_truststore_password
     ```
 

charts/selenium-grid/configs/uploader/rclone/entry_point.sh

@@ -27,6 +27,10 @@ do
     else [ "$FILE" != "" ] && [ "$DESTINATION" != "" ];
         echo "Uploading ${FILE} to ${DESTINATION}"
         rclone --config ${UPLOAD_CONFIG_DIRECTORY}/${UPLOAD_CONFIG_FILE_NAME} ${UPLOAD_COMMAND} ${UPLOAD_OPTS} "${FILE}" "${DESTINATION}"
+        if [ $? -eq 0 ];
+        then
+          rm -rf $FILE
+        fi
     fi
     if [ -f ${SE_VIDEO_FOLDER}/force_exit ] && [ ! -s ${SE_VIDEO_FOLDER}/uploadpipe ];
     then