diff --git a/Hub/Dockerfile b/Hub/Dockerfile index 985b582d9..a4fd52536 100644 --- a/Hub/Dockerfile +++ b/Hub/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/base:4.0.0-20211110 +FROM local-seleniarm/base:4.0.0-20211211 LABEL authors=SeleniumHQ,sj26,jamesmortensen USER 1200 diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile index abb661c15..1fe4235ec 100644 --- a/NodeBase/Dockerfile +++ b/NodeBase/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/base:4.0.0-20211110 +FROM local-seleniarm/base:4.0.0-20211211 LABEL authors=SeleniumHQ,sj26,jamesmortensen USER root diff --git a/NodeBase/generate_config b/NodeBase/generate_config index e33934312..674c94292 100755 --- a/NodeBase/generate_config +++ b/NodeBase/generate_config @@ -45,6 +45,9 @@ echo "max-sessions = ${SE_NODE_MAX_SESSIONS} SE_NODE_BROWSER_NAME=$(cat /opt/selenium/browser_name) if [[ "${SE_NODE_BROWSER_NAME}" == "chrome" ]]; then SE_NODE_BROWSER_VERSION=$(short_version $(google-chrome --version | awk '{print $3}')) +elif [[ "${SE_NODE_BROWSER_NAME}" == "chromium" ]]; then + SE_NODE_BROWSER_NAME=chrome + SE_NODE_BROWSER_VERSION=$(short_version $(chromium --version | awk '{print $2}')) elif [[ "${SE_NODE_BROWSER_NAME}" == "firefox" ]]; then SE_NODE_BROWSER_VERSION=$(short_version $(firefox --version | awk '{print $3}')) elif [[ "${SE_NODE_BROWSER_NAME}" == "MicrosoftEdge" ]]; then diff --git a/NodeChromium/Dockerfile b/NodeChromium/Dockerfile index 5dcd420d6..35187adb6 100644 --- a/NodeChromium/Dockerfile +++ b/NodeChromium/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/node-base:4.0.0-20211110 +FROM local-seleniarm/node-base:4.0.0-20211211 LABEL authors=SeleniumHQ,sj26,jamesmortensen USER root @@ -29,7 +29,7 @@ RUN apt-get update -qqy \ && apt-get -qqy install chromium-driver \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* -RUN echo "chrome" > /opt/selenium/browser_name +RUN echo "chromium" > /opt/selenium/browser_name USER 1200 diff --git a/NodeChromium/Dockerfile.txt b/NodeChromium/Dockerfile.txt index 6a8da6fff..cbae379ad 100644 --- a/NodeChromium/Dockerfile.txt +++ b/NodeChromium/Dockerfile.txt @@ -22,7 +22,7 @@ RUN apt-get update -qqy \ && apt-get -qqy install chromium-driver \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* -RUN echo "chrome" > /opt/selenium/browser_name +RUN echo "chromium" > /opt/selenium/browser_name USER 1200 diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile index 6ee6943e9..e9e80164d 100644 --- a/NodeFirefox/Dockerfile +++ b/NodeFirefox/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/node-base:4.0.0-20211111 +FROM local-seleniarm/node-base:4.0.0-20211211 LABEL authors=SeleniumHQ,sj26,jamesmortensen #FROM local-seleniarm/node-base:4.0.0-20211018 diff --git a/Standalone/generate_config b/Standalone/generate_config index f7ca9dbc0..93c9776e4 100755 --- a/Standalone/generate_config +++ b/Standalone/generate_config @@ -26,6 +26,9 @@ echo "max-sessions = ${SE_NODE_MAX_SESSIONS} SE_NODE_BROWSER_NAME=$(cat /opt/selenium/browser_name) if [[ "${SE_NODE_BROWSER_NAME}" == "chrome" ]]; then SE_NODE_BROWSER_VERSION=$(short_version $(google-chrome --version | awk '{print $3}')) +elif [[ "${SE_NODE_BROWSER_NAME}" == "chromium" ]]; then + SE_NODE_BROWSER_NAME=chrome + SE_NODE_BROWSER_VERSION=$(short_version $(chromium --version | awk '{print $2}')) elif [[ "${SE_NODE_BROWSER_NAME}" == "firefox" ]]; then SE_NODE_BROWSER_VERSION=$(short_version $(firefox --version | awk '{print $3}')) elif [[ "${SE_NODE_BROWSER_NAME}" == "MicrosoftEdge" ]]; then diff --git a/StandaloneChromium/Dockerfile b/StandaloneChromium/Dockerfile index 8a86850d9..6a76ef5d7 100644 --- a/StandaloneChromium/Dockerfile +++ b/StandaloneChromium/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/node-chromium:4.0.0-20211110 +FROM local-seleniarm/node-chromium:4.0.0-20211211 LABEL authors=SeleniumHQ,sj26,jamesmortensen USER 1200 diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile index a68c2ed56..97bc3702f 100644 --- a/StandaloneFirefox/Dockerfile +++ b/StandaloneFirefox/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/node-firefox:4.0.0-20211111 +FROM local-seleniarm/node-firefox:4.0.0-20211211 LABEL authors=SeleniumHQ,sj26,jamesmortensen USER 1200 diff --git a/push-images-to-dockerhub.sh b/push-images-to-dockerhub.sh index 2c730d35b..16d2d25b7 100644 --- a/push-images-to-dockerhub.sh +++ b/push-images-to-dockerhub.sh @@ -3,13 +3,13 @@ VERSION=4.0.0 NAMESPACE=seleniarm -# docker push seleniarm/base:4.0.0-20211111 -# docker push seleniarm/hub:4.0.0-20211111 -# docker push seleniarm/node-base:4.0.0-20211111 -# docker push seleniarm/node-chromium:4.0.0-20211111 -# docker push seleniarm/node-firefox:4.0.0-20211111 -# docker push seleniarm/standalone-chromium:4.0.0-20211111 -# docker push seleniarm/standalone-firefox:4.0.0-20211111 +docker push seleniarm/base:4.0.0-$BUILD_DATE +docker push seleniarm/hub:4.0.0-$BUILD_DATE +docker push seleniarm/node-base:4.0.0-$BUILD_DATE +docker push seleniarm/node-chromium:4.0.0-$BUILD_DATE +docker push seleniarm/node-firefox:4.0.0-$BUILD_DATE +docker push seleniarm/standalone-chromium:4.0.0-$BUILD_DATE +docker push seleniarm/standalone-firefox:4.0.0-$BUILD_DATE docker push seleniarm/base:latest docker push seleniarm/hub:latest