Skip to content
This repository was archived by the owner on Jun 22, 2024. It is now read-only.

Commit 8e8b050

Browse files
merge from upstream
2 parents 5bd612e + d57f909 commit 8e8b050

24 files changed

+187
-176
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ body:
5555
attributes:
5656
label: Docker Selenium version (tag)
5757
description: What version of Docker Selenium are you using?
58-
placeholder: 4.8.0-20230123? Please use the full tag, avoid "latest"
58+
placeholder: 4.8.0-20230202? Please use the full tag, avoid "latest"
5959
validations:
6060
required: true

Base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ RUN if [ `arch` = "aarch64" ]; then \
111111
fi
112112

113113
RUN if [ -f "/tmp/cs" ]; then \
114-
/tmp/cs fetch --classpath --cache /external_jars io.opentelemetry:opentelemetry-exporter-jaeger:1.19.0 io.grpc:grpc-netty:1.50.2 > /external_jars/.classpath.txt ; \
114+
/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 ; \
115115
fi
116116

117117
RUN if [ -f "/tmp/cs" ]; then chmod 777 /external_jars/.classpath.txt ; fi

NodeChrome/wrap_chrome_binary

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@ WRAPPER_PATH=$(readlink -f /usr/bin/google-chrome)
44
BASE_PATH="$WRAPPER_PATH-base"
55
mv "$WRAPPER_PATH" "$BASE_PATH"
66

7+
# Debian/Ubuntu seems to not respect --lang, it instead needs to be a LANGUAGE environment var
8+
# See: https://stackoverflow.com/a/41893197/359999
9+
for var in "$@"; do
10+
if [[ $var == --lang=* ]]; then
11+
LANGUAGE=${var//--lang=}
12+
fi
13+
done
14+
715
cat > "$WRAPPER_PATH" <<_EOF
816
#!/bin/bash
917
1018
# umask 002 ensures default permissions of files are 664 (rw-rw-r--) and directories are 775 (rwxrwxr-x).
1119
umask 002
1220
21+
# Set language environment variable
22+
export LANGUAGE="$LANGUAGE"
23+
1324
# Note: exec -a below is a bashism.
1425
exec -a "\$0" "$BASE_PATH" --no-sandbox "\$@"
1526
_EOF
1627
chmod +x "$WRAPPER_PATH"
17-
18-
# Debian/Ubuntu seems to not respect --lang, it instead needs to be a LANGUAGE environment var
19-
# See: https://stackoverflow.com/a/41893197/359999
20-
for var in "$@"; do
21-
if [[ $var == --lang=* ]]; then
22-
export LANGUAGE=${var//--lang=}
23-
fi
24-
done

NodeDocker/config.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Configs have a mapping between the Docker image to use and the capabilities that need to be matched to
33
# start a container with the given image.
44
configs = [
5-
"selenium/standalone-firefox:4.8.0-20230123", '{"browserName": "firefox", "platformName": "linux"}',
6-
"selenium/standalone-chrome:4.8.0-20230123", '{"browserName": "chrome", "platformName": "linux"}',
7-
"selenium/standalone-edge:4.8.0-20230123", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
5+
"selenium/standalone-firefox:4.8.0-20230202", '{"browserName": "firefox", "platformName": "linux"}',
6+
"selenium/standalone-chrome:4.8.0-20230202", '{"browserName": "chrome", "platformName": "linux"}',
7+
"selenium/standalone-edge:4.8.0-20230202", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
88
]
99

1010
# URL for connecting to the docker daemon
@@ -14,7 +14,7 @@ configs = [
1414
# socat -4 TCP-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock
1515
url = "http://127.0.0.1:2375"
1616
# Docker image used for video recording
17-
video-image = "selenium/video:ffmpeg-4.3.1-20230123"
17+
video-image = "selenium/video:ffmpeg-4.3.1-20230202"
1818

1919
# Uncomment the following section if you are running the node on a separate VM
2020
# Fill out the placeholders with appropriate values

NodeEdge/wrap_edge_binary

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@ WRAPPER_PATH=$(readlink -f /usr/bin/microsoft-edge)
44
BASE_PATH="$WRAPPER_PATH-base"
55
mv "$WRAPPER_PATH" "$BASE_PATH"
66

7+
# Debian/Ubuntu seems to not respect --lang, it instead needs to be a LANGUAGE environment var
8+
# See: https://stackoverflow.com/a/41893197/359999
9+
for var in "$@"; do
10+
if [[ $var == --lang=* ]]; then
11+
LANGUAGE=${var//--lang=}
12+
fi
13+
done
14+
715
cat > "$WRAPPER_PATH" <<_EOF
816
#!/bin/bash
917
1018
# umask 002 ensures default permissions of files are 664 (rw-rw-r--) and directories are 775 (rwxrwxr-x).
1119
umask 002
1220
21+
# Set language environment variable
22+
export LANGUAGE="$LANGUAGE"
23+
1324
# Note: exec -a below is a bashism.
1425
exec -a "\$0" "$BASE_PATH" --no-sandbox "\$@"
1526
_EOF
1627
chmod +x "$WRAPPER_PATH"
17-
18-
# Debian/Ubuntu seems to not respect --lang, it instead needs to be a LANGUAGE environment var
19-
# See: https://stackoverflow.com/a/41893197/359999
20-
for var in "$@"; do
21-
if [[ $var == --lang=* ]]; then
22-
export LANGUAGE=${var//--lang=}
23-
fi
24-
done

NodeFirefox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "latest" ] || [ $FIREFOX_VERS
2626
# GeckoDriver
2727
#============
2828
ARG GECKODRIVER_VERSION=latest
29-
RUN GK_VERSION=$(if [ ${GECKODRIVER_VERSION:-latest} = "latest" ]; then echo "0.32.0"; else echo $GECKODRIVER_VERSION; fi) \
29+
RUN GK_VERSION=$(if [ ${GECKODRIVER_VERSION:-latest} = "latest" ]; then echo "0.32.1"; else echo $GECKODRIVER_VERSION; fi) \
3030
&& echo "Using GeckoDriver version: "$GK_VERSION \
3131
&& wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v$GK_VERSION/geckodriver-v$GK_VERSION-linux64.tar.gz \
3232
&& rm -rf /opt/geckodriver \

0 commit comments

Comments
 (0)