diff --git a/Base/Dockerfile b/Base/Dockerfile index 6bef25fa63..ce604e25c9 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -16,7 +16,7 @@ ARG TARGETARCH # No interactive frontend during docker build ENV DEBIAN_FRONTEND=noninteractive \ DEBCONF_NONINTERACTIVE_SEEN=true \ - ARCH=$TARGETARCH + ARCH=armhf #======================== # Miscellaneous packages diff --git a/NodeChromium/Dockerfile.txt b/NodeChromium/Dockerfile.txt index cbae379ada..aa24ddf765 100644 --- a/NodeChromium/Dockerfile.txt +++ b/NodeChromium/Dockerfile.txt @@ -6,7 +6,8 @@ RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.lis && 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/* #================================= diff --git a/build-and-deploy-multi-arch.sh b/build-and-deploy-multi-arch.sh index af5d634cb2..5c31087028 100644 --- a/build-and-deploy-multi-arch.sh +++ b/build-and-deploy-multi-arch.sh @@ -3,7 +3,7 @@ VERSION=4.1.0-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 diff --git a/build.sh b/build.sh index eac49c3d89..8c280b8107 100644 --- a/build.sh +++ b/build.sh @@ -4,20 +4,20 @@ CHROMIUM=93.0.4577.82 # Not yet used at this time. Edit in NodeChromium/Dockerf NAMESPACE=local-seleniarm AUTHORS=SeleniumHQ,sj26,jamesmortensen -cd ./Base && docker buildx build --platform linux/arm64 -t $NAMESPACE/base:$VERSION-$BUILD_DATE . +cd ./Base && docker buildx build --platform linux/arm/v7 -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 linux/arm/v7 -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 linux/arm/v7 -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 linux/arm/v7 -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 linux/arm/v7 -t $NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE . echo "Build node-hub, node-chromium, and standalone-chromium...\n" echo "Tagging builds...\n"