allow build om arm64

Author: fhoeben

.github/workflows/update-dev-beta-browser-images.yml

@@ -74,7 +74,7 @@ jobs:
           export BROWSER_VERSION_COMMAND="firefox -version"
         elif [ "$BROWSER" = "chrome" ]; then
           export DRIVER_VERSION_COMMAND="/usr/bin/chromedriver -version"
-          export BROWSER_VERSION_COMMAND="google-chrome -version"
+          export BROWSER_VERSION_COMMAND="chromium -version"
         elif [ "$BROWSER" = "edge" ]; then
           export DRIVER_VERSION_COMMAND="/usr/bin/msedgedriver -version"
           export BROWSER_VERSION_COMMAND="microsoft-edge -version"

Base/Dockerfile

@@ -1,14 +1,10 @@
 FROM ubuntu:jammy-20231004
 LABEL authors="Selenium <[email protected]>"
 
+ARG TARGETARCH
+ARG TARGETVARIANT
 ARG VERSION
 ARG RELEASE=selenium-${VERSION}
-#================================================
-# Customize sources for apt-get
-#================================================
-RUN  echo "deb http://archive.ubuntu.com/ubuntu jammy main universe\n" > /etc/apt/sources.list \
-  && echo "deb http://archive.ubuntu.com/ubuntu jammy-updates main universe\n" >> /etc/apt/sources.list \
-  && echo "deb http://security.ubuntu.com/ubuntu jammy-security main universe\n" >> /etc/apt/sources.list
 
 # No interactive frontend during docker build
 ENV DEBIAN_FRONTEND=noninteractive \
@@ -33,8 +29,16 @@ RUN apt-get -qqy update \
     curl \
     supervisor \
     gnupg2 \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
-  && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/java-11-openjdk-amd64/conf/security/java.security
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+#===================
+
+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

Makefile

@@ -24,11 +24,9 @@ all: hub \
 	sessionqueue \
 	event_bus \
 	chrome \
-	edge \
 	firefox \
 	docker \
 	standalone_chrome \
-	standalone_edge \
 	standalone_firefox \
 	standalone_docker \
 	video

NodeChrome/Dockerfile

@@ -7,20 +7,24 @@ LABEL authors=${AUTHORS}
 USER root
 
 #============================================
-# Google Chrome
+# Chromium from Debian
 #============================================
-# can specify versions by CHROME_VERSION;
-#  e.g. google-chrome-stable
-#       google-chrome-beta
-#       google-chrome-unstable
-#============================================
-ARG CHROME_VERSION="google-chrome-stable"
-RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor | tee /etc/apt/trusted.gpg.d/google.gpg >/dev/null \
-  && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
-  && apt-get update -qqy \
-  && apt-get -qqy install \
-    ${CHROME_VERSION:-google-chrome-stable} \
-  && rm /etc/apt/sources.list.d/google-chrome.list \
+ARG DEBIAN_VERSION=bullseye
+RUN echo "deb [signed-by=/usr/share/keyrings/debian-${DEBIAN_VERSION}.gpg] http://deb.debian.org/debian ${DEBIAN_VERSION} main" > /etc/apt/sources.list.d/debian.list \
+  && echo "deb [signed-by=/usr/share/keyrings/debian-${DEBIAN_VERSION}-updates.gpg] http://deb.debian.org/debian ${DEBIAN_VERSION}-updates main" >> /etc/apt/sources.list.d/debian.list \
+  && echo "deb [signed-by=/usr/share/keyrings/debian-security-${DEBIAN_VERSION}.gpg] http://deb.debian.org/debian-security ${DEBIAN_VERSION}-security main contrib non-free" >> /etc/apt/sources.list.d/debian.list \
+  && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 \
+  && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6ED0E7B82643E131 \
+  && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 112695A0E562B32A \
+  && apt-key export 386FA1D9 | sudo gpg --dearmour -o /usr/share/keyrings/debian-${DEBIAN_VERSION}.gpg \
+  && apt-key export 2643E131 | sudo gpg --dearmour -o /usr/share/keyrings/debian-${DEBIAN_VERSION}-updates.gpg \
+  && apt-key export E562B32A | sudo gpg --dearmour -o /usr/share/keyrings/debian-security-${DEBIAN_VERSION}.gpg
+
+COPY chromium.pref /etc/apt/preferences.d/chromium.pref
+
+RUN apt-get update -qqy \
+  && apt-get -qqy install chromium \
+  && rm /etc/apt/sources.list.d/debian.list \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #=================================
@@ -41,7 +45,7 @@ ARG CHROME_DRIVER_VERSION
 RUN if [ ! -z "$CHROME_DRIVER_VERSION" ]; \
   then CHROME_DRIVER_URL=https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROME_DRIVER_VERSION/linux64/chromedriver-linux64.zip ; \
   else echo "Geting ChromeDriver latest version from https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_" \
