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

Commit bd3df31

Browse files
jamesmortensenjamesmortensen
committed
Fixed issue where standalone-firefox was still using the geckodriver arm64 binary for x86_64 hosts.
1 parent ec2c763 commit bd3df31

File tree

7 files changed

+54
-10
lines changed

7 files changed

+54
-10
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 seleniarm/base:4.1.2-20220222
5+
FROM seleniarm/base:4.1.2-20220227
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 seleniarm/base:4.1.2-20220222
5+
FROM seleniarm/base:4.1.2-20220227
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER root

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

88
USER root

‎NodeFirefox/Dockerfile‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM seleniarm/node-base:4.1.2-20220222
5+
FROM seleniarm/node-base:4.1.2-20220227
66
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
#FROM local-seleniarm/node-base:4.0.0-20211018
99
#LABEL authors=SeleniumHQ,sj26,jamesmortensen
1010

11+
ARG TARGETARCH
12+
ARG TARGETVARIANT
13+
1114
USER root
1215

1316
#=========
@@ -19,8 +22,27 @@ RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.lis
1922
&& apt-get -qqy install firefox libavcodec-extra \
2023
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
2124

22-
# geckodriver was built using the local-seleniarm/geckodriver-arm64 Debian image
23-
COPY geckodriver /usr/local/bin/
25+
# geckodriver-arm64 was built using the local-seleniarm/geckodriver-arm64 Debian image
26+
COPY geckodriver /opt/geckodriver-bin/geckodriver-arm64
27+
28+
RUN if [ $TARGETARCH = "arm" ] && [ $TARGETVARIANT = "v7" ]; then \
29+
export ARCH=armhf ; \
30+
else \
31+
export ARCH=$TARGETARCH ; \
32+
fi ; \
33+
if [ "$ARCH" = "arm64" ] || [ "$ARCH" = "armhf" ]; then \
34+
echo "Symlinking pre-built ARM geckodriver to /usr/local/bin/geckodriver" ; \
35+
ln -s /opt/geckodriver-bin/geckodriver-arm64 /usr/local/bin/geckodriver ; \
36+
chmod 755 /usr/local/bin/geckodriver ; \
37+
else \
38+
wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz ; \
39+
tar -C /tmp -zxf /tmp/geckodriver.tar.gz ; \
40+
rm /tmp/geckodriver.tar.gz ; \
41+
mv /tmp/geckodriver /opt/geckodriver-bin/geckodriver-amd64 ; \
42+
echo "Symlinking AMD64 geckodriver to /usr/local/bin/geckodriver" ; \
43+
ln -s /opt/geckodriver-bin/geckodriver-amd64 /usr/local/bin/geckodriver ; \
44+
chmod 755 /usr/local/bin/geckodriver ; \
45+
fi
2446

2547
USER 1200
2648

‎NodeFirefox/Dockerfile.arm64‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#FROM local-seleniarm/node-base:4.0.0-20211018
22
#LABEL authors=SeleniumHQ,sj26,jamesmortensen
33

4+
ARG TARGETARCH
5+
ARG TARGETVARIANT
6+
47
USER root
58

69
#=========
@@ -12,8 +15,27 @@ RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.lis
1215
&& apt-get -qqy install firefox libavcodec-extra \
1316
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1417

15-
# geckodriver was built using the local-seleniarm/geckodriver-arm64 Debian image
16-
COPY geckodriver /usr/local/bin/
18+
# geckodriver-arm64 was built using the local-seleniarm/geckodriver-arm64 Debian image
19+
COPY geckodriver /opt/geckodriver-bin/geckodriver-arm64
20+
21+
RUN if [ $TARGETARCH = "arm" ] && [ $TARGETVARIANT = "v7" ]; then \
22+
export ARCH=armhf ; \
23+
else \
24+
export ARCH=$TARGETARCH ; \
25+
fi ; \
26+
if [ "$ARCH" = "arm64" ] || [ "$ARCH" = "armhf" ]; then \
27+
echo "Symlinking pre-built ARM geckodriver to /usr/local/bin/geckodriver" ; \
28+
ln -s /opt/geckodriver-bin/geckodriver-arm64 /usr/local/bin/geckodriver ; \
29+
chmod 755 /usr/local/bin/geckodriver ; \
30+
else \
31+
wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz ; \
32+
tar -C /tmp -zxf /tmp/geckodriver.tar.gz ; \
33+
rm /tmp/geckodriver.tar.gz ; \
34+
mv /tmp/geckodriver /opt/geckodriver-bin/geckodriver-amd64 ; \
35+
echo "Symlinking AMD64 geckodriver to /usr/local/bin/geckodriver" ; \
36+
ln -s /opt/geckodriver-bin/geckodriver-amd64 /usr/local/bin/geckodriver ; \
37+
chmod 755 /usr/local/bin/geckodriver ; \
38+
fi
1739

1840
USER 1200
1941

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

88
USER 1200

0 commit comments

Comments
 (0)