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

Commit 670a2f8

Browse files
jamesmortensenjamesmortensen
committed
Updated Chromium, Firefox, and Selenium to latest versions. Added a script to build Firefox as a multi-arch image. Chromium 98.0.4758.102; Firefox 96.0.3; Selenium 4.1.2. Pushed to DockerHub
1 parent 3bca5bf commit 670a2f8

File tree

12 files changed

+65
-19
lines changed

12 files changed

+65
-19
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.1.1-20220119
5+
FROM seleniarm/base:4.1.2-20220222
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:latest
5+
FROM seleniarm/base:4.1.2-20220222
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER root

‎NodeChromium/Dockerfile‎

Lines changed: 3 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:latest
5+
FROM seleniarm/node-base:4.1.2-20220222
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER root
@@ -14,7 +14,8 @@ RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.lis
1414
# && apt-get -qqy install chromium=89.0.4389.82-1 \
1515
# && apt-get -qqy install chromium=90.0.4430.212-1 \
1616
# && apt-get -qqy install chromium=93.0.4577.82-1 \
17-
&& apt-get -qqy install chromium=97.0.4692.71-0.1 \
17+
# && apt-get -qqy install chromium=97.0.4692.71-0.1 \
18+
&& apt-get -qqy install chromium=98.0.4758.102-1+b1 \
1819
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1920

2021
#=================================

‎NodeChromium/Dockerfile.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.lis
77
# && apt-get -qqy install chromium=89.0.4389.82-1 \
88
# && apt-get -qqy install chromium=90.0.4430.212-1 \
99
# && apt-get -qqy install chromium=93.0.4577.82-1 \
10-
&& apt-get -qqy install chromium=97.0.4692.71-0.1 \
10+
# && apt-get -qqy install chromium=97.0.4692.71-0.1 \
11+
&& apt-get -qqy install chromium=98.0.4758.102-1+b1 \
1112
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1213

1314
#=================================

‎NodeFirefox/Dockerfile‎

Lines changed: 3 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.1.0-20211217
5+
FROM seleniarm/node-base:4.1.2-20220222
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
#FROM local-seleniarm/node-base:4.0.0-20211018
@@ -15,7 +15,8 @@ USER root
1515
#=========
1616
RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.list \
1717
&& apt-get update -qqy \
18-
&& apt-get -qqy install firefox-esr libavcodec-extra \
18+
# && apt-get -qqy install firefox-esr libavcodec-extra \
19+
&& apt-get -qqy install firefox libavcodec-extra \
1920
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
2021

2122
# geckodriver was built using the local-seleniarm/geckodriver-arm64 Debian image

‎NodeFirefox/Dockerfile.arm64‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ USER root
88
#=========
99
RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.list \
1010
&& apt-get update -qqy \
11-
&& apt-get -qqy install firefox-esr libavcodec-extra \
11+
# && apt-get -qqy install firefox-esr libavcodec-extra \
12+
&& apt-get -qqy install firefox libavcodec-extra \
1213
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1314

1415
# geckodriver was built using the local-seleniarm/geckodriver-arm64 Debian image

‎NodeFirefox/build-and-deploy-firefox-multi-arch.sh‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#!/bin/bash
2+
3+
DOCKERDEB=false # if using Docker Desktop, set to false
4+
5+
6+
# if [[ $DOCKERDEB == true ]]
7+
# then
8+
# echo 'Getting geckodriver binary from the Docker Debian VM...'
9+
# sh get-geckodriver.sh
10+
# else
11+
# echo 'Getting geckodriver from /media/host...'
12+
# cp /media/host/geckodriver .
13+
# fi
14+
15+
echo 'Generate the Dockerfile.arm64...'
16+
BUILD_DATE=$(date +'%Y%m%d')
17+
VERSION=4.1.2
18+
NAMESPACE=seleniarm
19+
AUTHORS=SeleniumHQ,sj26,jamesmortensen
20+
ARCH=linux/arm64,linux/amd64,linux/arm/v7
21+
22+
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
23+
echo "# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED." >> ./Dockerfile
24+
echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
25+
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
26+
echo FROM ${NAMESPACE}/node-base:${VERSION}-${BUILD_DATE} >> ./Dockerfile
27+
echo LABEL authors="$AUTHORS" >> ./Dockerfile
28+
echo "" >> ./Dockerfile
29+
cat ./Dockerfile.arm64 >> ./Dockerfile
30+
31+
32+
33+
echo "Building Seleniarm/NodeFirefox:$VERSION-$BUILD_DATE"
34+
docker buildx build --push --platform $ARCH -f Dockerfile -t $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE .
35+
#docker tag $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE $NAMESPACE/node-firefox:latest
36+
37+
# Generate the Seleniarm/StandaloneFirefox Dockerfile
38+
cd ../Standalone && sh generate.sh StandaloneFirefox node-firefox $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS
39+
cd ../StandaloneFirefox
40+
41+
echo "Building Seleniarm/StandaloneFirefox:$VERSION-$BUILD_DATE"
42+
docker buildx build --push --platform $ARCH -f Dockerfile -t $NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE .
43+
#docker tag $NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE $NAMESPACE/standalone-firefox:latest
44+
45+
46+
# Remove geckodriver image and dependencies if build is successful, since it's 4.9GB!
47+
# docker image rm local-seleniarm/geckodriver-arm64:$VERSION-$BUILD_DATE

‎NodeFirefox/build-step-2.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
DOCKERDEB=false # if using Docker Desktop, set to false
4-
ARCH=linux/amd64
4+
ARCH=linux/arm64
55

66
if [[ $DOCKERDEB == true ]]
77
then
@@ -14,7 +14,7 @@ fi
1414

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

‎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:latest
5+
FROM seleniarm/node-chromium:4.1.2-20220222
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER 1200

‎StandaloneFirefox/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
<<<<<<< HEAD
6-
FROM local-seleniarm/node-firefox:4.1.0-20211217
5+
FROM seleniarm/node-firefox:4.1.2-20220222
76
LABEL authors=SeleniumHQ,sj26,jamesmortensen
8-
=======
9-
FROM selenium/node-firefox:4.1.2-20220217
10-
LABEL authors=SeleniumHQ
11-
>>>>>>> 655026371fd7958b4aec2dd551a0b9af0cc5f4b3
127

138
USER 1200
149

0 commit comments

Comments
 (0)