-    && CHROME_MAJOR_VERSION=$(google-chrome --version | sed -E "s/.* ([0-9]+)(\.[0-9]+){3}.*/\1/") \
+    && CHROME_MAJOR_VERSION=$(chromium --version | sed -E "s/.* ([0-9]+)(\.[0-9]+){3}.*/\1/") \
     && CHROME_DRIVER_VERSION=$(wget -qO- https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_${CHROME_MAJOR_VERSION} | sed 's/\r$//') \
     && CHROME_DRIVER_URL=https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROME_DRIVER_VERSION/linux64/chromedriver-linux64.zip ; \
   fi \
@@ -59,5 +63,5 @@ RUN if [ ! -z "$CHROME_DRIVER_VERSION" ]; \
 # Dumping Browser information for config
 #============================================
 RUN echo "chrome" > /opt/selenium/browser_name
-RUN google-chrome --version | awk '{print $3}' > /opt/selenium/browser_version
-RUN echo "\"goog:chromeOptions\": {\"binary\": \"/usr/bin/google-chrome\"}" > /opt/selenium/browser_binary_location
+RUN chromium --version | awk '{print $3}' > /opt/selenium/browser_version
+RUN echo "\"goog:chromeOptions\": {\"binary\": \"/usr/bin/chromium\"}" > /opt/selenium/browser_binary_location

NodeChrome/chromium.pref

@@ -0,0 +1,14 @@
+# Note: 2 blank lines are required between entries
+Package: *
+Pin: release a=eoan
+Pin-Priority: 500
+
+Package: *
+Pin: origin "deb.debian.org"
+Pin-Priority: 300
+
+# Pattern includes 'chromium', 'chromium-browser' and similarly
+# named dependencies:
+Package: chromium*
+Pin: origin "deb.debian.org"
+Pin-Priority: 700

NodeChrome/wrap_chrome_binary

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-WRAPPER_PATH=$(readlink -f /usr/bin/google-chrome)
+WRAPPER_PATH=$(readlink -f /usr/bin/chromium)
 BASE_PATH="$WRAPPER_PATH-base"
 mv "$WRAPPER_PATH" "$BASE_PATH"
 

generate_release_notes.sh

@@ -11,7 +11,7 @@ echo "" >> release_notes.md
 echo "### Changelog" > release_notes.md
 git --no-pager log "${LATEST_TAG}...${HEAD_BRANCH}" --pretty=format:"* [\`%h\`](http://github.com/seleniumhq/docker-selenium/commit/%H) - %s :: %an" --reverse >> release_notes.md
 
-CHROME_VERSION=$(docker run --rm selenium/node-chrome:${TAG_VERSION} google-chrome --version | awk '{print $3}')
+CHROME_VERSION=$(docker run --rm selenium/node-chrome:${TAG_VERSION} chromium --version | awk '{print $3}')
 EDGE_VERSION=$(docker run --rm selenium/node-edge:${TAG_VERSION} microsoft-edge --version | awk '{print $3}')
 CHROMEDRIVER_VERSION=$(docker run --rm selenium/node-chrome:${TAG_VERSION} chromedriver --version | awk '{print $2}')
 EDGEDRIVER_VERSION=$(docker run --rm selenium/node-edge:${TAG_VERSION} msedgedriver --version | awk '{print $4}')

tag_and_push_browser_images.sh

@@ -20,7 +20,7 @@ echo "Tagging images for browser ${BROWSER}, version ${VERSION}, build date ${BU
 case "${BROWSER}" in
 
 chrome)
-  CHROME_VERSION=$(docker run --rm selenium/node-chrome:${TAG_VERSION} google-chrome --version | awk '{print $3}')
+  CHROME_VERSION=$(docker run --rm selenium/node-chrome:${TAG_VERSION} chromium --version | awk '{print $3}')
   echo "Chrome version -> "${CHROME_VERSION}
   CHROME_SHORT_VERSION="$(short_version ${CHROME_VERSION})"
   echo "Short Chrome version -> "${CHROME_SHORT_VERSION}
