This repository was archived by the owner on Jun 22, 2024. It is now read-only.
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
7272RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
7373 && touch /opt/selenium/config.toml \
7474 && 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 \
7676 -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 \
7878 -O /opt/selenium/selenium-http-jdk-client.jar \
7979 && chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
8080 && 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
8989 && mkdir -p /external_jars \
9090 && chmod -R 775 /external_jars
9191
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
9393
9494RUN chmod 664 /external_jars/.classpath.txt
9595
Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ if [ "${CI:-false}" = "false" ]; then
77 source docker-selenium-tests/bin/activate
88fi
99
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 \
1212 | grep -v ' Requirement already satisfied'
1313
1414python test.py $1
Original file line number Diff line number Diff line change 44version : " 3"
55services :
66 browser :
7- image : selenium/node-${BROWSER}:${TAG:-test-video }
7+ image : selenium/node-${BROWSER}:${TAG}
88 shm_size : 2gb
99 depends_on :
1010 - selenium-hub
@@ -16,7 +16,7 @@ services:
1616 - " 6900:5900"
1717
1818 browser_video :
19- image : selenium/video:${VIDEO_TAG:-test-video }
19+ image : selenium/video:${VIDEO_TAG}
2020 volumes :
2121 - ./videos:/videos
2222 depends_on :
@@ -26,7 +26,7 @@ services:
2626 - FILE_NAME=${VIDEO_FILE_NAME}
2727
2828 selenium-hub :
29- image : selenium/hub:${TAG:-test-video }
29+ image : selenium/hub:${TAG}
3030 container_name : selenium-hub
3131 ports :
3232 - " 4442:4442"
Original file line number Diff line number Diff line change 1212logging .basicConfig (level = logging .INFO , format = "%(asctime)s - %(name)s - %(levelname)s - %(message)s" )
1313logger = logging .getLogger (__name__ )
1414
15- # Docker Client
16- client = docker .from_env ()
17-
1815NAMESPACE = os .environ .get ('NAMESPACE' )
1916VERSION = os .environ .get ('VERSION' )
2017USE_RANDOM_USER_ID = os .environ .get ('USE_RANDOM_USER_ID' )
2421no_proxy = os .environ .get ('no_proxy' , '' )
2522SKIP_BUILD = os .environ .get ('SKIP_BUILD' , False )
2623
24+ try :
25+ client = docker .from_env ()
26+ except :
27+ client = None
28+
2729IMAGE_NAME_MAP = {
2830 # Hub
2931 'Hub' : 'hub' ,
You can’t perform that action at this time.
0 commit comments