Skip to content
This repository was archived by the owner on Jun 22, 2024. It is now read-only.

Commit ea220c7

Browse files
VietND96VietND96
committed
Add back platform linux/arm/v7
This reverts commit d16ae9e. Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 1df44f4 commit ea220c7

File tree

5 files changed

+30
-29
lines changed

5 files changed

+30
-29
lines changed

‎.circleci/config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ workflows:
337337
jobs:
338338
- deploy-multi-arch-full-grid:
339339
name: deploy-multi-arch-base
340-
platforms: linux/arm64,linux/amd64
340+
platforms: linux/arm64,linux/amd64,linux/arm/v7
341341
build-args: --push
342342
make-targets: base_multi
343343
machine-type: ubuntu2004arm64large
@@ -348,7 +348,7 @@ workflows:
348348
- deploy-multi-arch-full-grid:
349349
name: deploy-multi-arch-full-grid
350350
requires: [deploy-multi-arch-base]
351-
platforms: linux/arm64,linux/amd64
351+
platforms: linux/arm64,linux/amd64,linux/arm/v7
352352
build-args: --push
353353
make-targets: grid_multi
354354
machine-type: ubuntu2004arm64
@@ -359,7 +359,7 @@ workflows:
359359
- deploy-multi-arch-full-grid:
360360
name: deploy-multi-arch-node-base
361361
requires: [deploy-multi-arch-base]
362-
platforms: linux/arm64,linux/amd64
362+
platforms: linux/arm64,linux/amd64,linux/arm/v7
363363
build-args: --push
364364
make-targets: node_base_multi
365365
machine-type: ubuntu2004arm64large
@@ -370,7 +370,7 @@ workflows:
370370
- deploy-multi-arch-full-grid:
371371
name: deploy-multi-arch-firefox
372372
requires: [deploy-multi-arch-node-base]
373-
platforms: linux/arm64,linux/amd64
373+
platforms: linux/arm64,linux/amd64,linux/arm/v7
374374
build-args: --push
375375
make-targets: firefox_multi
376376
machine-type: ubuntu2004arm64large
@@ -381,7 +381,7 @@ workflows:
381381
- deploy-multi-arch-full-grid:
382382
name: deploy-multi-arch-chromium
383383
requires: [deploy-multi-arch-node-base]
384-
platforms: linux/arm64,linux/amd64
384+
platforms: linux/arm64,linux/amd64,linux/arm/v7
385385
build-args: --push
386386
make-targets: chromium_multi
387387
machine-type: ubuntu2004arm64large
@@ -392,7 +392,7 @@ workflows:
392392
- deploy-multi-arch-full-grid:
393393
name: deploy-multi-arch-release-notes
394394
requires: [deploy-multi-arch-firefox,deploy-multi-arch-chromium]
395-
platforms: linux/arm64,linux/amd64
395+
platforms: linux/arm64,linux/amd64,linux/arm/v7
396396
build-args: --push
397397
make-targets: tag_and_push_multi_arch_browser_images
398398
machine-type: ubuntu2004arm64

‎NodeChromium/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ USER root
1616
# Install Chromium
1717
# RUN echo "deb http://http.us.debian.org/debian/ stable non-free contrib main" >> /etc/apt/sources.list \
1818
RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \
19+
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 6ED0E7B82643E131 \
1920
&& apt-get update -qqy \
2021
# && apt-get -qqy install chromium=89.0.4389.82-1 \
2122
# && apt-get -qqy install chromium=90.0.4430.212-1 \

‎NodeFirefox/Dockerfile.multi-arch‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ USER root
2525

2626
# Pulling Firefox from Debian Snapshots so we can control which version we use as latest
2727
RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \
28+
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 6ED0E7B82643E131 \
2829
&& apt-get update -qqy \
29-
&& apt-get install libavcodec-extra -y \
30-
&& wget http://http.us.debian.org/debian/pool/main/f/firefox/firefox_124.0.1-1_`dpkg --print-architecture`.deb -O firefox.deb
31-
32-
RUN apt install ./firefox.deb -y \
33-
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* ./firefox.deb
30+
&& apt-get install libavcodec-extra firefox -y \
31+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
3432

3533
#=============
3634
# geckodriver

‎build-and-push.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/bin/bash
22

