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

Commit 630a58d

Browse files
Merge branch 'trunk' of https://github.com/SeleniumHQ/docker-selenium into trunk
2 parents c8cbb01 + 23a351a commit 630a58d

26 files changed

+223
-154
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.7.2-20221217? Please use the full tag, avoid "latest"
58+
placeholder: 4.7.2-20221219? Please use the full tag, avoid "latest"
5959
validations:
6060
required: true

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Output Docker info
2626
run: docker info
2727
- name: Set up Python 3.8
28-
uses: actions/setup-python@v4.3.1
28+
uses: actions/setup-python@v4.4.0
2929
with:
3030
python-version: 3.8
3131
- name: Get branch name (only for push to branch)

.github/workflows/test-video.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Output Docker info
2323
run: docker info
2424
- name: Set up Python 3.8
25-
uses: actions/setup-python@v4.3.1
25+
uses: actions/setup-python@v4.4.0
2626
with:
2727
python-version: 3.8
2828
- name: Get branch name (only for push to branch)

Hub/example-config.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[router]
2+
username = "admin"
3+
password = "myStrongPassword"

Hub/start-selenium-grid-hub.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ java ${JAVA_OPTS:-$SE_JAVA_OPTS} -Dwebdriver.http.factory=jdk-http-client \
3636
--session-retry-interval ${SE_SESSION_RETRY_INTERVAL} \
3737
--relax-checks ${SE_RELAX_CHECKS} \
3838
--bind-host ${SE_BIND_HOST} \
39+
--config /opt/selenium/config.toml \
3940
${HOST_CONFIG} \
4041
${PORT_CONFIG} \
4142
${SE_OPTS}

NodeChrome/wrap_chrome_binary

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,11 @@ umask 002
1414
exec -a "\$0" "$BASE_PATH" --no-sandbox "\$@"
1515
_EOF
1616
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.7.2-20221217", '{"browserName": "firefox", "platformName": "linux"}',
6-
"selenium/standalone-chrome:4.7.2-20221217", '{"browserName": "chrome", "platformName": "linux"}',
7-
"selenium/standalone-edge:4.7.2-20221217", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
5+
"selenium/standalone-firefox:4.7.2-20221219", '{"browserName": "firefox", "platformName": "linux"}',
6+
"selenium/standalone-chrome:4.7.2-20221219", '{"browserName": "chrome", "platformName": "linux"}',
7+
"selenium/standalone-edge:4.7.2-20221219", '{"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-20221217"
17+
video-image = "selenium/video:ffmpeg-4.3.1-20221219"
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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,11 @@ umask 002
1414
exec -a "\$0" "$BASE_PATH" --no-sandbox "\$@"
1515
_EOF
1616
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

0 commit comments

Comments
 (0)