@@ -35,21 +35,21 @@ chrome)
       # Browser version and browser driver version plus build date
       ${CHROME_VERSION}-chromedriver-${CHROMEDRIVER_VERSION}-${BUILD_DATE}
       # Browser version and browser driver version
-      ${CHROME_VERSION}-chromedriver-${CHROMEDRIVER_VERSION}      
+      ${CHROME_VERSION}-chromedriver-${CHROMEDRIVER_VERSION}
       # Browser version and build date
       ${CHROME_VERSION}-${BUILD_DATE}
       # Browser version
-      ${CHROME_VERSION}      
+      ${CHROME_VERSION}
       ## Short versions
       ${CHROME_SHORT_VERSION}-chromedriver-${CHROMEDRIVER_SHORT_VERSION}-grid-${TAG_VERSION}
       # Browser version and browser driver version plus build date
       ${CHROME_SHORT_VERSION}-chromedriver-${CHROMEDRIVER_SHORT_VERSION}-${BUILD_DATE}
       # Browser version and browser driver version
-      ${CHROME_SHORT_VERSION}-chromedriver-${CHROMEDRIVER_SHORT_VERSION}      
+      ${CHROME_SHORT_VERSION}-chromedriver-${CHROMEDRIVER_SHORT_VERSION}
       # Browser version and build date
       ${CHROME_SHORT_VERSION}-${BUILD_DATE}
       # Browser version
-      ${CHROME_SHORT_VERSION}      
+      ${CHROME_SHORT_VERSION}
   )
 
   for chrome_tag in "${CHROME_TAGS[@]}"
@@ -83,17 +83,17 @@ edge)
       # Browser version and build date
       ${EDGE_VERSION}-${BUILD_DATE}
       # Browser version
-      ${EDGE_VERSION}      
+      ${EDGE_VERSION}
       ## Short versions
       ${EDGE_SHORT_VERSION}-edgedriver-${EDGEDRIVER_SHORT_VERSION}-grid-${TAG_VERSION}
       # Browser version and browser driver version plus build date
       ${EDGE_SHORT_VERSION}-edgedriver-${EDGEDRIVER_SHORT_VERSION}-${BUILD_DATE}
       # Browser version and browser driver version
-      ${EDGE_SHORT_VERSION}-edgedriver-${EDGEDRIVER_SHORT_VERSION}      
+      ${EDGE_SHORT_VERSION}-edgedriver-${EDGEDRIVER_SHORT_VERSION}
       # Browser version and build date
       ${EDGE_SHORT_VERSION}-${BUILD_DATE}
       # Browser version
-      ${EDGE_SHORT_VERSION}      
+      ${EDGE_SHORT_VERSION}
   )
 
   for edge_tag in "${EDGE_TAGS[@]}"
@@ -122,21 +122,21 @@ firefox)
       # Browser version and browser driver version plus build date
       ${FIREFOX_VERSION}-geckodriver-${GECKODRIVER_VERSION}-${BUILD_DATE}
       # Browser version and browser driver version
-      ${FIREFOX_VERSION}-geckodriver-${GECKODRIVER_VERSION}      
+      ${FIREFOX_VERSION}-geckodriver-${GECKODRIVER_VERSION}
       # Browser version and build date
       ${FIREFOX_VERSION}-${BUILD_DATE}
       # Browser version
-      ${FIREFOX_VERSION}      
+      ${FIREFOX_VERSION}
       ## Short versions
       ${FIREFOX_SHORT_VERSION}-geckodriver-${GECKODRIVER_SHORT_VERSION}-grid-${TAG_VERSION}
       # Browser version and browser driver version plus build date
       ${FIREFOX_SHORT_VERSION}-geckodriver-${GECKODRIVER_SHORT_VERSION}-${BUILD_DATE}
       # Browser version and browser driver version
-      ${FIREFOX_SHORT_VERSION}-geckodriver-${GECKODRIVER_SHORT_VERSION}      
+      ${FIREFOX_SHORT_VERSION}-geckodriver-${GECKODRIVER_SHORT_VERSION}
       # Browser version and build date
       ${FIREFOX_SHORT_VERSION}-${BUILD_DATE}
       # Browser version
-      ${FIREFOX_SHORT_VERSION}      
+      ${FIREFOX_SHORT_VERSION}
   )
 
   for firefox_tag in "${FIREFOX_TAGS[@]}"