Skip to content

Commit ecc8747

Browse files
committed
Update tag in docs and files [skip ci]
1 parent 7ae1f5f commit ecc8747

File tree

27 files changed

+111
-137
lines changed

27 files changed

+111
-137
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-alpha-7-prerelease-20201009 etc
44+
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-alpha-7-20201119 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-alpha-7-prerelease-20201009 etc
44+
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-alpha-7-20201119 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-alpha-7-prerelease-20201009 etc
50+
Docker-Selenium image version: <!-- 3, 3.141, 4.0.0-alpha-7-20201119 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-alpha-7-prerelease-20201009
5+
FROM selenium/base:4.0.0-alpha-7-20201119
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-alpha-7-prerelease-20201009
5+
FROM selenium/base:4.0.0-alpha-7-20201119
66
LABEL authors=SeleniumHQ
77

88
USER 1200

Hub/Dockerfile

Lines changed: 12 additions & 20 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-alpha-7-prerelease-20201009
5+
FROM selenium/base:4.0.0-alpha-7-20201119
66
LABEL authors=SeleniumHQ
77

88
USER 1200
@@ -15,31 +15,23 @@ EXPOSE 4442
1515
EXPOSE 4443
1616
EXPOSE 4444
1717

18-
# As integer, maps to "maxSession"
19-
ENV GRID_MAX_SESSION 5
20-
# In milliseconds, maps to "newSessionWaitTimeout"
21-
ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1
22-
# As a boolean, maps to "throwOnCapabilityNotPresent"
23-
ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true
24-
# As an integer
25-
ENV GRID_JETTY_MAX_THREADS -1
26-
# In milliseconds, maps to "cleanUpCycle"
27-
ENV GRID_CLEAN_UP_CYCLE 5000
28-
# In seconds, maps to "browserTimeout"
29-
ENV GRID_BROWSER_TIMEOUT 0
30-
# In seconds, maps to "timeout"
31-
ENV GRID_TIMEOUT 1800
32-
# Debug
33-
ENV GRID_DEBUG false
18+
# In seconds, maps to "--session-request-timeout"
19+
ENV SE_SESSION_REQUEST_TIMEOUT 300
20+
# In seconds, maps to "--session-retry-interval"
21+
ENV SE_SESSION_RETRY_INTERVAL 5
22+
# Boolean value, maps "--relax-checks"
23+
ENV SE_RELAX_CHECKS true
3424
# As integer, maps to "port"
35-
ENV GRID_HUB_PORT 4444
25+
ENV SE_HUB_PORT 4444
3626
# As string, maps to "host"
37-
ENV GRID_HUB_HOST "0.0.0.0"
27+
ENV SE_HUB_HOST "0.0.0.0"
28+
# As string, maps to "allow-cors"
29+
ENV SE_ALLOW_CORS false
3830

3931
COPY generate_config \
4032
start-selenium-grid-hub.sh \
4133
/opt/bin/
4234

4335
COPY selenium-grid-hub.conf /etc/supervisor/conf.d/
4436

45-
RUN /opt/bin/generate_config > /opt/selenium/config.json
37+
RUN /opt/bin/generate_config > /opt/selenium/config.toml

NodeBase/Dockerfile

Lines changed: 3 additions & 21 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-alpha-7-prerelease-20201009
5+
FROM selenium/base:4.0.0-alpha-7-20201119
66
LABEL authors=SeleniumHQ
77

88
USER root
@@ -146,26 +146,8 @@ ENV START_XVFB true
146146
#========================
147147
# Selenium Configuration
148148
#========================
149-
# As integer, maps to "maxInstances"
150-
ENV NODE_MAX_INSTANCES 1
151-
# As integer, maps to "maxSession"
152-
ENV NODE_MAX_SESSION 1
153-
# As address, maps to "host"
154-
ENV NODE_HOST 0.0.0.0
155-
# As integer, maps to "port"
156-
ENV NODE_PORT 5555
157-
# In milliseconds, maps to "registerCycle"
158-
ENV NODE_REGISTER_CYCLE 5000
159-
# In milliseconds, maps to "nodePolling"
160-
ENV NODE_POLLING 5000
161-
# In milliseconds, maps to "unregisterIfStillDownAfter"
162-
ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
163-
# As integer, maps to "downPollingLimit"
164-
ENV NODE_DOWN_POLLING_LIMIT 2
165-
# As string, maps to "applicationName"
166-
ENV NODE_APPLICATION_NAME ""
167-
# Debug
168-
ENV GRID_DEBUG false
149+
# As integer, maps to "max-concurrent-sessions"
150+
ENV SE_NODE_MAX_CONCURRENT_SESSIONS 1
169151

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

NodeChrome/Dockerfile

Lines changed: 2 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/node-base:4.0.0-alpha-7-prerelease-20201009
5+
FROM selenium/node-base:4.0.0-alpha-7-20201119
66
LABEL authors=SeleniumHQ
77

88
USER root
@@ -57,4 +57,4 @@ RUN if [ -z "$CHROME_DRIVER_VERSION" ]; \
5757
COPY generate_config /opt/bin/generate_config
5858

5959
# Generating a default config during build time
60-
RUN /opt/bin/generate_config > /opt/selenium/config.json
60+
RUN /opt/bin/generate_config > /opt/selenium/config.toml

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-alpha-7-prerelease-20201009
5+
FROM selenium/base:4.0.0-alpha-7-20201119
66
LABEL authors=SeleniumHQ
77

88
USER 1200

NodeDocker/config.toml

Lines changed: 3 additions & 3 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.0.0-alpha-7-prerelease-20201009", "{\"browserName\": \"firefox\"}",
6-
"selenium/standalone-chrome:4.0.0-alpha-7-prerelease-20201009", "{\"browserName\": \"chrome\"}",
7-
"selenium/standalone-opera:4.0.0-alpha-7-prerelease-20201009", "{\"browserName\": \"operablink\"}"
5+
"selenium/standalone-firefox:4.0.0-alpha-7-20201119", "{\"browserName\": \"firefox\"}",
6+
"selenium/standalone-chrome:4.0.0-alpha-7-20201119", "{\"browserName\": \"chrome\"}",
7+
"selenium/standalone-opera:4.0.0-alpha-7-20201119", "{\"browserName\": \"operablink\"}"
88
]
99

1010
# URL for connecting to the docker daemon

0 commit comments

Comments
 (0)