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

Commit 777f23d

Browse files
jamesmortensenjamesmortensen
committed
Merged from trunk and resolved conflicts. Increased version to 4.1.0
2 parents 7b16935 + 6629e6f commit 777f23d

File tree

12 files changed

+25
-20
lines changed

12 files changed

+25
-20
lines changed

‎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 local-seleniarm/base:4.0.0-20211111
5+
FROM local-seleniarm/base:4.1.0-20211217
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER 1200

‎NodeBase/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 local-seleniarm/base:4.0.0-20211111
5+
FROM local-seleniarm/base:4.1.0-20211217
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER root

‎NodeBase/generate_config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ echo "max-sessions = ${SE_NODE_MAX_SESSIONS}
5252
SE_NODE_BROWSER_NAME=$(cat /opt/selenium/browser_name)
5353
if [[ "${SE_NODE_BROWSER_NAME}" == "chrome" ]]; then
5454
SE_NODE_BROWSER_VERSION=$(short_version $(google-chrome --version | awk '{print $3}'))
55+
elif [[ "${SE_NODE_BROWSER_NAME}" == "chromium" ]]; then
56+
SE_NODE_BROWSER_NAME=chrome
57+
SE_NODE_BROWSER_VERSION=$(short_version $(chromium --version | awk '{print $2}'))
5558
elif [[ "${SE_NODE_BROWSER_NAME}" == "firefox" ]]; then
5659
SE_NODE_BROWSER_VERSION=$(short_version $(firefox --version | awk '{print $3}'))
5760
elif [[ "${SE_NODE_BROWSER_NAME}" == "MicrosoftEdge" ]]; then

‎NodeChromium/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 local-seleniarm/node-base:4.0.0-20211111
5+
FROM local-seleniarm/node-base:4.1.0-20211217
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER root
@@ -29,7 +29,7 @@ RUN apt-get update -qqy \
2929
&& apt-get -qqy install chromium-driver \
3030
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
3131

32-
RUN echo "chrome" > /opt/selenium/browser_name
32+
RUN echo "chromium" > /opt/selenium/browser_name
3333

3434
USER 1200
3535

‎NodeChromium/Dockerfile.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN apt-get update -qqy \
2222
&& apt-get -qqy install chromium-driver \
2323
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
2424

25-
RUN echo "chrome" > /opt/selenium/browser_name
25+
RUN echo "chromium" > /opt/selenium/browser_name
2626

2727
USER 1200
2828

‎NodeFirefox/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
6-
FROM local-seleniarm/node-base:4.0.0-20211111
5+
FROM local-seleniarm/node-base:4.1.0-20211217
76
LABEL authors=SeleniumHQ,sj26,jamesmortensen
87

8+
#FROM local-seleniarm/node-base:4.0.0-20211018
9+
#LABEL authors=SeleniumHQ,sj26,jamesmortensen
910

1011
USER root
1112

‎NodeFirefox/build-step-2.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fi
1313

1414
echo 'Generate the Dockerfile.arm64...'
1515
BUILD_DATE=$(date +'%Y%m%d')
16-
VERSION=4.0.0
16+
VERSION=4.1.0
1717
NAMESPACE=local-seleniarm
1818
AUTHORS=SeleniumHQ,sj26,jamesmortensen
1919

‎Standalone/generate_config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ echo "max-sessions = ${SE_NODE_MAX_SESSIONS}
3232
SE_NODE_BROWSER_NAME=$(cat /opt/selenium/browser_name)
3333
if [[ "${SE_NODE_BROWSER_NAME}" == "chrome" ]]; then
3434
SE_NODE_BROWSER_VERSION=$(short_version $(google-chrome --version | awk '{print $3}'))
35+
elif [[ "${SE_NODE_BROWSER_NAME}" == "chromium" ]]; then
36+
SE_NODE_BROWSER_NAME=chrome
37+
SE_NODE_BROWSER_VERSION=$(short_version $(chromium --version | awk '{print $2}'))
3538
elif [[ "${SE_NODE_BROWSER_NAME}" == "firefox" ]]; then
3639
SE_NODE_BROWSER_VERSION=$(short_version $(firefox --version | awk '{print $3}'))
3740
elif [[ "${SE_NODE_BROWSER_NAME}" == "MicrosoftEdge" ]]; then

‎StandaloneChromium/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 local-seleniarm/node-chromium:4.0.0-20211111
5+
FROM local-seleniarm/node-chromium:4.1.0-20211217
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER 1200

‎StandaloneFirefox/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
6-
FROM local-seleniarm/node-firefox:4.0.0-20211111
5+
FROM local-seleniarm/node-firefox:4.1.0-20211217
76
LABEL authors=SeleniumHQ,sj26,jamesmortensen
87

9-
108
USER 1200
119

1210
#====================================

0 commit comments

Comments
 (0)