Skip to content

Commit 69dd08b

Browse files
selenium-ciselenium-ci
committed
Update tag in docs and files [skip ci]
1 parent 0496646 commit 69dd08b

33 files changed

+174
-131
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Issues without a reproduction script are likely to stall and eventually be close
4141
## Environment
4242

4343
OS: <!-- Windows 10? OSX? -->
44-
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-beta-3-prerelease-20210329 etc
44+
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-beta-3-prerelease-20210402 etc
4545
Also provide the docker image id
4646
-->
4747
Docker version:

‎.github/ISSUE_TEMPLATE/bug.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Issues without a reproduction script are likely to stall and eventually be close
4141
## Environment
4242

4343
OS: <!-- Windows 10? OSX? -->
44-
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-beta-3-prerelease-20210329 etc
44+
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-beta-3-prerelease-20210402 etc
4545
Also provide the docker image id
4646
-->
4747
Docker version:

‎.github/ISSUE_TEMPLATE/regression.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Issues without a reproduction script are likely to stall and eventually be close
4747
## Environment
4848

4949
OS: <!-- Windows 10? OSX? -->
50-
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-beta-3-prerelease-20210329 etc
50+
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-beta-3-prerelease-20210402 etc
5151
Also provide the docker image id
5252
-->
5353
Docker version:

‎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.0.0-beta-3-prerelease-20210329
5+
FROM selenium/base:4.0.0-beta-3-prerelease-20210402
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.0.0-beta-3-prerelease-20210329
5+
FROM selenium/base:4.0.0-beta-3-prerelease-20210402
66
LABEL authors=SeleniumHQ
77

88
USER 1200

‎Hub/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.0.0-beta-3-prerelease-20210329
5+
FROM selenium/base:4.0.0-beta-3-prerelease-20210402
66
LABEL authors=SeleniumHQ
77

88
USER 1200

‎NodeBase/Dockerfile‎

Lines changed: 24 additions & 2 deletions
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.0.0-beta-3-prerelease-20210329
5+
FROM selenium/base:4.0.0-beta-3-prerelease-20210402
66
LABEL authors=SeleniumHQ
77

88
USER root
@@ -88,6 +88,25 @@ RUN apt-get -qqy update \
8888
&& rm -rf /var/lib/apt/lists/* \
8989
&& apt-get -qyy clean
9090

91+
########################################
92+
# noVNC exposes VNC through a web page #
93+
########################################
94+
# Download https://github.com/novnc/noVNC dated 2021-03-30 commit 84f102d6a9ffaf3972693d59bad5c6fddb6d7fb0
95+
# Download https://github.com/novnc/websockify dated 2021-03-22 commit c5d365dd1dbfee89881f1c1c02a2ac64838d645f
96+
ENV NOVNC_SHA="84f102d6a9ffaf3972693d59bad5c6fddb6d7fb0" \
97+
WEBSOCKIFY_SHA="c5d365dd1dbfee89881f1c1c02a2ac64838d645f"
98+
RUN wget -nv -O noVNC.zip \
99+
"https://github.com/novnc/noVNC/archive/${NOVNC_SHA}.zip" \
100+
&& unzip -x noVNC.zip \
101+
&& mv noVNC-${NOVNC_SHA} /opt/bin/noVNC \
102+
&& cp /opt/bin/noVNC/vnc.html /opt/bin/noVNC/index.html \
103+
&& rm noVNC.zip \
104+
&& wget -nv -O websockify.zip \
105+
"https://github.com/novnc/websockify/archive/${WEBSOCKIFY_SHA}.zip" \
106+
&& unzip -x websockify.zip \
107+
&& rm websockify.zip \
108+
&& mv websockify-${WEBSOCKIFY_SHA} /opt/bin/noVNC/utils/websockify
109+
91110
#===================================================
92111
# Run the following commands as non-privileged user
93112
#===================================================
@@ -122,9 +141,10 @@ RUN sudo chmod -R 777 ${HOME} \
122141
&& sudo chmod -R g=u ${HOME}
123142

124143
#==============================
125-
# Scripts to run fluxbox and x11vnc
144+
# Scripts to run fluxbox, x11vnc and noVNC
126145
#==============================
127146
COPY start-vnc.sh \
147+
start-novnc.sh \
128148
/opt/bin/
129149

130150
#==============================
@@ -150,6 +170,8 @@ ENV START_XVFB true
150170
ENV SE_NODE_MAX_SESSIONS 1
151171
# As integer, maps to "session-timeout" in seconds
152172
ENV SE_NODE_SESSION_TIMEOUT 300
173+
# As boolean, maps to "override-max-sessions"
174+
ENV SE_NODE_OVERRIDE_MAX_SESSIONS false
153175

154176
# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
155177
ENV DBUS_SESSION_BUS_ADDRESS=/dev/null

‎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.0.0-beta-3-prerelease-20210329
5+
FROM selenium/node-base:4.0.0-beta-3-prerelease-20210402
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.0.0-beta-3-prerelease-20210329
5+
FROM selenium/base:4.0.0-beta-3-prerelease-20210402
66
LABEL authors=SeleniumHQ
77

88
USER 1200

‎NodeDocker/config.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
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.0.0-beta-3-prerelease-20210329", "{\"browserName\": \"firefox\"}",
6-
"selenium/standalone-chrome:4.0.0-beta-3-prerelease-20210329", "{\"browserName\": \"chrome\"}",
7-
"selenium/standalone-opera:4.0.0-beta-3-prerelease-20210329", "{\"browserName\": \"opera\"}",
8-
"selenium/standalone-edge:4.0.0-beta-3-prerelease-20210329", "{\"browserName\": \"MicrosoftEdge\"}"
5+
"selenium/standalone-firefox:4.0.0-beta-3-prerelease-20210402", "{\"browserName\": \"firefox\"}",
6+
"selenium/standalone-chrome:4.0.0-beta-3-prerelease-20210402", "{\"browserName\": \"chrome\"}",
7+
"selenium/standalone-opera:4.0.0-beta-3-prerelease-20210402", "{\"browserName\": \"opera\"}",
8+
"selenium/standalone-edge:4.0.0-beta-3-prerelease-20210402", "{\"browserName\": \"MicrosoftEdge\"}"
99
]
1010

1111
# URL for connecting to the docker daemon
@@ -15,7 +15,7 @@ configs = [
1515
# socat -4 TCP-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock
1616
url = "http://host.docker.internal:2375"
1717
# Docker imagee used for video recording
18-
video-image = "selenium/video:ffmpeg-4.3.1-20210329"
18+
video-image = "selenium/video:ffmpeg-4.3.1-20210402"
1919

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

0 commit comments

Comments
 (0)