resolve conflicts

Author: jamesmortensen

Base/Dockerfile

@@ -12,11 +12,12 @@ LABEL authors="Selenium <[email protected]>"
 #  && echo "deb http://security.ubuntu.com/ubuntu focal-security main universe\n" >> /etc/apt/sources.list
 
 ARG TARGETARCH
+ARG TARGETVARIANT
 
 # No interactive frontend during docker build
 ENV DEBIAN_FRONTEND=noninteractive \
-    DEBCONF_NONINTERACTIVE_SEEN=true \
-    ARCH=$TARGETARCH
+    DEBCONF_NONINTERACTIVE_SEEN=true
+
 
 #========================
 # Miscellaneous packages
@@ -37,7 +38,15 @@ RUN apt-get -qqy update \
     gnupg2 \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/* 
 
-RUN echo $ARCH && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/java-11-openjdk-$ARCH/conf/security/java.security
+#===================
+
+RUN if [ $TARGETARCH = "arm" ] && [ $TARGETVARIANT = "v7" ]; then \
+       export ARCH=armhf ; \
+    else \
+       export ARCH=$TARGETARCH ; \
+    fi \
+    && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/java-11-openjdk-$ARCH/conf/security/java.security
+
 
 #===================
 # Timezone settings

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.0-alpha-20211218
+FROM local-seleniarm/base:4.1.1-20220119
 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.0-alpha-20211218
+FROM local-seleniarm/base:latest
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 USER root
@@ -139,15 +139,21 @@ COPY selenium.conf /etc/supervisor/conf.d/
 RUN mkdir -p ${HOME}/.vnc \
   && x11vnc -storepasswd secret ${HOME}/.vnc/passwd
 
-USER root
+# Added to avoid the following sudo error while running multi-arch builds:
+# "sudo: effective uid is not 0, is /usr/bin/sudo on a file system with 
+#   the 'nosuid' option set or an NFS file system without root privileges?"
+USER root 
+
 #==========
 # Relaxing permissions for OpenShift and other non-sudo environments
 #==========
-RUN  chmod -R 777 ${HOME} \
-  &&  chgrp -R 0 ${HOME} \
-  &&  chmod -R g=u ${HOME}
+RUN chmod -R 777 ${HOME} \
+  && chgrp -R 0 ${HOME} \
+  && chmod -R g=u ${HOME}
 
+# Added to avoid sudo-related multi-arch build errors
 USER 1200
+
 #==============================
 # Scripts to run fluxbox, x11vnc and noVNC
 #==============================
@@ -188,10 +194,13 @@ ENV SE_NODE_OVERRIDE_MAX_SESSIONS false
 # Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
 ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
 
+# Added to avoid sudo-related multi-arch build errors
 USER root
+
 # Creating base directory for Xvfb
-RUN  mkdir -p /tmp/.X11-unix &&  chmod 1777 /tmp/.X11-unix
+RUN  mkdir -p /tmp/.X11-unix && chmod 1777 /tmp/.X11-unix
 
+# Added to avoid sudo-related multi-arch build errors
 USER 1200
 
 # Copying configuration script generator

NodeChromium/Dockerfile

@@ -2,18 +2,19 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM seleniarm/node-base:4.1.0-alpha-20211218
+FROM local-seleniarm/node-base:latest
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 USER root
 
-# Install Chromium Arm64
+# Install Chromium 
 # RUN echo "deb http://http.us.debian.org/debian/ stable non-free contrib main" >> /etc/apt/sources.list \
 RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.list \
   && apt-get update -qqy \
   # && apt-get -qqy install chromium=89.0.4389.82-1 \
   # && apt-get -qqy install chromium=90.0.4430.212-1 \
-  && apt-get -qqy install chromium=93.0.4577.82-1 \
+  # && apt-get -qqy install chromium=93.0.4577.82-1 \
+  && apt-get -qqy install chromium=97.0.4692.71-0.1 \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #=================================

NodeChromium/Dockerfile.txt

@@ -1,12 +1,13 @@
 USER root
 
-# Install Chromium Arm64
+# Install Chromium 
 # RUN echo "deb http://http.us.debian.org/debian/ stable non-free contrib main" >> /etc/apt/sources.list \
 RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.list \
   && apt-get update -qqy \
   # && apt-get -qqy install chromium=89.0.4389.82-1 \
   # && apt-get -qqy install chromium=90.0.4430.212-1 \
-  && apt-get -qqy install chromium=93.0.4577.82-1 \
+  # && apt-get -qqy install chromium=93.0.4577.82-1 \
+  && apt-get -qqy install chromium=97.0.4692.71-0.1 \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #=================================

README.md

@@ -1,6 +1,14 @@
-# Docker images for Selenium, built for Debian ARM64
+# Docker images for Selenium, built for Debian ARM64, ARM/v7, and AMD64
 
-At this point, I've only updated the images for Chromium 93, the latest ARM64 build for Debian ARM64.
+Selenium container images are available on [Docker Hub](https://hub.docker.com/u/seleniarm):
+
+- [Standalone Chromium](https://hub.docker.com/r/seleniarm/standalone-chromium)
+- [Standalone Firefox - ARM64 only](https://hub.docker.com/r/seleniarm/standalone-firefox)
+- [Node Chromium](https://hub.docker.com/r/seleniarm/node-chromium)
+- [Node Firefox](https://hub.docker.com/r/seleniarm/node-firefox)
+- [Selenium Hub](https://hub.docker.com/r/seleniarm/hub)
+
+For other images, see the next section to build them yourself.
 
 ## Only Building the Images
 
@@ -11,15 +19,19 @@ The NodeBase folder is the base for all Node${browser} images and includes a scr
 
 Inside build.sh are environment variables which are used to tag the built images. If changing the Selenium version, note that you must also edit the Base/Dockerfile and change which selenium-server version is downloaded via wget.  The Chromium version is set in NodeChromium/Dockerfile.txt.
 
-To build the images, run build.sh from the root directory of this repo:
+The build.sh script only builds the standalone images, node images, and the hub.  You are welcome to try and build and test the other images, if you need them.
+
+To build the images, run build.sh from the root directory of this repo, and specify your architecture, either arm64, arm/v7, or amd64:
 
 ```
-$ sh build.sh
+$ ./build.sh arm64    # or arm/v7 or amd64
 ```
 
-I have not pushed any images to the Docker registry. If you wish to push them to a registry, you may do so.  For more information on older ARM64 Selenium images, see https://github.com/sj26/docker-selenium and https://hub.docker.com/u/seleniarm
+This is a fork of [SeleniumHQ/docker-selenium](https://github.com/SeleniumHQ/docker-selenium) and based on changes from [sj26/docker-selenium](https://github.com/sj26/docker-selenium).  
+
+Multi-arch images are located at https://hub.docker.com/u/seleniarm
 
-the primary motivation for creating this fork and updating the images is so I can use the noVNC client on Selenium 4.0.0. To use noVNC, make sure you open port 7900, and visit localhost:7900 in your browser.
+The primary motivation for creating this fork and updating the images is so I can use the noVNC client on Selenium 4.0.0 on the Mac M1, an arm64 architecture. To use noVNC, make sure you open port 7900, and visit localhost:7900 in your browser.
 
 To start the container image, run:
 

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.0-alpha-20211218
+FROM local-seleniarm/node-chromium:latest
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 USER 1200

build-and-deploy-multi-arch.sh

@@ -1,9 +1,9 @@
 BUILD_DATE=$(date +'%Y%m%d')
-VERSION=4.1.0-alpha
+VERSION=4.1.1-alpha
 CHROMIUM=93.0.4577.82  # Not yet used at this time. Edit in NodeChromium/Dockerfile.txt
 NAMESPACE=seleniarm
 AUTHORS=SeleniumHQ,sj26,jamesmortensen
-ARCH=linux/arm64,linux/amd64
+ARCH=linux/arm64,linux/amd64,linux/arm/v7
 
 cd ./Base && docker buildx build --push --platform $ARCH -t $NAMESPACE/base:$VERSION-$BUILD_DATE .
 echo $PWD

build.sh

@@ -1,23 +1,38 @@
+#!/bin/bash -x
+
 BUILD_DATE=$(date +'%Y%m%d')
-VERSION=4.1.0
+VERSION=4.1.1
 CHROMIUM=93.0.4577.82  # Not yet used at this time. Edit in NodeChromium/Dockerfile.txt
 NAMESPACE=local-seleniarm
 AUTHORS=SeleniumHQ,sj26,jamesmortensen
 
-cd ./Base && docker buildx build --platform linux/arm64 -t $NAMESPACE/base:$VERSION-$BUILD_DATE .
+if [ "$1" == "arm64" ] || [ "$1" == "amd64" ] || [ "$1" == "arm/v7" ]; then
+   echo "Building images for platform $1"
+   PLATFORM=linux/$1
+else
+   echo "Run build.sh script as one of the following options:"
+   echo ""
+   echo "sh build.sh arm64"
+   echo "sh build.sh arm/v7"
+   echo "sh build.sh amd64"
+   exit;
+fi
+
+
+cd ./Base && docker buildx build --platform $PLATFORM -t $NAMESPACE/base:$VERSION-$BUILD_DATE .
 echo $PWD
 cd ../Hub && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --platform linux/arm64 -t $NAMESPACE/hub:$VERSION-$BUILD_DATE .
+   && docker buildx build --platform $PLATFORM -t $NAMESPACE/hub:$VERSION-$BUILD_DATE .
 
 cd ../NodeBase && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --platform linux/arm64 -t $NAMESPACE/node-base:$VERSION-$BUILD_DATE .
+   && docker buildx build --platform $PLATFORM -t $NAMESPACE/node-base:$VERSION-$BUILD_DATE .
 # && sed 's/chromium=.*/chromium=91.0.4472.124/' Dockerfile > Dockerfile \
 cd ../NodeChromium && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --platform linux/arm64 -t $NAMESPACE/node-chromium:$VERSION-$BUILD_DATE .
+   && docker buildx build --platform $PLATFORM -t $NAMESPACE/node-chromium:$VERSION-$BUILD_DATE .
 
 cd ../Standalone && sh generate.sh StandaloneChromium node-chromium $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
    && cd ../StandaloneChromium \
-   && docker buildx build --platform linux/arm64 -t $NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE .
+   && docker buildx build --platform $PLATFORM -t $NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE .
 
 echo "Build node-hub, node-chromium, and standalone-chromium...\n"
 echo "Tagging builds...\n"