File tree Expand file tree Collapse file tree 4 files changed +13
-11
lines changed Expand file tree Collapse file tree 4 files changed +13
-11
lines changed Original file line number Diff line number Diff line change @@ -72,9 +72,9 @@ COPY supervisord.conf /etc
72
72
RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
73
73
&& touch /opt/selenium/config.toml \
74
74
&& chmod -R 777 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \
75
- && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10 .0/selenium-server-4.10 .0.jar \
75
+ && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11 .0/selenium-server-4.11 .0.jar \
76
76
-O /opt/selenium/selenium-server.jar \
77
- && 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 \
77
+ && 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 \
78
78
-O /opt/selenium/selenium-http-jdk-client.jar \
79
79
&& chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
80
80
&& 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
89
89
&& mkdir -p /external_jars \
90
90
&& chmod -R 775 /external_jars
91
91
92
- 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
92
+ 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
93
93
94
94
RUN chmod 664 /external_jars/.classpath.txt
95
95
Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ if [ "${CI:-false}" = "false" ]; then
7
7
source docker-selenium-tests/bin/activate
8
8
fi
9
9
10
- python -m pip install selenium==4.8.3 \
11
- docker===4.2.0 \
10
+ python -m pip install selenium==4.11.2 \
11
+ docker===6.1.3 \
12
12
| grep -v ' Requirement already satisfied'
13
13
14
14
python test.py $1
Original file line number Diff line number Diff line change 4
4
version : " 3"
5
5
services :
6
6
browser :
7
- image : selenium/node-${BROWSER}:${TAG:-test-video }
7
+ image : selenium/node-${BROWSER}:${TAG}
8
8
shm_size : 2gb
9
9
depends_on :
10
10
- selenium-hub
@@ -16,7 +16,7 @@ services:
16
16
- " 6900:5900"
17
17
18
18
browser_video :
19
- image : selenium/video:${VIDEO_TAG:-test-video }
19
+ image : selenium/video:${VIDEO_TAG}
20
20
volumes :
21
21
- ./videos:/videos
22
22
depends_on :
@@ -26,7 +26,7 @@ services:
26
26
- FILE_NAME=${VIDEO_FILE_NAME}
27
27
28
28
selenium-hub :
29
- image : selenium/hub:${TAG:-test-video }
29
+ image : selenium/hub:${TAG}
30
30
container_name : selenium-hub
31
31
ports :
32
32
- " 4442:4442"
Original file line number Diff line number Diff line change 12
12
logging .basicConfig (level = logging .INFO , format = "%(asctime)s - %(name)s - %(levelname)s - %(message)s" )
13
13
logger = logging .getLogger (__name__ )
14
14
15
- # Docker Client
16
- client = docker .from_env ()
17
-
18
15
NAMESPACE = os .environ .get ('NAMESPACE' )
19
16
VERSION = os .environ .get ('VERSION' )
20
17
USE_RANDOM_USER_ID = os .environ .get ('USE_RANDOM_USER_ID' )
24
21
no_proxy = os .environ .get ('no_proxy' , '' )
25
22
SKIP_BUILD = os .environ .get ('SKIP_BUILD' , False )
26
23
24
+ try :
25
+ client = docker .from_env ()
26
+ except :
27
+ client = None
28
+
27
29
IMAGE_NAME_MAP = {
28
30
# Hub
29
31
'Hub' : 'hub' ,
You can’t perform that action at this time.
0 commit comments