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

Commit 7b16935

Browse files
jamesmortensenjamesmortensen
committed
merged from upstream
2 parents dab951c + c8cf46b commit 7b16935

28 files changed

+128
-137
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.1.0-prerelease-20211105? Please use the full tag, avoid "latest"
58+
placeholder: 4.1.0-20211209? Please use the full tag, avoid "latest"
5959
validations:
6060
required: true

‎Base/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# FROM ubuntu:focal-20210416
22
#FROM ubuntu:focal-20210827
3+
#FROM ubuntu:focal-20211006
34
FROM debian:latest
45
LABEL authors="Selenium <[email protected]>"
56

@@ -74,7 +75,7 @@ COPY supervisord.conf /etc
7475
RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
7576
&& touch /opt/selenium/config.toml \
7677
&& chmod -R 777 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \
77-
&& wget --no-verbose https://github.com/SeleniumHQ/docker-selenium/releases/download/4.1.0-prerelease-20211105/selenium-server-4.1.0-prerelease-aea69daa1c.jar \
78+
&& wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.1.0/selenium-server-4.1.0.jar \
7879
-O /opt/selenium/selenium-server.jar \
7980
&& chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
8081
&& chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor

‎Distributor/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:4.1.0-prerelease-20211105
5+
FROM selenium/base:4.1.0-20211209
66
LABEL authors=SeleniumHQ
77

88
USER 1200

‎EventBus/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:4.1.0-prerelease-20211105
5+
FROM selenium/base:4.1.0-20211209
66
LABEL authors=SeleniumHQ
77

88
USER 1200

‎NodeChrome/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:4.1.0-prerelease-20211105
5+
FROM selenium/node-base:4.1.0-20211209
66
LABEL authors=SeleniumHQ
77

88
USER root

‎NodeDocker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:4.1.0-prerelease-20211105
5+
FROM selenium/base:4.1.0-20211209
66
LABEL authors=SeleniumHQ
77

88
USER 1200

‎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.1.0-prerelease-20211105", '{"browserName": "firefox", "platformName": "linux"}',
6-
"selenium/standalone-chrome:4.1.0-prerelease-20211105", '{"browserName": "chrome", "platformName": "linux"}',
7-
"selenium/standalone-edge:4.1.0-prerelease-20211105", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
5+
"selenium/standalone-firefox:4.1.0-20211209", '{"browserName": "firefox", "platformName": "linux"}',
6+
"selenium/standalone-chrome:4.1.0-20211209", '{"browserName": "chrome", "platformName": "linux"}',
7+
"selenium/standalone-edge:4.1.0-20211209", '{"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://host.docker.internal:2375"
1616
# Docker imagee used for video recording
17-
video-image = "selenium/video:ffmpeg-4.3.1-20211105"
17+
video-image = "selenium/video:ffmpeg-4.3.1-20211209"
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/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:4.1.0-prerelease-20211105
5+
FROM selenium/node-base:4.1.0-20211209
66
LABEL authors=SeleniumHQ
77

88
USER root

‎NodeFirefox/Dockerfile‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,10 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
<<<<<<< HEAD
5+
66
FROM local-seleniarm/node-base:4.0.0-20211111
77
LABEL authors=SeleniumHQ,sj26,jamesmortensen
88

9-
#FROM local-seleniarm/node-base:4.0.0-20211018
10-
#LABEL authors=SeleniumHQ,sj26,jamesmortensen
11-
=======
12-
FROM selenium/node-base:4.1.0-prerelease-20211105
13-
LABEL authors=SeleniumHQ
14-
>>>>>>> 2d1e3db0c6ac55e0e5c9d924a8f2b528d4713319
159

1610
USER root
1711

0 commit comments

Comments
 (0)