Attempts to tag multi-arch images by modifying the manifest

Author: jamesmortensen

.circleci/config.yml

@@ -163,7 +163,7 @@ jobs:
       - run:
           name: "Tag browser images and update latest tag"
           command: |
-            NAME=${NAMESPACE} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} PUSH_IMAGE=true make tag_and_push_multi_arch_browser_images
+            NAME=${NAMESPACE} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} PUSH_IMAGE=true PLATFORMS=${PLATFORMS} make tag_and_push_multi_arch_browser_images
             NAME=${NAMESPACE} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make tag_multi_arch_latest
       - run:
           name: "Generate release notes"

Hub/Dockerfile

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

Makefile

@@ -244,10 +244,10 @@ tag_latest:
 tag_and_push_multi_arch_browser_images: tag_and_push_multi_arch_chromium_images tag_and_push_multi_arch_firefox_images
 
 tag_and_push_multi_arch_chromium_images:
-	./tag_and_push_multi-arch_browser_images.sh $(VERSION) $(BUILD_DATE) $(NAMESPACE) $(PUSH_IMAGE) chromium
+	./tag_and_push_multi-arch_browser_images.sh $(VERSION) $(BUILD_DATE) $(NAMESPACE) $(PUSH_IMAGE) chromium $(PLATFORMS)
 
 tag_and_push_multi_arch_firefox_images:
-	./tag_and_push_multi-arch_browser_images.sh $(VERSION) $(BUILD_DATE) $(NAMESPACE) $(PUSH_IMAGE) firefox
+	./tag_and_push_multi-arch_browser_images.sh $(VERSION) $(BUILD_DATE) $(NAMESPACE) $(PUSH_IMAGE) firefox $(PLATFORMS)
 
 tag_multi_arch_latest:
 	docker tag $(NAME)/base:$(TAG_VERSION) $(NAME)/base:latest

NodeBase/Dockerfile

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

NodeChromium/Dockerfile

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

NodeFirefox/Dockerfile

@@ -2,15 +2,17 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM seleniarm/node-base:4.1.3-20220331
-LABEL authors=SeleniumHQ,sj26,jamesmortensen
+FROM seleniarm/node-base:4.1.4-20220429
+LABEL authors=SeleniumHQ
 
 #FROM local-seleniarm/node-base:4.0.0-20211018
 #LABEL authors=SeleniumHQ,sj26,jamesmortensen
 
 ARG TARGETARCH
 ARG TARGETVARIANT
 
+ARG GECKODRIVER_VERSION=0.31.0
+
 USER root
 
 #=========
@@ -22,11 +24,11 @@ USER root
   # && apt-get -qqy install firefox libavcodec-extra \
   # && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
-# Temporarily installing Firefox 96.0.3 from snapshots since 98.0.2 is broken on arm64
+# Pulling Firefox from Debian Snapshots so we can control which version we use as latest
 RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \
   && apt-get update -qqy \
   && apt-get install libavcodec-extra -y \
-  && wget https://snapshot.debian.org/archive/debian/20220209T093507Z/pool/main/f/firefox/firefox_96.0.3-1_`dpkg --print-architecture`.deb -O firefox.deb \
+  && wget https://snapshot.debian.org/archive/debian/20220418T084218Z/pool/main/f/firefox/firefox_99.0-1_`dpkg --print-architecture`.deb -O firefox.deb \
   && apt install ./firefox.deb -y \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/* ./firefox.deb
 
@@ -43,11 +45,11 @@ RUN if [ $TARGETARCH = "arm" ] && [ $TARGETVARIANT = "v7" ]; then \
        exit 1 ; \
     fi ; \
     if [ "$ARCH" = "arm64" ]; then \ 
-       wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/jamesmortensen/geckodriver-arm-binaries/releases/download/v0.30.0/geckodriver-v0.30.0-linux-aarch64.tar.gz ; \
+       wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/jamesmortensen/geckodriver-arm-binaries/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux-aarch64.tar.gz ; \
     elif [ "$ARCH" = "armhf" ]; then \
-       wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/jamesmortensen/geckodriver-arm-binaries/releases/download/v0.30.0/geckodriver-v0.30.0-linux-armv7l.tar.gz ; \
+       wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/jamesmortensen/geckodriver-arm-binaries/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux-armv7l.tar.gz ; \
     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 ; \
+       wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz ; \
     fi ; \
     tar -C /tmp -zxf /tmp/geckodriver.tar.gz ; \
     rm /tmp/geckodriver.tar.gz ; \

StandaloneChromium/Dockerfile

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

StandaloneFirefox/Dockerfile

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

tag_and_push_multi-arch_browser_images.sh

@@ -5,6 +5,7 @@ BUILD_DATE=$2
 NAMESPACE=$3
 PUSH_IMAGE="${4:-false}"
 BROWSER=$5
+PLATFORMS=$6
 
 TAG_VERSION=${VERSION}-${BUILD_DATE}
 
@@ -52,16 +53,21 @@ chromium)
       ${CHROME_SHORT_VERSION}      
   )
 
+  cd NodeChromium
+  NODE_CHROMIUM_TAGS=""
+  STANDALONE_CHROMIUM_TAGS=""
   for chrome_tag in "${CHROME_TAGS[@]}"
   do
-    docker tag ${NAMESPACE}/node-chromium:${TAG_VERSION} ${NAMESPACE}/node-chromium:${chrome_tag}
-    docker tag ${NAMESPACE}/standalone-chromium:${TAG_VERSION} ${NAMESPACE}/standalone-chromium:${chrome_tag}
-    if [ "${PUSH_IMAGE}" = true ]; then
-        docker push ${NAMESPACE}/node-chromium:${chrome_tag}
-        docker push ${NAMESPACE}/standalone-chromium:${chrome_tag}
-    fi
+    #docker tag ${NAMESPACE}/node-chromium:${TAG_VERSION} ${NAMESPACE}/node-chromium:${chrome_tag}
+    #docker tag ${NAMESPACE}/standalone-chromium:${TAG_VERSION} ${NAMESPACE}/standalone-chromium:${chrome_tag}
+    NODE_CHROMIUM_TAGS+=" -t ${NAME}/node-chromium:${chrome_tag}"
+    STANDALONE_CHROMIUM_TAGS+=" -t ${NAME}/standalone-chromium:${chrome_tag}"
   done
-
+  if [ "${PUSH_IMAGE}" = true ]; then
+      cd ../NodeChromium && docker buildx build --platform ${PLATFORMS} --push ${NODE_CHROMIUM_TAGS} .
+      cd ../StandaloneChromium && docker buildx build --platform ${PLATFORMS} --push ${STANDALONE_CHROMIUM_TAGS} .  
+  fi
+  
   ;;
 firefox)
   FIREFOX_VERSION=$(docker run --rm seleniarm/node-firefox:${TAG_VERSION} firefox --version | awk '{print $3}')
@@ -95,13 +101,18 @@ firefox)
       ${FIREFOX_SHORT_VERSION}      
   )
 
+  #cd NodeFirefox
+  NODE_FIREFOX_TAGS=""
+  STANDALONE_FIREFOX_TAGS=""
   for firefox_tag in "${FIREFOX_TAGS[@]}"
   do
-    docker tag ${NAMESPACE}/node-firefox:${TAG_VERSION} ${NAMESPACE}/node-firefox:${firefox_tag}
-    docker tag ${NAMESPACE}/standalone-firefox:${TAG_VERSION} ${NAMESPACE}/standalone-firefox:${firefox_tag}
+    #docker tag ${NAMESPACE}/node-firefox:${TAG_VERSION} ${NAMESPACE}/node-firefox:${firefox_tag}
+    #docker tag ${NAMESPACE}/standalone-firefox:${TAG_VERSION} ${NAMESPACE}/standalone-firefox:${firefox_tag}
+    NODE_FIREFOX_TAGS+=" -t ${NAME}/node-firefox:${firefox_tag}"
+    STANDALONE_FIREFOX_TAGS+=" -t ${NAME}/standalone-firefox:${firefox_tag}"
     if [ "${PUSH_IMAGE}" = true ]; then
-        docker push ${NAMESPACE}/node-firefox:${firefox_tag}
-        docker push ${NAMESPACE}/standalone-firefox:${firefox_tag}
+        cd ../NodeFirefox && docker buildx build --platform ${PLATFORMS} --push ${NODE_FIREFOX_TAGS} .
+        cd ../StandaloneFirefox && docker buildx build --platform ${PLATFORMS} --push ${STANDALONE_FIREFOX_TAGS} .
     fi
   done