Fixed issue where standalone-firefox was still using the geckodriver arm64 binary for x86_64 hosts.

Author: jamesmortensen

Hub/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM seleniarm/base:4.1.2-20220222
+FROM seleniarm/base:4.1.2-20220227
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 USER 1200

NodeBase/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM seleniarm/base:4.1.2-20220222
+FROM seleniarm/base:4.1.2-20220227
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 USER root

NodeChromium/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM seleniarm/node-base:4.1.2-20220222
+FROM seleniarm/node-base:4.1.2-20220227
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 USER root

NodeFirefox/Dockerfile

@@ -2,12 +2,15 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM seleniarm/node-base:4.1.2-20220222
+FROM seleniarm/node-base:4.1.2-20220227
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 #FROM local-seleniarm/node-base:4.0.0-20211018
 #LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
+ARG TARGETARCH
+ARG TARGETVARIANT
+
 USER root
 
 #=========
@@ -19,8 +22,27 @@ RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.lis
   && apt-get -qqy install firefox libavcodec-extra \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
-# geckodriver was built using the local-seleniarm/geckodriver-arm64 Debian image
-COPY geckodriver /usr/local/bin/
+# geckodriver-arm64 was built using the local-seleniarm/geckodriver-arm64 Debian image
+COPY geckodriver /opt/geckodriver-bin/geckodriver-arm64
+
+RUN if [ $TARGETARCH = "arm" ] && [ $TARGETVARIANT = "v7" ]; then \
+       export ARCH=armhf ; \
+    else \
+       export ARCH=$TARGETARCH ; \
+    fi ; \
+    if [ "$ARCH" = "arm64" ] || [ "$ARCH" = "armhf" ]; then \
+       echo "Symlinking pre-built ARM geckodriver to /usr/local/bin/geckodriver" ; \
+       ln -s /opt/geckodriver-bin/geckodriver-arm64 /usr/local/bin/geckodriver ; \
+       chmod 755 /usr/local/bin/geckodriver ; \
+    else \
+       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 ; \
+       tar -C /tmp -zxf /tmp/geckodriver.tar.gz ; \
+       rm /tmp/geckodriver.tar.gz ; \
+       mv /tmp/geckodriver /opt/geckodriver-bin/geckodriver-amd64 ; \
+       echo "Symlinking AMD64 geckodriver to /usr/local/bin/geckodriver" ; \
+       ln -s /opt/geckodriver-bin/geckodriver-amd64 /usr/local/bin/geckodriver ; \
+       chmod 755 /usr/local/bin/geckodriver ; \
+    fi
 
 USER 1200
 

NodeFirefox/Dockerfile.arm64

@@ -1,6 +1,9 @@
 #FROM local-seleniarm/node-base:4.0.0-20211018
 #LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
+ARG TARGETARCH
+ARG TARGETVARIANT
+
 USER root
 
 #=========
@@ -12,8 +15,27 @@ RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.lis
   && apt-get -qqy install firefox libavcodec-extra \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
-# geckodriver was built using the local-seleniarm/geckodriver-arm64 Debian image
-COPY geckodriver /usr/local/bin/
+# geckodriver-arm64 was built using the local-seleniarm/geckodriver-arm64 Debian image
+COPY geckodriver /opt/geckodriver-bin/geckodriver-arm64
+
+RUN if [ $TARGETARCH = "arm" ] && [ $TARGETVARIANT = "v7" ]; then \
+       export ARCH=armhf ; \
+    else \
+       export ARCH=$TARGETARCH ; \
+    fi ; \
+    if [ "$ARCH" = "arm64" ] || [ "$ARCH" = "armhf" ]; then \
+       echo "Symlinking pre-built ARM geckodriver to /usr/local/bin/geckodriver" ; \
+       ln -s /opt/geckodriver-bin/geckodriver-arm64 /usr/local/bin/geckodriver ; \
+       chmod 755 /usr/local/bin/geckodriver ; \
+    else \
+       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 ; \
+       tar -C /tmp -zxf /tmp/geckodriver.tar.gz ; \
+       rm /tmp/geckodriver.tar.gz ; \
+       mv /tmp/geckodriver /opt/geckodriver-bin/geckodriver-amd64 ; \
+       echo "Symlinking AMD64 geckodriver to /usr/local/bin/geckodriver" ; \
+       ln -s /opt/geckodriver-bin/geckodriver-amd64 /usr/local/bin/geckodriver ; \
+       chmod 755 /usr/local/bin/geckodriver ; \
+    fi
 
 USER 1200
 

StandaloneChromium/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM seleniarm/node-chromium:4.1.2-20220222
+FROM seleniarm/node-chromium:4.1.2-20220227
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 USER 1200

StandaloneFirefox/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM seleniarm/node-firefox:4.1.2-20220222
+FROM seleniarm/node-firefox:4.1.2-20220227
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 USER 1200