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

Commit 6629e6f

Browse files
jamesmortensenjamesmortensen
committed
Fixed Issue 1 where google-chrome binary is not found. Instead, we use the chromium binary to get the browser version.
1 parent 00eefd6 commit 6629e6f

File tree

10 files changed

+21
-15
lines changed

10 files changed

+21
-15
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-20211110
5+
FROM local-seleniarm/base:4.0.0-20211211
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-20211110
5+
FROM local-seleniarm/base:4.0.0-20211211
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
@@ -45,6 +45,9 @@ echo "max-sessions = ${SE_NODE_MAX_SESSIONS}
4545
SE_NODE_BROWSER_NAME=$(cat /opt/selenium/browser_name)
4646
if [[ "${SE_NODE_BROWSER_NAME}" == "chrome" ]]; then
4747
SE_NODE_BROWSER_VERSION=$(short_version $(google-chrome --version | awk '{print $3}'))
48+
elif [[ "${SE_NODE_BROWSER_NAME}" == "chromium" ]]; then
49+
SE_NODE_BROWSER_NAME=chrome
50+
SE_NODE_BROWSER_VERSION=$(short_version $(chromium --version | awk '{print $2}'))
4851
elif [[ "${SE_NODE_BROWSER_NAME}" == "firefox" ]]; then
4952
SE_NODE_BROWSER_VERSION=$(short_version $(firefox --version | awk '{print $3}'))
5053
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-20211110
5+
FROM local-seleniarm/node-base:4.0.0-20211211
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: 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-base:4.0.0-20211111
5+
FROM local-seleniarm/node-base:4.0.0-20211211
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
#FROM local-seleniarm/node-base:4.0.0-20211018

‎Standalone/generate_config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ echo "max-sessions = ${SE_NODE_MAX_SESSIONS}
2626
SE_NODE_BROWSER_NAME=$(cat /opt/selenium/browser_name)
2727
if [[ "${SE_NODE_BROWSER_NAME}" == "chrome" ]]; then
2828
SE_NODE_BROWSER_VERSION=$(short_version $(google-chrome --version | awk '{print $3}'))
29+
elif [[ "${SE_NODE_BROWSER_NAME}" == "chromium" ]]; then
30+
SE_NODE_BROWSER_NAME=chrome
31+
SE_NODE_BROWSER_VERSION=$(short_version $(chromium --version | awk '{print $2}'))
2932
elif [[ "${SE_NODE_BROWSER_NAME}" == "firefox" ]]; then
3033
SE_NODE_BROWSER_VERSION=$(short_version $(firefox --version | awk '{print $3}'))
3134
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-20211110
5+
FROM local-seleniarm/node-chromium:4.0.0-20211211
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER 1200

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

88
USER 1200

‎push-images-to-dockerhub.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ VERSION=4.0.0
33
NAMESPACE=seleniarm
44

55

6-
# docker push seleniarm/base:4.0.0-20211111
7-
# docker push seleniarm/hub:4.0.0-20211111
8-
# docker push seleniarm/node-base:4.0.0-20211111
9-
# docker push seleniarm/node-chromium:4.0.0-20211111
10-
# docker push seleniarm/node-firefox:4.0.0-20211111
11-
# docker push seleniarm/standalone-chromium:4.0.0-20211111
12-
# docker push seleniarm/standalone-firefox:4.0.0-20211111
6+
docker push seleniarm/base:4.0.0-$BUILD_DATE
7+
docker push seleniarm/hub:4.0.0-$BUILD_DATE
8+
docker push seleniarm/node-base:4.0.0-$BUILD_DATE
9+
docker push seleniarm/node-chromium:4.0.0-$BUILD_DATE
10+
docker push seleniarm/node-firefox:4.0.0-$BUILD_DATE
11+
docker push seleniarm/standalone-chromium:4.0.0-$BUILD_DATE
12+
docker push seleniarm/standalone-firefox:4.0.0-$BUILD_DATE
1313

1414
docker push seleniarm/base:latest
1515
docker push seleniarm/hub:latest

0 commit comments

Comments
 (0)