From a61d86042af58ed440808137556e91d22c239301 Mon Sep 17 00:00:00 2001 From: James Mortensen Date: Thu, 31 Mar 2022 11:18:22 +0530 Subject: [PATCH] Fixed bug in build-and-deploy-multi-arch. Was generating the wrong Firefox Dockerfile. Built images and deployed as 4.1.3-20220331 --- Hub/Dockerfile | 4 ++-- NodeBase/Dockerfile | 4 ++-- NodeChromium/Dockerfile | 4 ++-- NodeFirefox/Dockerfile | 4 ++-- StandaloneChromium/Dockerfile | 4 ++-- StandaloneFirefox/Dockerfile | 4 ++-- build-and-deploy-multi-arch.sh | 9 +++++++-- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Hub/Dockerfile b/Hub/Dockerfile index 8d68e20c0..db413c634 100644 --- a/Hub/Dockerfile +++ b/Hub/Dockerfile @@ -2,8 +2,8 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/base:4.1.3-20220331 -LABEL authors=SeleniumHQ +FROM seleniarm/base:4.1.3-20220331 +LABEL authors=SeleniumHQ,sj26,jamesmortensen USER 1200 diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile index a17de3393..bd28aa022 100644 --- a/NodeBase/Dockerfile +++ b/NodeBase/Dockerfile @@ -2,8 +2,8 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/base:4.1.3-20220331 -LABEL authors=SeleniumHQ +FROM seleniarm/base:4.1.3-20220331 +LABEL authors=SeleniumHQ,sj26,jamesmortensen USER root diff --git a/NodeChromium/Dockerfile b/NodeChromium/Dockerfile index 60f7f2f2c..9908c24ac 100644 --- a/NodeChromium/Dockerfile +++ b/NodeChromium/Dockerfile @@ -2,8 +2,8 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/node-base:4.1.3-20220331 -LABEL authors=SeleniumHQ +FROM seleniarm/node-base:4.1.3-20220331 +LABEL authors=SeleniumHQ,sj26,jamesmortensen USER root diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile index e0f9885b5..5f7ee7dd7 100644 --- a/NodeFirefox/Dockerfile +++ b/NodeFirefox/Dockerfile @@ -2,8 +2,8 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/node-base:4.1.3-20220331 -LABEL authors=SeleniumHQ +FROM seleniarm/node-base:4.1.3-20220331 +LABEL authors=SeleniumHQ,sj26,jamesmortensen #FROM local-seleniarm/node-base:4.0.0-20211018 #LABEL authors=SeleniumHQ,sj26,jamesmortensen diff --git a/StandaloneChromium/Dockerfile b/StandaloneChromium/Dockerfile index b44851e8e..e8db8f79a 100644 --- a/StandaloneChromium/Dockerfile +++ b/StandaloneChromium/Dockerfile @@ -2,8 +2,8 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/node-chromium:4.1.3-20220331 -LABEL authors=SeleniumHQ +FROM seleniarm/node-chromium:4.1.3-20220331 +LABEL authors=SeleniumHQ,sj26,jamesmortensen USER 1200 diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile index 634f9113a..6108fe2a2 100644 --- a/StandaloneFirefox/Dockerfile +++ b/StandaloneFirefox/Dockerfile @@ -2,8 +2,8 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM local-seleniarm/node-firefox:4.1.3-20220331 -LABEL authors=SeleniumHQ +FROM seleniarm/node-firefox:4.1.3-20220331 +LABEL authors=SeleniumHQ,sj26,jamesmortensen USER 1200 diff --git a/build-and-deploy-multi-arch.sh b/build-and-deploy-multi-arch.sh index 62620b19c..7f43a1ee6 100644 --- a/build-and-deploy-multi-arch.sh +++ b/build-and-deploy-multi-arch.sh @@ -1,9 +1,14 @@ BUILD_DATE=$(date +'%Y%m%d') -VERSION="${VERSION:-4.1.2}" +VERSION="${VERSION:-4.1.3}" NAMESPACE="${NAMESPACE:-seleniarm}" AUTHORS=SeleniumHQ,sj26,jamesmortensen ARCH=linux/arm64,linux/amd64,linux/arm/v7 +echo "Register architectures via aptman/qus (QEMU User Static)...\n" + +docker run --rm -it --privileged aptman/qus -- -r +docker run --rm -it --privileged aptman/qus -s -- -p + echo "Build multi-arch images and push to Docker Hub...\n" cd ./Base && docker buildx build --push --platform $ARCH -t $NAMESPACE/base:$VERSION-$BUILD_DATE . @@ -16,7 +21,7 @@ cd ../NodeBase && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \ # && sed 's/chromium=.*/chromium=91.0.4472.124/' Dockerfile > Dockerfile \ cd ../NodeChromium && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \ && docker buildx build --push --platform $ARCH -t $NAMESPACE/node-chromium:$VERSION-$BUILD_DATE . -cd ../NodeFirefox && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \ +cd ../NodeFirefox && sh generate-arm.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \ && docker buildx build --push --platform $ARCH -t $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE . cd ../Standalone && sh generate.sh StandaloneChromium node-chromium $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \