From f5f8b7a1591ab17eeb3551f5b548acd9ce89013b Mon Sep 17 00:00:00 2001
From: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
Date: Thu, 4 Sep 2025 15:25:39 +0700
Subject: [PATCH] Docker: Fix deploy all browsers in one Node/Standalone image

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
---
 Makefile              | 22 ++++++++--------------
 NodeChrome/Dockerfile |  2 +-
 NodeEdge/Dockerfile   |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index da3c5cf56..197b48eb1 100644
--- a/Makefile
+++ b/Makefile
@@ -286,20 +286,14 @@ ffmpeg:
 	cd ./.ffmpeg && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg FFMPEG_VERSION=$(FFMPEG_VERSION) $(FROM_IMAGE_ARGS) -t $(NAME)/ffmpeg:$(FFMPEG_VERSION)-$(BUILD_DATE) .
 
 all_browsers: node_base
-	case "$(PLATFORMS)" in \
-    *linux/amd64*) \
-			cd ./NodeFirefox && docker buildx build --platform linux/amd64 $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-base --build-arg FIREFOX_DOWNLOAD_URL=$(FIREFOX_DOWNLOAD_URL) -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
-			cd .. ; \
-			cd ./NodeChrome && docker buildx build --platform linux/amd64 $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
-			cd .. ; \
-			cd ./NodeEdge && docker buildx build --platform linux/amd64 $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
-      ;; \
-    *) \
-			cd ./NodeFirefox && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-base --build-arg FIREFOX_DOWNLOAD_URL=$(FIREFOX_DOWNLOAD_URL) -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
-			cd .. ; \
-			cd ./NodeChromium && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers --build-arg CHROMIUM_VERSION=$(CHROMIUM_VERSION) -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
-      ;; \
-  esac
+	cd ./NodeChromium && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-base --build-arg CHROMIUM_VERSION=$(CHROMIUM_VERSION) -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
+	cd .. ; \
+	cd ./NodeFirefox && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers --build-arg FIREFOX_DOWNLOAD_URL=$(FIREFOX_DOWNLOAD_URL) -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
+	cd .. ; \
+	cd ./NodeChrome && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
+	cd .. ; \
+	cd ./NodeEdge && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
+	cd .. ;
 
 standalone_all_browsers: all_browsers
 	cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-all-browsers -t $(NAME)/standalone-all-browsers:$(TAG_VERSION) .
diff --git a/NodeChrome/Dockerfile b/NodeChrome/Dockerfile
index e0557ca59..a85398273 100644
--- a/NodeChrome/Dockerfile
+++ b/NodeChrome/Dockerfile
@@ -1,7 +1,7 @@
 ARG NAMESPACE=selenium
 ARG VERSION=latest
 ARG BASE=node-base
-FROM ${NAMESPACE}/${BASE}:${VERSION}
+FROM --platform=linux/amd64 ${NAMESPACE}/${BASE}:${VERSION}
 ARG AUTHORS
 LABEL authors=${AUTHORS}
 
diff --git a/NodeEdge/Dockerfile b/NodeEdge/Dockerfile
index d64cb7d24..d20ac9fd4 100644
--- a/NodeEdge/Dockerfile
+++ b/NodeEdge/Dockerfile
@@ -1,7 +1,7 @@
 ARG NAMESPACE=selenium
 ARG VERSION=latest
 ARG BASE=node-base
-FROM ${NAMESPACE}/${BASE}:${VERSION}
+FROM --platform=linux/amd64 ${NAMESPACE}/${BASE}:${VERSION}
 ARG AUTHORS
 LABEL authors=${AUTHORS}