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

Commit 6f0f7a1

Browse files
VietND96VietND96
authored
[build]: use docker buildx (SeleniumHQ#2229)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent fe7c16c commit 6f0f7a1

File tree

9 files changed

+111
-51
lines changed

9 files changed

+111
-51
lines changed

‎.github/workflows/build-test.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,18 @@ jobs:
1919
name: Build & test Docker images with random user
2020
runs-on: ubuntu-latest
2121
strategy:
22+
fail-fast: false
2223
matrix:
2324
use-random-user: [false, true]
2425
steps:
2526
- uses: actions/checkout@main
27+
- name: Set up QEMU
28+
uses: docker/setup-qemu-action@master
29+
- name: Set up Docker Buildx
30+
uses: docker/setup-buildx-action@master
31+
with:
32+
platforms: linux/amd64,linux/arm64
33+
use: false
2634
- name: Output Docker info
2735
run: docker info
2836
- name: Set up Python

‎.github/workflows/deploy.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ jobs:
1919
with:
2020
persist-credentials: false
2121
fetch-depth: 0
22+
- name: Set up QEMU
23+
uses: docker/setup-qemu-action@master
24+
- name: Set up Docker Buildx
25+
uses: docker/setup-buildx-action@master
26+
with:
27+
platforms: linux/amd64,linux/arm64
28+
use: false
2229
- name: Output Docker info
2330
run: docker info
2431
- name: Sets build date

‎.github/workflows/helm-chart-test.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ jobs:
7878
- uses: actions/checkout@main
7979
- name: Output Docker info
8080
run: docker info
81+
- name: Set up QEMU
82+
uses: docker/setup-qemu-action@master
83+
- name: Set up Docker Buildx
84+
uses: docker/setup-buildx-action@master
85+
with:
86+
platforms: linux/amd64,linux/arm64
87+
use: false
8188
- name: Set up Python
8289
uses: actions/setup-python@main
8390
with:

‎.github/workflows/nightly.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ jobs:
1515
with:
1616
persist-credentials: false
1717
fetch-depth: 0
18+
- name: Set up QEMU
19+
uses: docker/setup-qemu-action@master
20+
- name: Set up Docker Buildx
21+
uses: docker/setup-buildx-action@master
22+
with:
23+
platforms: linux/amd64,linux/arm64
24+
use: false
1825
- name: Output Docker info
1926
run: docker info
2027
- name: Sets build date

‎.github/workflows/test-video.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ jobs:
3939
test-strategy: [test_video, test_parallel, test_node_docker]
4040
steps:
4141
- uses: actions/checkout@main
42+
- name: Set up QEMU
43+
uses: docker/setup-qemu-action@master
44+
- name: Set up Docker Buildx
45+
uses: docker/setup-buildx-action@master
46+
with:
47+
platforms: linux/amd64,linux/arm64
48+
use: false
4249
- name: Output Docker info
4350
run: docker info
4451
- name: Set up Python

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ jobs:
2323

2424
steps:
2525
- uses: actions/checkout@main
26+
- name: Set up QEMU
27+
uses: docker/setup-qemu-action@master
28+
- name: Set up Docker Buildx
29+
uses: docker/setup-buildx-action@master
30+
with:
31+
platforms: linux/amd64,linux/arm64
32+
use: false
2633
- name: Setup environment variables
2734
run: |
2835
export SELENIUM_VERSION=$(grep BASE_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)

‎Base/Dockerfile‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ ENV DEBIAN_FRONTEND=noninteractive \
3636
# Miscellaneous packages
3737
# Includes minimal runtime used for executing non GUI Java programs
3838
#========================
39-
RUN echo "deb http://archive.ubuntu.com/ubuntu jammy main universe\n" > /etc/apt/sources.list \
40-
&& echo "deb http://archive.ubuntu.com/ubuntu jammy-updates main universe\n" >> /etc/apt/sources.list \
41-
&& echo "deb http://security.ubuntu.com/ubuntu jammy-security main universe\n" >> /etc/apt/sources.list \
39+
RUN if [ "${TARGETARCH}" = "amd64" ]; then \
40+
echo "deb http://archive.ubuntu.com/ubuntu jammy main universe\n" > /etc/apt/sources.list \
41+
&& echo "deb http://archive.ubuntu.com/ubuntu jammy-updates main universe\n" >> /etc/apt/sources.list \
42+
&& echo "deb http://security.ubuntu.com/ubuntu jammy-security main universe\n" >> /etc/apt/sources.list ; \
43+
fi \
4244
&& apt-get -qqy update \
4345
&& apt-get upgrade -yq \
4446
&& apt-get -qqy --no-install-recommends install \
@@ -107,14 +109,18 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu jammy main universe\n" > /etc/ap
107109
#=====
108110
# Download observability related OpenTelemetry jars and make them available in a separate directory
109111
# so that the container can skip downloading them everytime it comes up
110-
#=====
111-
&& curl -fLo /tmp/cs https://github.com/coursier/launchers/raw/master/coursier \
112-
&& chmod +x /tmp/cs \
113-
&& mkdir -p /external_jars \
114-
&& chmod -R 775 /external_jars \
115-
&& /tmp/cs fetch --classpath --cache /external_jars \
116-
io.opentelemetry:opentelemetry-exporter-otlp:${OPENTELEMETRY_VERSION} \
117-
io.grpc:grpc-netty:${GRPC_VERSION} > /external_jars/.classpath.txt \
112+
#===== \
113+
&& if [ `arch` = "aarch64" ] || [ `arch` = "x86_64" ]; then \
114+
curl -fL https://github.com/coursier/launchers/raw/master/cs-`arch`-pc-linux.gz | gzip -d > /tmp/cs \
115+
&& chmod +x /tmp/cs \
116+
&& mkdir -p /external_jars \
117+
&& chmod -R 775 /external_jars ; \
118+
fi \
119+
&& if [ -f "/tmp/cs" ]; then \
120+
/tmp/cs fetch --classpath --cache /external_jars \
121+
io.opentelemetry:opentelemetry-exporter-otlp:${OPENTELEMETRY_VERSION} \
122+
io.grpc:grpc-netty:${GRPC_VERSION} > /external_jars/.classpath.txt ; \
123+
fi \
118124
&& chmod 664 /external_jars/.classpath.txt \
119125
&& rm -fr /root/.cache/* \
120126
# (Note that .bashrc is only executed in interactive bash shells.)

‎Makefile‎

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),
1212
NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
1313
AUTHORS := $(or $(AUTHORS),$(AUTHORS),SeleniumHQ)
1414
PUSH_IMAGE := $(or $(PUSH_IMAGE),$(PUSH_IMAGE),false)
15-
FROM_IMAGE_ARGS := --build-arg NAMESPACE=$(NAMESPACE) --build-arg VERSION=$(TAG_VERSION) --build-arg AUTHORS=$(AUTHORS)
15+
TARGETARCH := $(or $(TARGETARCH),$(TARGETARCH),amd64)
16+
FROM_IMAGE_ARGS := --build-arg TARGETARCH=$(TARGETARCH) --build-arg NAMESPACE=$(NAMESPACE) --build-arg VERSION=$(TAG_VERSION) --build-arg AUTHORS=$(AUTHORS)
1617
BUILD_ARGS := $(BUILD_ARGS)
1718
MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION)))
1819
MINOR := $(word 2,$(subst ., ,$(TAG_VERSION)))
1920
MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(TAG_VERSION)))
2021
FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.0)
2122
FFMPEG_BASED_NAME := $(or $(FFMPEG_BASED_NAME),$(FFMPEG_BASED_NAME),ndviet)
2223
FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),7.0-ubuntu2204)
24+
PLATFORMS := $(or $(PLATFORMS),$(PLATFORMS),linux/amd64)
2325

2426
all: hub \
2527
distributor \
@@ -41,6 +43,11 @@ set_nightly_env:
4143
echo BASE_VERSION=$(BASE_VERSION_NIGHTLY) > .env ; \
4244
echo BASE_RELEASE=$(BASE_RELEASE_NIGHTLY) >> .env ;
4345

46+
docker_buildx_setup:
47+
sudo apt-get install --upgrade docker-buildx-plugin
48+
docker buildx version
49+
docker buildx use default
50+
4451
build_nightly:
4552
BASE_VERSION=$(BASE_VERSION_NIGHTLY) BASE_RELEASE=$(BASE_RELEASE_NIGHTLY) make build
4653

@@ -49,94 +56,94 @@ build: all
4956
ci: build test
5057

5158
base:
52-
cd ./Base && docker build $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION) --build-arg RELEASE=$(BASE_RELEASE) --build-arg AUTHORS=$(AUTHORS) -t $(NAME)/base:$(TAG_VERSION) .
59+
cd ./Base && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --load --build-arg TARGETARCH=$(TARGETARCH) --build-arg VERSION=$(BASE_VERSION) --build-arg RELEASE=$(BASE_RELEASE) --build-arg AUTHORS=$(AUTHORS) --load -t $(NAME)/base:$(TAG_VERSION) .
5360

5461
base_nightly:
55-
cd ./Base && docker build $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION_NIGHTLY) --build-arg RELEASE=$(BASE_RELEASE_NIGHTLY) --build-arg AUTHORS=$(AUTHORS) -t $(NAME)/base:$(TAG_VERSION) .
62+
cd ./Base && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION_NIGHTLY) --build-arg RELEASE=$(BASE_RELEASE_NIGHTLY) --build-arg AUTHORS=$(AUTHORS) --load -t $(NAME)/base:$(TAG_VERSION) .
5663

5764
hub: base
58-
cd ./Hub && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/hub:$(TAG_VERSION) .
65+
cd ./Hub && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/hub:$(TAG_VERSION) .
5966

6067
distributor: base
61-
cd ./Distributor && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/distributor:$(TAG_VERSION) .
68+
cd ./Distributor && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/distributor:$(TAG_VERSION) .
6269

6370
router: base
64-
cd ./Router && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/router:$(TAG_VERSION) .
71+
cd ./Router && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/router:$(TAG_VERSION) .
6572

6673
sessions: base
67-
cd ./Sessions && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/sessions:$(TAG_VERSION) .
74+
cd ./Sessions && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/sessions:$(TAG_VERSION) .
6875

6976
sessionqueue: base
70-
cd ./SessionQueue && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/session-queue:$(TAG_VERSION) .
77+
cd ./SessionQueue && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/session-queue:$(TAG_VERSION) .
7178

7279
event_bus: base
73-
cd ./EventBus && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/event-bus:$(TAG_VERSION) .
80+
cd ./EventBus && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/event-bus:$(TAG_VERSION) .
7481

7582
node_base: base
76-
cd ./NodeBase && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-base:$(TAG_VERSION) .
83+
cd ./NodeBase && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/node-base:$(TAG_VERSION) .
7784

7885
chrome: node_base
79-
cd ./NodeChrome && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-chrome:$(TAG_VERSION) .
86+
cd ./NodeChrome && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/node-chrome:$(TAG_VERSION) .
8087

8188
chrome_dev:
82-
cd ./NodeChrome && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg CHROME_VERSION=google-chrome-unstable -t $(NAME)/node-chrome:dev .
89+
cd ./NodeChrome && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg CHROME_VERSION=google-chrome-unstable --load -t $(NAME)/node-chrome:dev .
8390

8491
chrome_beta:
85-
cd ./NodeChrome && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg CHROME_VERSION=google-chrome-beta -t $(NAME)/node-chrome:beta .
92+
cd ./NodeChrome && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg CHROME_VERSION=google-chrome-beta --load -t $(NAME)/node-chrome:beta .
8693

8794
edge: node_base
88-
cd ./NodeEdge && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-edge:$(TAG_VERSION) .
95+
cd ./NodeEdge && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/node-edge:$(TAG_VERSION) .
8996

9097
edge_dev:
91-
cd ./NodeEdge && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg EDGE_VERSION=microsoft-edge-dev -t $(NAME)/node-edge:dev .
98+
cd ./NodeEdge && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg EDGE_VERSION=microsoft-edge-dev --load -t $(NAME)/node-edge:dev .
9299

93100
edge_beta:
94-
cd ./NodeEdge && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg EDGE_VERSION=microsoft-edge-beta -t $(NAME)/node-edge:beta .
101+
cd ./NodeEdge && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg EDGE_VERSION=microsoft-edge-beta --load -t $(NAME)/node-edge:beta .
95102

96103
firefox: node_base
97-
cd ./NodeFirefox && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-firefox:$(TAG_VERSION) .
104+
cd ./NodeFirefox && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/node-firefox:$(TAG_VERSION) .
98105

99106
firefox_dev:
100-
cd ./NodeFirefox && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg FIREFOX_VERSION=nightly-latest -t $(NAME)/node-firefox:dev .
107+
cd ./NodeFirefox && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load --build-arg FIREFOX_VERSION=nightly-latest -t $(NAME)/node-firefox:dev .
101108

102109
firefox_beta:
103-
cd ./NodeFirefox && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg FIREFOX_VERSION=beta-latest -t $(NAME)/node-firefox:beta .
110+
cd ./NodeFirefox && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load --build-arg FIREFOX_VERSION=beta-latest -t $(NAME)/node-firefox:beta .
104111

105112
docker: base
106-
cd ./NodeDocker && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-docker:$(TAG_VERSION) .
113+
cd ./NodeDocker && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/node-docker:$(TAG_VERSION) .
107114

108115
standalone_docker: docker
109-
cd ./StandaloneDocker && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/standalone-docker:$(TAG_VERSION) .
116+
cd ./StandaloneDocker && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --load -t $(NAME)/standalone-docker:$(TAG_VERSION) .
110117

111118
standalone_firefox: firefox
112-
cd ./Standalone && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-firefox -t $(NAME)/standalone-firefox:$(TAG_VERSION) .
119+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-firefox --load -t $(NAME)/standalone-firefox:$(TAG_VERSION) .
113120

114121
standalone_firefox_dev: firefox_dev
115-
cd ./Standalone && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=dev --build-arg BASE=node-firefox -t $(NAME)/standalone-firefox:dev .
122+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=dev --build-arg BASE=node-firefox --load -t $(NAME)/standalone-firefox:dev .
116123

117124
standalone_firefox_beta: firefox_beta
118-
cd ./Standalone && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=beta --build-arg BASE=node-firefox -t $(NAME)/standalone-firefox:beta .
125+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=beta --build-arg BASE=node-firefox --load -t $(NAME)/standalone-firefox:beta .
119126

120127
standalone_chrome: chrome
121-
cd ./Standalone && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-chrome -t $(NAME)/standalone-chrome:$(TAG_VERSION) .
128+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-chrome --load -t $(NAME)/standalone-chrome:$(TAG_VERSION) .
122129

123130
standalone_chrome_dev: chrome_dev
124-
cd ./Standalone && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=dev --build-arg BASE=node-chrome -t $(NAME)/standalone-chrome:dev .
131+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=dev --build-arg BASE=node-chrome --load -t $(NAME)/standalone-chrome:dev .
125132

126133
standalone_chrome_beta: chrome_beta
127-
cd ./Standalone && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=beta --build-arg BASE=node-chrome -t $(NAME)/standalone-chrome:beta .
134+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=beta --build-arg BASE=node-chrome -t $(NAME)/standalone-chrome:beta .
128135

129136
standalone_edge: edge
130-
cd ./Standalone && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-edge -t $(NAME)/standalone-edge:$(TAG_VERSION) .
137+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-edge --load -t $(NAME)/standalone-edge:$(TAG_VERSION) .
131138

132139
standalone_edge_dev: edge_dev
133-
cd ./Standalone && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=dev --build-arg BASE=node-edge -t $(NAME)/standalone-edge:dev .
140+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=dev --build-arg BASE=node-edge --load -t $(NAME)/standalone-edge:dev .
134141

135142
standalone_edge_beta: edge_beta
136-
cd ./Standalone && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=beta --build-arg BASE=node-edge -t $(NAME)/standalone-edge:beta .
143+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(NAME) --build-arg VERSION=beta --build-arg BASE=node-edge --load -t $(NAME)/standalone-edge:beta .
137144

138145
video:
139-
cd ./Video && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(FFMPEG_BASED_NAME) --build-arg BASED_TAG=$(FFMPEG_BASED_TAG) -t $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) .
146+
cd ./Video && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(FFMPEG_BASED_NAME) --build-arg BASED_TAG=$(FFMPEG_BASED_TAG) --load -t $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) .
140147

141148
count_image_layers:
142149
docker history $(NAME)/base:$(TAG_VERSION) -q | wc -l
@@ -158,22 +165,22 @@ count_image_layers:
158165
docker history $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) -q | wc -l
159166

160167
chrome_upgrade_version:
161-
cd ./NodeChrome && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(NAMESPACE) --build-arg VERSION=$(VERSION) --build-arg AUTHORS=$(AUTHORS) -t $(NAME)/node-chrome:$(TAG_VERSION) .
162-
cd ./Standalone && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-chrome -t $(NAME)/standalone-chrome:$(TAG_VERSION) .
168+
cd ./NodeChrome && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(NAMESPACE) --build-arg VERSION=$(VERSION) --build-arg AUTHORS=$(AUTHORS) --load -t $(NAME)/node-chrome:$(TAG_VERSION) .
169+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-chrome --load -t $(NAME)/standalone-chrome:$(TAG_VERSION) .
163170
docker run --rm $(NAME)/standalone-chrome:$(TAG_VERSION) /opt/selenium/selenium-server.jar info --version
164171
docker run --rm $(NAME)/standalone-chrome:$(TAG_VERSION) google-chrome --version
165172
docker run --rm $(NAME)/standalone-chrome:$(TAG_VERSION) chromedriver --version
166173

167174
firefox_upgrade_version:
168-
cd ./NodeFirefox && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(NAMESPACE) --build-arg VERSION=$(VERSION) --build-arg AUTHORS=$(AUTHORS) -t $(NAME)/node-firefox:$(TAG_VERSION) .
169-
cd ./Standalone && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-firefox -t $(NAME)/standalone-firefox:$(TAG_VERSION) .
175+
cd ./NodeFirefox && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(NAMESPACE) --build-arg VERSION=$(VERSION) --build-arg AUTHORS=$(AUTHORS) --load -t $(NAME)/node-firefox:$(TAG_VERSION) .
176+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-firefox --load -t $(NAME)/standalone-firefox:$(TAG_VERSION) .
170177
docker run --rm $(NAME)/standalone-firefox:$(TAG_VERSION) /opt/selenium/selenium-server.jar info --version
171178
docker run --rm $(NAME)/standalone-firefox:$(TAG_VERSION) firefox --version
172179
docker run --rm $(NAME)/standalone-firefox:$(TAG_VERSION) geckodriver --version
173180

174181
edge_upgrade_version:
175-
cd ./NodeEdge && docker build $(BUILD_ARGS) --build-arg NAMESPACE=$(NAMESPACE) --build-arg VERSION=$(VERSION) --build-arg AUTHORS=$(AUTHORS) -t $(NAME)/node-edge:$(TAG_VERSION) .
176-
cd ./Standalone && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-edge -t $(NAME)/standalone-edge:$(TAG_VERSION) .
182+
cd ./NodeEdge && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(NAMESPACE) --build-arg VERSION=$(VERSION) --build-arg AUTHORS=$(AUTHORS) --load -t $(NAME)/node-edge:$(TAG_VERSION) .
183+
cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-edge --load -t $(NAME)/standalone-edge:$(TAG_VERSION) .
177184
docker run --rm $(NAME)/standalone-edge:$(TAG_VERSION) /opt/selenium/selenium-server.jar info --version
178185
docker run --rm $(NAME)/standalone-edge:$(TAG_VERSION) microsoft-edge --version
179186
docker run --rm $(NAME)/standalone-edge:$(TAG_VERSION) msedgedriver --version

0 commit comments

Comments
 (0)