From 8e8e5f224a3fa4ddb17ec198c637dbeff69917fb Mon Sep 17 00:00:00 2001
From: Luis Correia <buga@loide.net>
Date: Tue, 1 Aug 2023 22:05:43 +0100
Subject: [PATCH] Bump to 4.11.0 (#1905)

[deploy]
---
 Base/Dockerfile                        | 6 +++---
 tests/bootstrap.sh                     | 4 ++--
 tests/docker-compose-v3-test-video.yml | 6 +++---
 tests/test.py                          | 8 +++++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Base/Dockerfile b/Base/Dockerfile
index 1b9614240..a9e3eda41 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -72,9 +72,9 @@ COPY supervisord.conf /etc
 RUN  mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
   && touch /opt/selenium/config.toml \
   && chmod -R 777 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \
-  && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/selenium-server-4.10.0.jar \
+  && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11.0/selenium-server-4.11.0.jar \
     -O /opt/selenium/selenium-server.jar \
-  && wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.10.0/selenium-http-jdk-client-4.10.0.jar \
+  && wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.11.0/selenium-http-jdk-client-4.11.0.jar \
     -O /opt/selenium/selenium-http-jdk-client.jar \
   && chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
   && chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
@@ -89,7 +89,7 @@ RUN curl -fLo /tmp/cs https://github.com/coursier/launchers/raw/master/coursier
   && mkdir -p /external_jars \
   && chmod -R 775 /external_jars
 
-RUN /tmp/cs fetch --classpath --cache /external_jars io.opentelemetry:opentelemetry-exporter-jaeger:1.22.0 io.grpc:grpc-netty:1.52.1 > /external_jars/.classpath.txt
+RUN /tmp/cs fetch --classpath --cache /external_jars io.opentelemetry:opentelemetry-exporter-jaeger:1.26.0 io.grpc:grpc-netty:1.55.1 > /external_jars/.classpath.txt
 
 RUN chmod 664 /external_jars/.classpath.txt
 
diff --git a/tests/bootstrap.sh b/tests/bootstrap.sh
index e60872293..cb2ca62dc 100755
--- a/tests/bootstrap.sh
+++ b/tests/bootstrap.sh
@@ -7,8 +7,8 @@ if [ "${CI:-false}" = "false" ]; then
   source docker-selenium-tests/bin/activate
 fi
 
-python -m pip install selenium==4.8.3 \
-                      docker===4.2.0 \
+python -m pip install selenium==4.11.2 \
+                      docker===6.1.3 \
                       | grep -v 'Requirement already satisfied'
 
 python test.py $1
diff --git a/tests/docker-compose-v3-test-video.yml b/tests/docker-compose-v3-test-video.yml
index dd8597749..e80c56b92 100644
--- a/tests/docker-compose-v3-test-video.yml
+++ b/tests/docker-compose-v3-test-video.yml
@@ -4,7 +4,7 @@
 version: "3"
 services:
   browser:
-    image: selenium/node-${BROWSER}:${TAG:-test-video}
+    image: selenium/node-${BROWSER}:${TAG}
     shm_size: 2gb
     depends_on:
       - selenium-hub
@@ -16,7 +16,7 @@ services:
       - "6900:5900"
 
   browser_video:
-    image: selenium/video:${VIDEO_TAG:-test-video}
+    image: selenium/video:${VIDEO_TAG}
     volumes:
       - ./videos:/videos
     depends_on:
@@ -26,7 +26,7 @@ services:
       - FILE_NAME=${VIDEO_FILE_NAME}
 
   selenium-hub:
-    image: selenium/hub:${TAG:-test-video}
+    image: selenium/hub:${TAG}
     container_name: selenium-hub
     ports:
       - "4442:4442"
diff --git a/tests/test.py b/tests/test.py
index d15e2899c..6efe34280 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -12,9 +12,6 @@
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 logger = logging.getLogger(__name__)
 
-# Docker Client
-client = docker.from_env()
-
 NAMESPACE = os.environ.get('NAMESPACE')
 VERSION = os.environ.get('VERSION')
 USE_RANDOM_USER_ID = os.environ.get('USE_RANDOM_USER_ID')
@@ -24,6 +21,11 @@
 no_proxy = os.environ.get('no_proxy', '')
 SKIP_BUILD = os.environ.get('SKIP_BUILD', False)
 
+try:
+    client = docker.from_env()
+except:
+    client = None
+
 IMAGE_NAME_MAP = {
     # Hub
     'Hub': 'hub',