3-
#SELENIUM_VERSION=$(grep selenium-server Base/Dockerfile | sed 's/.*-\([^-]*\)\.jar \\/\1/' | head -n 1)
3+
SELENIUM_VERSION=$(grep BASE_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
4+
RELEASE=$(grep BASE_RELEASE Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
45
NAME="${NAME:-seleniarm}"
56
VERSION="${VERSION:-$SELENIUM_VERSION}"
67
BUILD_DATE="${BUILD_DATE:-$(date '+%Y%m%d')}"
7-
PLATFORMS="${PLATFORMS:-linux/arm64,linux/amd64}"
8+
PLATFORMS="${PLATFORMS:-linux/arm64,linux/arm/v7,linux/amd64}"
89
BUILD_ARGS=--push
910

1011
FROM_IMAGE_ARGS="--build-arg NAMESPACE=$NAME --build-arg VERSION=$VERSION-$BUILD_DATE"

‎build-locally.sh‎

100644100755
Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/bin/bash
22

3-
#SELENIUM_VERSION=$(grep selenium-server Base/Dockerfile | sed 's/.*-\([^-]*\)\.jar \\/\1/' | head -n 1)
3+
SELENIUM_VERSION=$(grep BASE_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
4+
RELEASE=$(grep BASE_RELEASE Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
45
NAME="${NAME:-seleniarm}"
56
VERSION="${VERSION:-$SELENIUM_VERSION}"
67
BUILD_DATE="${BUILD_DATE:-$(date '+%Y%m%d')}"
7-
PLATFORMS="${PLATFORMS:-linux/arm64,linux/amd64}"
8+
PLATFORMS="${PLATFORMS:-linux/arm64,linux/arm/v7,linux/amd64}"
89
#BUILD_ARGS=--push
910

1011
FROM_IMAGE_ARGS="--build-arg NAMESPACE=$NAME --build-arg VERSION=$VERSION-$BUILD_DATE"
@@ -19,34 +20,34 @@ echo "Build and push images for target $1"
1920
#docker run --rm --privileged aptman/qus -s -- -p
2021

2122
if [ "$1" = "base_multi" ]; then
22-
cd ./Base && docker build ${BUILD_ARGS} --build-arg RELEASE=${RELEASE} --build-arg VERSION=${VERSION} -t ${NAME}/base:${TAG_VERSION} .
23+
cd ./Base && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} --build-arg RELEASE=${RELEASE} --build-arg VERSION=${VERSION} -t ${NAME}/base:${TAG_VERSION} .
2324

2425
elif [ "$1" = "grid_multi" ]; then
25-
cd ./Hub && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/hub:${TAG_VERSION} .
26-
cd ../Distributor && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/distributor:${TAG_VERSION} .
27-
cd ../Router && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/router:${TAG_VERSION} .
28-
cd ../Sessions && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/sessions:${TAG_VERSION} .
29-
cd ../SessionQueue && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/session-queue:${TAG_VERSION} .
30-
cd ../NodeDocker && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/node-docker:${TAG_VERSION} .
31-
cd ../EventBus && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/event-bus:${TAG_VERSION} .
26+
cd ./Hub && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/hub:${TAG_VERSION} .
27+
cd ../Distributor && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/distributor:${TAG_VERSION} .
28+
cd ../Router && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/router:${TAG_VERSION} .
29+
cd ../Sessions && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/sessions:${TAG_VERSION} .
30+
cd ../SessionQueue && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/session-queue:${TAG_VERSION} .
31+
cd ../NodeDocker && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/node-docker:${TAG_VERSION} .
32+
cd ../EventBus && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/event-bus:${TAG_VERSION} .
3233
# Prevent "failed to solve" errors by adding delay between NodeDocker and StandaloneDocker
3334
# by building EventBus in between them.
34-
cd ../StandaloneDocker && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/standalone-docker:${TAG_VERSION} .
35+
cd ../StandaloneDocker && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/standalone-docker:${TAG_VERSION} .
3536

3637
elif [ "$1" = "node_base_multi" ]; then
37-
cd ./NodeBase && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/node-base:${TAG_VERSION} .
38+
cd ./NodeBase && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/node-base:${TAG_VERSION} .
3839

3940
elif [ "$1" = "firefox_multi" ]; then
4041
FROM_IMAGE_ARGS="$FROM_IMAGE_ARGS --build-arg BASE=node-firefox"
41-
cd ./NodeFirefox && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -f Dockerfile.multi-arch -t ${NAME}/node-firefox:${TAG_VERSION} .
42+
cd ./NodeFirefox && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -f Dockerfile.multi-arch -t ${NAME}/node-firefox:${TAG_VERSION} .
4243
sleep 5 # Prevent "failed to solve" errors when trying to pull NodeFirefox dependency
43-
cd ../Standalone && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/standalone-firefox:${TAG_VERSION} .
44+
cd ../Standalone && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/standalone-firefox:${TAG_VERSION} .
4445

4546
elif [ "$1" = "chromium_multi" ]; then
4647
FROM_IMAGE_ARGS="$FROM_IMAGE_ARGS --build-arg BASE=node-chromium"
47-
cd ./NodeChromium && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/node-chromium:${TAG_VERSION} .
48+
cd ./NodeChromium && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/node-chromium:${TAG_VERSION} .
4849
sleep 5 # Prevent "failed to solve" errors when trying to pull NodeChromium dependency
49-
cd ../Standalone && docker build ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/standalone-chromium:${TAG_VERSION} .
50+
cd ../Standalone && docker buildx build --platform ${PLATFORMS} ${BUILD_ARGS} ${FROM_IMAGE_ARGS} -t ${NAME}/standalone-chromium:${TAG_VERSION} .
5051

5152
elif [ "$1" = "tag_and_push_multi_arch_browser_images" ]; then
5253
#make tag_and_push_multi_arch_browser_images

0 commit comments

Comments
 (0)